From 413f86856d110faf600ee629934a825cb246d10f Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Sun, 2 Aug 2015 21:15:22 +0200 Subject: [PATCH] typography --- _src/_assets/styl/code.styl | 3 +- _src/_assets/styl/content-featured.styl | 5 +-- _src/_assets/styl/content-photo.styl | 1 + _src/_assets/styl/content.styl | 3 ++ _src/_assets/styl/media.styl | 3 +- _src/_assets/styl/typography.styl | 10 +++-- _src/_assets/styl/variables.styl | 2 +- _src/_includes/head.html | 56 ++++++++++++------------- 8 files changed, 45 insertions(+), 38 deletions(-) diff --git a/_src/_assets/styl/code.styl b/_src/_assets/styl/code.styl index 4c35ec97..21c6031b 100644 --- a/_src/_assets/styl/code.styl +++ b/_src/_assets/styl/code.styl @@ -29,7 +29,8 @@ kbd color: $kbd-color background-color: $kbd-bg border-radius: $border-radius-small - box-shadow: inset 0 -1px 0 rgba(0,0,0,.25) + border: 1px solid $kbd-bg + box-shadow: inset 0 1px 0 rgba(#fff, .4) pre display: block diff --git a/_src/_assets/styl/content-featured.styl b/_src/_assets/styl/content-featured.styl index fb4efdc8..e72e940b 100644 --- a/_src/_assets/styl/content-featured.styl +++ b/_src/_assets/styl/content-featured.styl @@ -28,6 +28,5 @@ .featured-image display: block - - img - margin-bottom: 0 + margin-bottom: 0 + box-shadow: 0 1px 3px rgba(0,0,0,.2) diff --git a/_src/_assets/styl/content-photo.styl b/_src/_assets/styl/content-photo.styl index c97bccc8..085eb9aa 100644 --- a/_src/_assets/styl/content-photo.styl +++ b/_src/_assets/styl/content-photo.styl @@ -19,6 +19,7 @@ img max-height: 540px width: auto + box-shadow: 0 1px 3px rgba(0,0,0,.2) figcaption @extend .transition diff --git a/_src/_assets/styl/content.styl b/_src/_assets/styl/content.styl index fb26e2e9..feb25dec 100644 --- a/_src/_assets/styl/content.styl +++ b/_src/_assets/styl/content.styl @@ -66,6 +66,9 @@ h1 font-size: ceil($font-size-base * 2.5) + .teaser + box-shadow: 0 1px 3px rgba(0,0,0,.2) + p:last-child margin-bottom: 0 diff --git a/_src/_assets/styl/media.styl b/_src/_assets/styl/media.styl index d2fca218..9d4c17ca 100644 --- a/_src/_assets/styl/media.styl +++ b/_src/_assets/styl/media.styl @@ -20,7 +20,6 @@ figure, img, svg, video, audio, embed, canvas img vertical-align: middle - box-shadow: 0 1px 3px rgba(0,0,0,.2) .teaser, .teaser img @@ -42,4 +41,4 @@ img.aligncenter img.alignleft margin: 0 $line-height-computed $line-height-computed 0 img.alignright - margin: 0 0 $line-height-computed $line-height-computed \ No newline at end of file + margin: 0 0 $line-height-computed $line-height-computed diff --git a/_src/_assets/styl/typography.styl b/_src/_assets/styl/typography.styl index d3921ecd..38f069f2 100644 --- a/_src/_assets/styl/typography.styl +++ b/_src/_assets/styl/typography.styl @@ -15,6 +15,12 @@ body line-height: $line-height-base color: $font-color-base word-wrap: break-word + text-rendering: optimizeLegibility; + // Controversial! But prevents text flickering in + // Safari/Firefox when animations are running + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + -moz-font-feature-settings: 'liga', 'kern'; @media $breakpoint3 font-size: $font-size-large @@ -102,9 +108,7 @@ a &:active transition: none - background: $link-color - color: #fff - text-shadow: none + color: darken($link-color, 20%) h1 &, h2 &, diff --git a/_src/_assets/styl/variables.styl b/_src/_assets/styl/variables.styl index a9dffc0e..ab6ca6a2 100644 --- a/_src/_assets/styl/variables.styl +++ b/_src/_assets/styl/variables.styl @@ -65,7 +65,7 @@ $font-size-h2-small = floor(($font-size-small * 2)) $font-size-h3-small = ceil(($font-size-small * 1.75)) $font-size-h4-small = ceil(($font-size-small * 1.25)) -$line-height-base = 1.5555555556 // 28px/18px +$line-height-base = 1.4444444444 // 26px/18px $line-height-computed = floor($font-size-base * $line-height-base) $line-height-large = 1.5 // 36px/24px $line-height-small = 1.1428571429 diff --git a/_src/_includes/head.html b/_src/_includes/head.html index 8eb76c38..281e91e4 100644 --- a/_src/_includes/head.html +++ b/_src/_includes/head.html @@ -1,28 +1,28 @@ @@ -48,8 +48,8 @@ - - + + @@ -58,7 +58,7 @@ {% endif %} - @@ -74,14 +74,14 @@ })(document); - - + + - + - + @@ -94,8 +94,8 @@ - - + + {% include opengraph.html %}