From 975ec1b38aaa7a58e1091d63ab8696261239716a Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Sat, 5 Dec 2015 16:15:24 +0100 Subject: [PATCH] nicer font fallbacks --- _src/_assets/styl/typography.styl | 13 ++++++++++++- _src/_assets/styl/variables.styl | 4 ++-- package.json | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/_src/_assets/styl/typography.styl b/_src/_assets/styl/typography.styl index 87d9fbc2..1fc9e4a9 100644 --- a/_src/_assets/styl/typography.styl +++ b/_src/_assets/styl/typography.styl @@ -22,10 +22,16 @@ body -moz-osx-font-smoothing: grayscale; -moz-font-feature-settings: 'liga', 'kern'; + letter-spacing: -0.01em + + .wf-active & + letter-spacing: normal + @media $breakpoint3 font-size: $font-size-large line-height: $line-height-large + p, ul, ol @@ -38,9 +44,14 @@ ol h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 font-family: $headings-font-family - font-weight: $headings-font-weight line-height: $headings-line-height color: $headings-color + font-weight: 500 + letter-spacing: -.09em + + .wf-active & + font-weight: $headings-font-weight + letter-spacing: normal h1, .h1, h2, .h2 diff --git a/_src/_assets/styl/variables.styl b/_src/_assets/styl/variables.styl index 6211ee27..2b5c0e9d 100644 --- a/_src/_assets/styl/variables.styl +++ b/_src/_assets/styl/variables.styl @@ -68,13 +68,13 @@ $line-height-computed = floor($font-size-base * $line-height-base) $line-height-large = 1.5 // 36px/24px $line-height-small = 1.1428571429 -$font-family-base = 'ff-tisa-sans-web-pro', 'Helvetica Neue', Helvetica, Arial, sans-serif +$font-family-base = 'ff-tisa-sans-web-pro', 'Trebuchet MS', 'Helvetica Neue', Helvetica, Arial, sans-serif $font-weight-base = 400 $font-color-base = $text-color $font-family-monospace = Menlo, Monaco, Consolas, 'Courier New', monospace -$headings-font-family = 'brandon-grotesque','Helvetica Neue',Helvetica,Arial,sans-serif +$headings-font-family = 'brandon-grotesque', 'Avenir Next', 'Helvetica Neue',Helvetica,Arial,sans-serif $headings-font-weight = 500 // Medium $headings-line-height = 1.1 $headings-color = $brand-dark diff --git a/package.json b/package.json index 7918525b..6441cbb9 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "build": "gulp build --production" }, "dependencies": { + "bootstrap": "^3.3.6", "jquery": ">=2.1.4", "normalize-css": ">=2.3.1", "normalize-opentype.css": ">=0.2.4", @@ -22,7 +23,6 @@ "webcomponents.js": ">=0.7.1" }, "devDependencies": { - "bootstrap": "^3.3.6", "browser-sync": ">=2.10.0", "chalk": ">=1.0.0", "concurrent-transform": ">=1.0.0",