From: Nicolas Coden Date: Tue, 8 Nov 2016 02:01:45 +0000 (+0100) Subject: Sass lint: Sort typography properties X-Git-Tag: v6.3-rc1~18^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca73ceb0ab50b763fc6bfc011407aa89f8a37cfc;p=thirdparty%2Ffoundation%2Ffoundation-sites.git Sass lint: Sort typography properties Sort typography properties following the Specific property sort order. See : https://gist.github.com/ncoden/d42f55df7c7970f548a02cd3468f9c86 --- diff --git a/scss/typography/_base.scss b/scss/typography/_base.scss index 3dae119e7..8781cae97 100644 --- a/scss/typography/_base.scss +++ b/scss/typography/_base.scss @@ -258,9 +258,10 @@ $abbr-underline: 1px dotted $black !default; // Paragraphs p { + margin-bottom: $paragraph-margin-bottom; + font-size: inherit; line-height: $paragraph-lineheight; - margin-bottom: $paragraph-margin-bottom; text-rendering: $paragraph-text-rendering; } @@ -291,18 +292,19 @@ $abbr-underline: 1px dotted $black !default; h4, h5, h6 { + margin-top: 0; + margin-bottom: $header-margin-bottom; + font-family: $header-font-family; - font-weight: $header-font-weight; font-style: $header-font-style; + font-weight: $header-font-weight; + line-height: $header-lineheight; color: $header-color; text-rendering: $header-text-rendering; - margin-top: 0; - margin-bottom: $header-margin-bottom; - line-height: $header-lineheight; small { - color: $header-small-font-color; line-height: 0; + color: $header-small-font-color; } } @@ -319,9 +321,10 @@ $abbr-underline: 1px dotted $black !default; // Links a { + line-height: inherit; color: $anchor-color; text-decoration: $anchor-text-decoration; - line-height: inherit; + cursor: pointer; &:hover, @@ -339,23 +342,25 @@ $abbr-underline: 1px dotted $black !default; // Horizontal rule hr { + clear: both; + max-width: $hr-width; height: 0; - border-right: 0; + margin: $hr-margin; + border-top: 0; + border-right: 0; border-bottom: $hr-border; border-left: 0; - margin: $hr-margin; - clear: both; } // Lists ul, ol, dl { - line-height: $list-lineheight; margin-bottom: $list-margin-bottom; list-style-position: $list-style-position; + line-height: $list-lineheight; } // List items @@ -365,8 +370,8 @@ $abbr-underline: 1px dotted $black !default; // Unordered lists ul { - list-style-type: $list-style-type; margin-#{$global-left}: $list-side-margin; + list-style-type: $list-style-type; } // Ordered lists @@ -417,28 +422,32 @@ $abbr-underline: 1px dotted $black !default; // Abbreviations abbr { + border-bottom: $abbr-underline; color: $body-font-color; cursor: help; - border-bottom: $abbr-underline; } // Code code { + padding: $code-padding; + + background-color: $code-background; + border: $code-border; + font-family: $code-font-family; font-weight: $code-font-weight; color: $code-color; - background-color: $code-background; - border: $code-border; - padding: $code-padding; } // Keystrokes kbd { - padding: $keystroke-padding; margin: 0; + padding: $keystroke-padding; + background-color: $keystroke-background; - color: $keystroke-color; + font-family: $keystroke-font; + color: $keystroke-color; @if has-value($keystroke-radius) { border-radius: $keystroke-radius; diff --git a/scss/typography/_helpers.scss b/scss/typography/_helpers.scss index 1e753aebb..011e8e66f 100644 --- a/scss/typography/_helpers.scss +++ b/scss/typography/_helpers.scss @@ -48,6 +48,7 @@ $stat-font-size: 2.5rem !default; .subheader { margin-top: $subheader-margin-top; margin-bottom: $subheader-margin-bottom; + font-weight: $subheader-font-weight; line-height: $subheader-lineheight; color: $subheader-color; diff --git a/scss/typography/_print.scss b/scss/typography/_print.scss index 43cf6fa7c..9518f3e20 100644 --- a/scss/typography/_print.scss +++ b/scss/typography/_print.scss @@ -19,8 +19,9 @@ $print-hrefs: true !default; background: transparent !important; } - color: black !important; // Black prints faster: h5bp.com/s box-shadow: none !important; + + color: black !important; // Black prints faster: h5bp.com/s text-shadow: none !important; }