diff options
author | JohnAlbin <virtually.johnalbin@gmail.com> | 2015-11-19 04:25:42 +0300 |
---|---|---|
committer | JohnAlbin <virtually.johnalbin@gmail.com> | 2015-11-19 04:35:02 +0300 |
commit | 773c7e4addfc6b3c952320e650e3824ac7954b83 (patch) | |
tree | bd4c0d02fb281aa5868ed9a5713b1646ce7139d1 /fork-versions | |
parent | 44957353fd9acabd09a97f9b49ac45263b2f8d02 (diff) |
Update typey-chroma-kss fork.
Diffstat (limited to 'fork-versions')
9 files changed, 130 insertions, 111 deletions
diff --git a/fork-versions/typey-chroma-kss/base/_normalize.scss b/fork-versions/typey-chroma-kss/base/_normalize.scss index 388d954..0667d0d 100644 --- a/fork-versions/typey-chroma-kss/base/_normalize.scss +++ b/fork-versions/typey-chroma-kss/base/_normalize.scss @@ -1,19 +1,5 @@ /*! normalize-scss | MIT/GPLv2 License | bit.ly/normalize-scss */ -// If we've customized any font variables, we'll need extra properties. -@if $base-font-size != 16px - or $base-line-height != 24px - or $base-unit != 'em' - or $h1-font-size != 2 * $base-font-size - or $h2-font-size != 1.5 * $base-font-size - or $h3-font-size != 1.17 * $base-font-size - or $h4-font-size != 1 * $base-font-size - or $h5-font-size != 0.83 * $base-font-size - or $h6-font-size != 0.67 * $base-font-size - or $indent-amount != 40px { - $normalize-vertical-rhythm: true; -} - // Normalize-scss is broken into modular pieces to make it easier to edit. @import 'root'; @import 'html5'; @@ -24,3 +10,6 @@ @import 'embedded/embedded'; @import 'forms/forms'; @import 'tables/tables'; + +// Note: we allow the .button component (loaded by forms) to override :link, by +// loading links first. diff --git a/fork-versions/typey-chroma-kss/base/embedded/_embedded.scss b/fork-versions/typey-chroma-kss/base/embedded/_embedded.scss index 4bd7e3e..8cd66fa 100644 --- a/fork-versions/typey-chroma-kss/base/embedded/_embedded.scss +++ b/fork-versions/typey-chroma-kss/base/embedded/_embedded.scss @@ -17,6 +17,10 @@ img { // Remove border when inside `a` element in IE 8/9/10. border: 0; } + @if support-for(ie, 7) { + /* Improve image quality when scaled in IE 7. */ + -ms-interpolation-mode: bicubic; + } } img, diff --git a/fork-versions/typey-chroma-kss/base/forms/_forms.scss b/fork-versions/typey-chroma-kss/base/forms/_forms.scss index 44b97fe..bb5908b 100644 --- a/fork-versions/typey-chroma-kss/base/forms/_forms.scss +++ b/fork-versions/typey-chroma-kss/base/forms/_forms.scss @@ -15,7 +15,7 @@ // // The following 8 rules are from normalize.css and help to fix inconsistencies // across various browsers. You should probably leave these rules as is and jump -// to the "Buttons" rule on line 105 before you start editing this file. +// to the "Buttons" rule on line 95 before you start editing this file. // button, @@ -33,6 +33,12 @@ textarea { font: inherit; // Address margins set differently in Firefox 4+, Safari, and Chrome. margin: 0; + @if support-for(ie, 7) { + // Address `font-family` inconsistency between `textarea` and other form in IE 7 + *font-family: $font-body; + // Improve appearance and consistency with IE 6/7. + *vertical-align: middle; + } } // Address `overflow` set to `hidden` in IE 8/9/10/11. @@ -187,6 +193,12 @@ input[type="radio"] { // Remove excess padding in IE 8/9/10. padding: 0; } + @if support-for(ie, 7) { + // Remove excess padding in IE 7. + // Known issue: excess padding remains in IE 6. + *height: 13px; + *width: 13px; + } } // Fieldsets @@ -215,6 +227,10 @@ legend { // people aren't caught out if they zero out fieldset padding. margin-left: -5px; padding: 0 5px; + @if support-for(ie, 7) { + // Correct alignment displayed oddly in IE 6/7. + *margin-left: -7px; + } } // Labels @@ -228,9 +244,7 @@ legend { // Style guide: forms.base.label label { - // Drupal-style form labels. - display: block; - font-weight: bold; + // Add your styles. } // Select list diff --git a/fork-versions/typey-chroma-kss/base/grouping/_grouping.scss b/fork-versions/typey-chroma-kss/base/grouping/_grouping.scss index 8fbfa1d..1e6919d 100644 --- a/fork-versions/typey-chroma-kss/base/grouping/_grouping.scss +++ b/fork-versions/typey-chroma-kss/base/grouping/_grouping.scss @@ -7,6 +7,93 @@ // // Style guide: base.grouping + +// Lists +// +// Weight: -1 +// +// Style guide: base.grouping.lists + +// Unordered list +// +// The `<ul>` element is a list of items in which the order does <em>not</em> +// explicitly matter. +// +// Markup: grouping-ul.hbs +// +// Style guide: base.grouping.lists.ul + +// Ordered list +// +// The `<ol>` element is a list of items in which the order <em>does</em> +// explicitly matter. +// +// Markup: grouping-ol.hbs +// +// Style guide: base.grouping.lists.ol + +// Description list +// +// The `<dl>` element is a list of terms with their associated descriptions. +// +// Markup: grouping-dl.hbs +// +// Weight: 1 +// +// Style guide: base.grouping.lists.dl + +dl, +menu, +ol, +ul { + // Address margins set differently in IE 6/7. + @include margin(1 0); +} + +// Turn off margins on nested lists. +ol, +ul { + ol, + ul { + margin: 0; + } +} + +dt { + // Add your styles. +} + +dd { + margin: 0 0 0 $indent-amount; + + @include rtl { + margin: 0 $indent-amount 0 0; + } +} + +// Address paddings set differently in IE 6/7. +menu, +ol, +ul { + padding: 0 0 0 $indent-amount; + + @include rtl { + padding: 0 $indent-amount 0 0; + } +} + +@if support-for(ie, 7) { + /** + * Correct list images handled incorrectly in IE 7. + */ + + nav ul, + nav ol { + list-style: none; + list-style-image: none; + } +} + // Block quotes // // The `<blockquote>` element is for quoting blocks of content from another @@ -24,7 +111,7 @@ blockquote { // Set 1 unit of vertical rhythm on the top and bottom margin. // Also indent the quote on both sides. - @include margin(0 $indent-amount 1); + @include margin(1 $indent-amount); } // Figures @@ -41,7 +128,7 @@ blockquote { figure { // Address margin not present in IE 8/9 and Safari. - @include margin(0 0 1); + @include margin(1 $indent-amount); } figcaption { @@ -104,77 +191,3 @@ pre { // Contain overflow in all browsers. overflow: auto; } - -// Lists -// -// Weight: -1 -// -// Style guide: base.grouping.lists - -// Unordered list -// -// The `<ul>` element is a list of items in which the order does <em>not</em> -// explicitly matter. -// -// Markup: grouping-ul.hbs -// -// Style guide: base.grouping.lists.ul - -// Ordered list -// -// The `<ol>` element is a list of items in which the order <em>does</em> -// explicitly matter. -// -// Markup: grouping-ol.hbs -// -// Style guide: base.grouping.lists.ol - -// Description list -// -// The `<dl>` element is a list of terms with their associated descriptions. -// -// Markup: grouping-dl.hbs -// -// Weight: 1 -// -// Style guide: base.grouping.lists.dl - -dl, -menu, -ol, -ul { - // Address margins set differently in IE 6/7. - @include margin(1 0); -} - -// Turn off margins on nested lists. -ol, -ul { - ol, - ul { - margin: 0; - } -} - -dt { - // Add your styles. -} - -dd { - margin: 0 0 0 $indent-amount; - - @include rtl { - margin: 0 $indent-amount 0 0; - } -} - -// Address paddings set differently in IE 6/7. -menu, -ol, -ul { - padding: 0 0 0 $indent-amount; - - @include rtl { - padding: 0 $indent-amount 0 0; - } -} diff --git a/fork-versions/typey-chroma-kss/base/headings/_headings.scss b/fork-versions/typey-chroma-kss/base/headings/_headings.scss index 0181221..78efd02 100644 --- a/fork-versions/typey-chroma-kss/base/headings/_headings.scss +++ b/fork-versions/typey-chroma-kss/base/headings/_headings.scss @@ -16,41 +16,41 @@ h1, @include type-layout(xxl, 2); // Set 1 unit of vertical rhythm on the top and bottom margins. - @include margin-top(1); - @include margin-bottom(1); + @include margin-top(1, xxl); + @include margin-bottom(1, xxl); } h2, %h2 { @include type-layout(xl, 1.5); - @include margin-top(1); - @include margin-bottom(1); + @include margin-top(1, xl); + @include margin-bottom(1, xl); } h3, %h3 { @include type-layout(l, 1.5); - @include margin-top(1); - @include margin-bottom(1); + @include margin-top(1, l); + @include margin-bottom(1, l); } h4, %h4 { @include type-layout(m, 1); - @include margin-top(1); - @include margin-bottom(1); + @include margin-top(1, m); + @include margin-bottom(1, m); } h5, %h5 { @include type-layout(s, 1); - @include margin-top(1); - @include margin-bottom(1); + @include margin-top(1, s); + @include margin-bottom(1, s); } h6, %h6 { @include type-layout(xs, 1); - @include margin-top(1); - @include margin-bottom(1); + @include margin-top(1, xs); + @include margin-bottom(1, xs); } diff --git a/fork-versions/typey-chroma-kss/base/links/_links.scss b/fork-versions/typey-chroma-kss/base/links/_links.scss index 8cb82b6..1ab0f29 100644 --- a/fork-versions/typey-chroma-kss/base/links/_links.scss +++ b/fork-versions/typey-chroma-kss/base/links/_links.scss @@ -38,7 +38,8 @@ a:active { } } -// Improve readability by removing focus styles when also mouse hovered in all browsers. +// Improve readability of focused elements when they are also in an +// active/hover state. a:active, a:hover { outline: 0; diff --git a/fork-versions/typey-chroma-kss/base/tables/_tables.scss b/fork-versions/typey-chroma-kss/base/tables/_tables.scss index ee5eb18..de27473 100644 --- a/fork-versions/typey-chroma-kss/base/tables/_tables.scss +++ b/fork-versions/typey-chroma-kss/base/tables/_tables.scss @@ -20,5 +20,6 @@ table { td, th { + // Remove most spacing between table cells. padding: 0; } diff --git a/fork-versions/typey-chroma-kss/init/_colors.scss b/fork-versions/typey-chroma-kss/init/_colors.scss index 947a0e1..7070af7 100644 --- a/fork-versions/typey-chroma-kss/init/_colors.scss +++ b/fork-versions/typey-chroma-kss/init/_colors.scss @@ -23,7 +23,6 @@ $chroma: define-color-scheme('functional', 'Colors used by functional parts of t $chroma: add-colors('functional', ( // Colors used in the main content area. text: 'black', - text-bg: 'white', link: 'blue', link-visited: ('blue' darken 20%), @@ -31,12 +30,9 @@ $chroma: add-colors('functional', ( border: 'grey-light', - body-bg: 'text-bg', - button: 'text', button-disabled: 'grey', - mark-highlight: 'red', mark-bg: 'yellow', )); diff --git a/fork-versions/typey-chroma-kss/init/_variables.scss b/fork-versions/typey-chroma-kss/init/_variables.scss index 8acedc1..bbdc400 100644 --- a/fork-versions/typey-chroma-kss/init/_variables.scss +++ b/fork-versions/typey-chroma-kss/init/_variables.scss @@ -9,6 +9,7 @@ // // Support the same browsers as normalize.css v3. +// Possible keys: chrome, edge, firefox, ie, opera, safari, '*' $support-for: ( ie: 9, // IE 9-11 '*': -4, // The last 4 versions of all other browsers. |