Modernize and rename font stacks

- Closes #709
thoughtbot · Jan 19, 2016 · 3cf106a · 3cf106a
1 parent 22f1d4c
commit 3cf106a
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 26 deletions.
diff --git a/app/assets/stylesheets/addons/_font-stacks.scss b/app/assets/stylesheets/addons/_font-stacks.scss
@@ -2,14 +2,18 @@
 
 ////
 /// @type list
+///
+/// @link goo.gl/Cxb26i
 ////
 
-$georgia: "Georgia", "Cambria", "Times New Roman", "Times", serif;
-
-$helvetica: "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
-
-$lucida-grande: "Lucida Grande", "Tahoma", "Verdana", "Arial", sans-serif;
+$helvetica: "Helvetica Neue", "Helvetica", "Arial", sans-serif;
+$lucida-grande: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", "Geneva", "Verdana", sans-serif;
+$verdana: "Verdana", "Geneva", sans-serif;
 
-$monospace: "Bitstream Vera Sans Mono", "Consolas", "Courier", monospace;
+$garamond: "Garamond", "Baskerville", "Baskerville Old Face", "Hoefler Text", "Times New Roman", serif;
+$georgia: "Georgia", "Times", "Times New Roman", serif;
+$hoefler-text: "Hoefler Text", "Baskerville Old Face", "Garamond", "Times New Roman", serif;
 
-$verdana: "Verdana", "Geneva", sans-serif;
+$consolas: "Consolas", "monaco", monospace;
+$courier-new: "Courier New", "Courier", "Lucida Sans Typewriter", "Lucida Typewriter", monospace;
+$monaco: "monaco", "Consolas", "Lucida Console", monospace;
diff --git a/spec/bourbon/addons/font_stacks_spec.rb b/spec/bourbon/addons/font_stacks_spec.rb
@@ -7,19 +7,29 @@
 
   context "stacks used in variable" do
     it "output stacks" do
-      georgia = '"Georgia", "Cambria", "Times New Roman", "Times", serif'
-      helvetica = '"Helvetica Neue", "Helvetica", "Roboto", ' +
-                  '"Arial", sans-serif'
-      lucida_grande = '"Lucida Grande", "Tahoma", "Verdana", ' +
-                      '"Arial", sans-serif'
-      monospace = '"Bitstream Vera Sans Mono", "Consolas", "Courier", monospace'
+      helvetica = '"Helvetica Neue", "Helvetica", "Arial", sans-serif'
+      lucida_grande = '"Lucida Grande", "Lucida Sans Unicode", ' +
+                      '"Lucida Sans", "Geneva", "Verdana", sans-serif'
       verdana = '"Verdana", "Geneva", sans-serif'
+      garamond = '"Garamond", "Baskerville", "Baskerville Old Face", ' +
+                 '"Hoefler Text", "Times New Roman", serif'
+      georgia = '"Georgia", "Times", "Times New Roman", serif'
+      hoefler_text = '"Hoefler Text", "Baskerville Old Face", ' +
+                     '"Garamond", "Times New Roman", serif'
+      consolas = '"Consolas", "monaco", monospace'
+      courier_new = '"Courier New", "Courier", "Lucida Sans Typewriter", ' +
+                    '"Lucida Typewriter", monospace'
+      monaco = '"monaco", "Consolas", "Lucida Console", monospace'
 
-      expect("$georgia").to have_value(georgia)
-      expect("$helvetica").to have_value(helvetica)
-      expect("$lucida-grande").to have_value(lucida_grande)
-      expect("$monospace").to have_value(monospace)
-      expect("$verdana").to have_value(verdana)
+      expect(".helvetica").to have_value(helvetica)
+      expect(".lucida-grande").to have_value(lucida_grande)
+      expect(".verdana").to have_value(verdana)
+      expect(".garamond").to have_value(garamond)
+      expect(".georgia").to have_value(georgia)
+      expect(".hoefler-text").to have_value(hoefler_text)
+      expect(".consolas").to have_value(consolas)
+      expect(".courier-new").to have_value(courier_new)
+      expect(".monaco").to have_value(monaco)
     end
   end
 end
diff --git a/spec/fixtures/addons/font-stacks.scss b/spec/fixtures/addons/font-stacks.scss
@@ -1,9 +1,5 @@
 @import "setup";
 
-.georgia {
-  content: $georgia;
-}
-
 .helvetica {
   content: $helvetica;
 }
@@ -12,10 +8,30 @@
   content: $lucida-grande;
 }
 
-.monospace {
-  content: $monospace;
-}
-
 .verdana {
   content: $verdana;
 }
+
+.garamond {
+  content: $garamond;
+}
+
+.georgia {
+  content: $georgia;
+}
+
+.hoefler-text {
+  content: $hoefler-text;
+}
+
+.consolas {
+  content: $consolas;
+}
+
+.courier-new {
+  content: $courier-new;
+}
+
+.monaco {
+  content: $monaco;
+}