_normalize.scss in normalize-scss-2.1.3 vs _normalize.scss in normalize-scss-2.2.0

- old
+ new

@@ -1,28 +1,39 @@ -/* normalize.css v2.1.3 | MIT License | git.io/normalize */ -/* normalize.scss v2.1.3 | MIT/GPLv2 License | bit.ly/normalize-with-compass */ +/* normalize.scss 2.2.0+normalize.2.1.3 | MIT/GPLv2 License | bit.ly/normalize-with-compass */ // ============================================================================= // Variables and Imports // // If you have a base partial (or equivalent), you should move these lines to -// that file. @see http://compass-style.org/help/tutorials/best_practices/ +// that file. NOTE: Edit the lines to remove "!default". +// @see http://compass-style.org/help/tutorials/best_practices/ // ============================================================================= +// These 2 variables are copies of ones used in Compass' Vertical Rhythm module. + + // The base font size. + $base-font-size: 16px !default; + + // The base line height determines the basic unit of vertical rhythm. + $base-line-height: 24px !default; + +// These 2 variables are copies of ones used in Compass' support module. + + // Set this to true to add support for IE 6. + $legacy-support-for-ie6: false !default; + + // Set this to true to add support for IE 7. + $legacy-support-for-ie7: false !default; + + // Set this to true to force CSS output to exactly match normalize.css. $strict-normalize: true !default; // The default font family. $base-font-family: sans-serif !default; -// The base font size. -$base-font-size: 16px !default; // Override default set in Compass' Vertical Rhythm partial. - -// The base line height determines the basic unit of vertical rhythm. -$base-line-height: 24px !default; // Override default set in Compass' Vertical Rhythm partial. - // The font sizes for h1-h6. $h1-font-size: 2 * $base-font-size !default; $h2-font-size: 1.5 * $base-font-size !default; $h3-font-size: 1.17 * $base-font-size !default; $h4-font-size: 1 * $base-font-size !default; @@ -30,16 +41,10 @@ $h6-font-size: 0.67 * $base-font-size !default; // The amount lists and blockquotes are indented. $indent-amount: 40px !default; -// Set this to true to add support for IE 6. -$legacy-support-for-ie6: false !default; // Override default set in Compass' Support partial. - -// Set this to true to add support for IE 7. -$legacy-support-for-ie7: false !default; // Override default set in Compass' Support partial. - // After the default variables are set, import the required Compass partials. @import "compass/support"; @import "compass/css3/box-sizing"; @import "compass/typography/vertical_rhythm"; @@ -302,15 +307,10 @@ samp { font-family: monospace, serif; @if $legacy-support-for-ie6 { _font-family: 'courier new', monospace; } - @if $strict-normalize { - font-size: 1em; - } - @else { - @include adjust-font-size-to( $base-font-size ); - } + font-size: 1em; } /** * Improve readability of pre-formatted text in all browsers. */