diff options
| -rw-r--r-- | partials/_base-blueprint.scss | 6 | ||||
| -rw-r--r-- | partials/_base-normalize.scss | 1 | ||||
| -rw-r--r-- | partials/_base-typey.scss | 24 | ||||
| -rw-r--r-- | partials/_base.scss | 9 | ||||
| -rw-r--r-- | style.scss | 6 |
5 files changed, 29 insertions, 17 deletions
diff --git a/partials/_base-blueprint.scss b/partials/_base-blueprint.scss deleted file mode 100644 index 35dabed..0000000 --- a/partials/_base-blueprint.scss +++ /dev/null @@ -1,6 +0,0 @@ -// Blueprint integration -// -// No styleguide reference. -$blueprint-font-family: $baseFontFamily; - -$blueprint-font-size: $baseFontSize; diff --git a/partials/_base-normalize.scss b/partials/_base-normalize.scss index 2db5145..4f0f737 100644 --- a/partials/_base-normalize.scss +++ b/partials/_base-normalize.scss @@ -3,3 +3,4 @@ // No styleguide reference. $-normalize-include: null; $-normalize-exclude: null; +$base-font-family: $sans-serif-stack; diff --git a/partials/_base-typey.scss b/partials/_base-typey.scss new file mode 100644 index 0000000..43679f0 --- /dev/null +++ b/partials/_base-typey.scss @@ -0,0 +1,24 @@ +// Typey integration +// +// No styleguide reference. +$base-unit: em; +$base-font-size: 16px; +$base-line-height: 28px; + +$helvetica: Helvetica, sans-serif; +$verdana: Verdana, sans-serif; +$garamond: Garamond, serif; + +$typefaces: ( + sans-serif: $sans-serif-stack, + serif: $garamond, + monospace: $monospace-stack, +); + +$typestyles: ( + heading-1: ( + font-size: xxl, + line-height: 1, + weight: normal, + ), +); diff --git a/partials/_base.scss b/partials/_base.scss index 8b2dadb..b1bec29 100644 --- a/partials/_base.scss +++ b/partials/_base.scss @@ -12,13 +12,6 @@ $colorBase: $black; $colorBg: $white; $colorPrimary: $green; -// Typography -// -// No styleguide reference. -// Follow W3C recommendation: http://www.w3.org/QA/Tips/font-size -$baseFontSize: 16px; -$baseFontFamily: Arial, Helvetica, sans-serif; - $baseTextColor: $colorBase; $linkColor: $colorBase; @@ -34,5 +27,5 @@ $large-desktop: screen min-width 40em; // Framework integrations // // No styleguide reference. +@import "base-typey"; @import "base-normalize"; -@import "base-blueprint"; @@ -1,11 +1,12 @@ +@import "typey/font-stacks"; @import "partials/base"; @import "normalize"; +@import "typey"; @import "../shared/themes/default/ikiwiki"; @import "compass/reset/utilities"; @import "compass/typography"; -@import "blueprint"; @import "breakpoint"; @include normalize; @@ -23,9 +24,8 @@ @include ikiwiki-style; -@include blueprint-typography; h1 { - font-size: 2.75em; + @include typeset(heading-1); } #branding-logo { |