From 639af4e31fa260e081dd61b4b2d402fb2dfddb79 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Fri, 11 Aug 2017 00:51:21 +0200 Subject: [PATCH] heading tweaks --- _src/_assets/scss/_typography.scss | 33 +++++++++++++++++++++++++++++- _src/_assets/scss/_variables.scss | 22 ++++++++++---------- 2 files changed, 43 insertions(+), 12 deletions(-) diff --git a/_src/_assets/scss/_typography.scss b/_src/_assets/scss/_typography.scss index 500f907..afb5564 100644 --- a/_src/_assets/scss/_typography.scss +++ b/_src/_assets/scss/_typography.scss @@ -52,7 +52,9 @@ body { // // Headings // -h1, h2, h3, h4, h5 { // stylelint-disable-line selector-list-comma-newline-after + +/* stylelint-disable selector-list-comma-newline-after */ +h1, h2, h3, h4, h5 { color: $headings-color; font-family: $headings-font-family; font-weight: $headings-font-weight; @@ -65,6 +67,33 @@ h1, h2, h3, h4, h5 { // stylelint-disable-line selector-list-comma-newline-after } } +h1, .h1, +h2, .h2, +h3, .h3 { + margin-top: ($spacer * 2); + margin-bottom: ($spacer * 2); +} + +h4, .h4, +h5, .h5, +h6, .h6 { + margin-top: $spacer; + margin-bottom: $spacer; +} + +h1, .h1 { font-size: $font-size-h1; } +h2, .h2 { font-size: $font-size-h2; } +h3, .h3 { font-size: $font-size-h3; } +h4, .h4 { font-size: $font-size-h4; } +h5, .h5 { font-size: $font-size-h5; } +h6, .h6 { font-size: $font-size-h6; } + +/* stylelint-enable */ + + +// +// Body text +// p, ul, ol { @@ -77,10 +106,12 @@ ol { // a { color: $link-color; + text-decoration: none; &:hover, &:focus { color: lighten($link-color, 10%); + outline: 0; } } diff --git a/_src/_assets/scss/_variables.scss b/_src/_assets/scss/_variables.scss index ed9422b..49020f3 100644 --- a/_src/_assets/scss/_variables.scss +++ b/_src/_assets/scss/_variables.scss @@ -3,7 +3,7 @@ // $brand-01: #cd2d2d !default; $brand-02: #779bc3 !default; -$brand-03: #444 !default; +$brand-03: #201a16 !default; $brand-04: #444 !default; $brand-05: #636363 !default; $brand-06: #444 !default; @@ -14,9 +14,9 @@ $brand-06: #444 !default; $font-family-base: 'futura-pt', 'Helvetica Neue', Helvetica, Arial, sans-serif !default; $font-family-monospace: Menlo, Monaco, Consolas, 'Courier New', monospace !default; -$font-size-root: 16px !default; -$font-size-root-lg: 18px !default; -$line-height: 1.5 !default; +$font-size-root: 18px !default; +$font-size-root-lg: 20px !default; +$line-height: 1.4 !default; $spacer: 2rem !default; $font-weight-light: 300 !default; @@ -24,20 +24,20 @@ $font-weight-normal: 400 !default; $font-weight-bold: 600 !default; $font-size-base: 1rem !default; -$font-size-large: 1.3rem !default; +$font-size-large: 1.2rem !default; $font-size-small: .8rem !default; $font-size-mini: .7rem !default; -$font-size-h1: 2.7rem !default; -$font-size-h2: 2.3rem !default; -$font-size-h3: 1.8rem !default; -$font-size-h4: 1.45rem !default; +$font-size-h1: 2.5rem !default; +$font-size-h2: 2rem !default; +$font-size-h3: 1.7rem !default; +$font-size-h4: 1.4rem !default; $font-size-h5: $font-size-large !default; $font-size-h6: $font-size-base !default; $headings-font-family: inherit !default; -$headings-font-weight: $font-weight-light !default; -$headings-line-height: 1.3 !default; +$headings-font-weight: $font-weight-normal !default; +$headings-line-height: inherit !default; $headings-color: $brand-03 !default; $text-color: $brand-05 !default;