source/stylesheets/staple/typography.scss in staple-0.1.6 vs source/stylesheets/staple/typography.scss in staple-0.1.7
- old
+ new
@@ -1,25 +1,18 @@
-//IMPORT FONTS HERE Typekit vs google fonts
-// @import url(http://fonts.googleapis.com/css?family=Slabo+27px);
-// @import url(http://fonts.googleapis.com/css?family=Chivo);
-// @import url(http://fonts.googleapis.com/css?family=VT323);
+//IMPORT FONTS HERE Typekit and Google Fonts
+@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,700);
+@import url(http://fonts.googleapis.com/css?family=Roboto+Slab:400,300,700);
+@import url(http://fonts.googleapis.com/css?family=Inconsolata);
//DEFAULTS
-$typeface-primary: sans-serif;
-$typeface-secondary: serif;
-$typeface-tertiary: monospace;
+$typeface-primary: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+$typeface-secondary: "Roboto Slab", serif;
+$typeface-tertiary: "Inconsolata", monospace;
$normal-font-weight: 400;
+$header-font-weight: 300;
+$subheader-font-weight: 400;
-//FOUNDATION STYLES: CAN BE OVERRIDDEN BUT NEEDED
-$font-family-sans-serif: $typeface-primary;
-$font-family-serif: $typeface-secondary;
-$font-family-monospace: $typeface-tertiary;
-$body-bg: $white;//can use any from colors
-$body-font-color: rgba($black, $transparent-strong);
-$body-font-family: $font-family-sans-serif;
-$body-font-weight: $normal-font-weight;
-
//FONT CLASSES TO GENERATE
$typeface-classes: primary secondary tertiary;
$typeface-define: $typeface-primary $typeface-secondary $typeface-tertiary;
//WEIGHT CLASSES IN ADDITION TO DEFAULT
@@ -34,6 +27,15 @@
$spacing-classes: sleak wide;
$spacing-define: 0.2rem 1rem;
@import "builders/build_typography"
-//TODO: COOL FONT SHADOW EFFECT ON http://fittextjs.com
\ No newline at end of file
+//TODO: COOL FONT SHADOW EFFECT ON http://fittextjs.com
+
+//FOUNDATION STYLES: CAN BE OVERRIDDEN BUT NEEDED
+$font-family-sans-serif: $typeface-primary;
+$font-family-serif: $typeface-secondary;
+$font-family-monospace: $typeface-tertiary;
+$body-bg: $white;//can use any from colors
+$body-font-color: rgba($black, $transparent-strong);
+$body-font-family: $font-family-sans-serif;
+$body-font-weight: $normal-font-weight;