normalize-scss 2.2.0 → 3.0.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee004151ff6570f4a7ba69fe75c99112c83d5bef
-  data.tar.gz: 58d665a65ff0ef7bf4a5afdb7d00659549b0517d
+  metadata.gz: 9bccc8ff786df26e1e1c2c747063e98c4bf5ac8c
+  data.tar.gz: 9737515c81304b655900b13cb6176e7b2df47df9
 SHA512:
-  metadata.gz: f855024df27bb8781e989e9e1aaebbdaa5ce410976a76b45a619c859f368388fc0b6882c3e36266d7726e7beb452fc22b4b84dfa513d88c6d2199de5ba014ff3
-  data.tar.gz: ed074b517e0f82536ca296742c6ae0f61a64ddf175c4cb66c5f5b57aaabdbf5cc6401a212b283dbe90b0fe0dd1743cb96ebf348daa4d87aa007fdbc672e68cbb
+  metadata.gz: 845a022203d910b90389f6acc86a720118b85fee431d1c372a379f8d428522a9d33a8f74a18289f43340c1481a520597953016a92b5427d612edb21db1aa7b4f
+  data.tar.gz: 08190c4e6b1a59e9ac7b9b166d9d446ded9c466a8f019e6db2c278f83b4e05251380923f34f972e8176b41dc8ad660dc52a159af9a87dfcb40cd2385d8c75d4d

data/CHANGELOG.md

@@ -1,7 +1,12 @@
 === HEAD
 
-=== 2.2.0+normalize.2.1.3 (January 22, 2014)
+=== 3.0.0-alpha.1+normalize.2.1.3 (January 22, 2014)
 
+* Upgrade to Compass 1.0's support module.
+* Use Compass 1.0.0's improved establish-baseline() mixin.
+* Use vertical rhythm's $rhythm-unit variable.
+* Add docs showing proper debug-vertical-alignment() usage.
+* Fix a bug in Compass 1.0.0-alpha.17 by overriding its support-legacy-browser() function.
 * Font size of "code, kbd, pre, samp" should always be 1em relative to parent.
 
 === 2.1.3 (August 26, 2013)

data/README.md

@@ -1,7 +1,8 @@
 ## Latest downloadable version
 
-The latest release of _normalize.scss is: [2.2.0+normalize.2.1.3](https://github.com/JohnAlbin/normalize.css-with-sass-or-compass/releases/tag/2.2.0%2Bnormalize.2.1.3).
-It combines normalize.css v2.1.3 and normalize v1.1.3.
+The latest release of _normalize.scss for Sass 3.3 and Compass 1.0 is: [3.0.0-alpha.1+normalize.2.1.3](https://github.com/JohnAlbin/normalize.css-with-sass-or-compass/archive/3.0.0-alpha.1+normalize.2.1.3.zip).
+The latest release of _normalize.scss for Sass 3.2 and Compass 0.12 is: [2.1.3](https://github.com/JohnAlbin/normalize.css-with-sass-or-compass/archive/2.1.3.zip).
+They both combine normalize.css v2.1.3 and normalize v1.1.3.
 
 ## The Compass port of normalize.css
 

data/_normalize.scss

@@ -1,4 +1,4 @@
-/* normalize.scss 2.2.0+normalize.2.1.3 | MIT/GPLv2 License | bit.ly/normalize-with-compass */
+/* normalize.scss 3.0.0-alpha.1+normalize.2.1.3 | MIT/GPLv2 License | bit.ly/normalize-with-compass */
 
 
 // =============================================================================
@@ -9,7 +9,7 @@
 // @see http://compass-style.org/help/tutorials/best_practices/
 // =============================================================================
 
-// These 2 variables are copies of ones used in Compass' Vertical Rhythm module.
+// These 3 variables are copies of ones used in Compass' Vertical Rhythm module.
 
     // The base font size.
     $base-font-size: 16px !default;
@@ -17,13 +17,22 @@
     // 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.
+    // The length unit in which to output vertical rhythm values.
+    // Supported values: px, em, rem.
+    $rhythm-unit: 'em' !default;
 
-    // Set this to true to add support for IE 6.
-    $legacy-support-for-ie6: false !default;
+// This variable is a copy of the one used in Compass' support module.
 
-    // Set this to true to add support for IE 7.
-    $legacy-support-for-ie7: false !default;
+    // Optional map of minimum browser versions to support. For example, to
+    // remove support for IE 7 and earlier, set $browser-minimum-versions['ie']
+    // to '8'.
+    $browser-minimum-versions: (
+        'chrome':  null,
+        'firefox': null,
+        'ie':      null,
+        'safari':  null,
+        'opera':   null
+    ) !default;
 
 
 // Set this to true to force CSS output to exactly match normalize.css.
@@ -49,6 +58,27 @@ $indent-amount: 40px !default;
 @import "compass/typography/vertical_rhythm";
 
 
+// To work around a bug in Compass 1.0.0-alpha.17, we override Compass'
+// support-legacy-browser() function with a version of our own.
+// @TODO Remove this monkey patch after it's fixed in Compass.
+// @see https://github.com/chriseppstein/compass/pull/1524
+@function support-legacy-browser($browser, $min-version, $max-version: null, $threshold: $critical-usage-threshold) {
+  @if not index($supported-browsers, $browser) {
+    @return false;
+  }
+  // Check against declared minimums.
+  $min-required-version: map-get($browser-minimum-versions, $browser);
+  @if $min-required-version {
+    @return compare-browser-versions($browser, $max-version or $min-version, $min-required-version) >= 0;
+  } @else {
+    // Check against usage stats.
+    $usage: if($max-version,
+               omitted-usage($browser, $min-version, $max-version),
+               omitted-usage($browser, $min-version));
+    @return $usage > $threshold;
+  }
+}
+
 /* ==========================================================================
    HTML5 display definitions
    ========================================================================== */
@@ -80,7 +110,7 @@ audio,
 canvas,
 video {
     display: inline-block;
-    @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
+    @if support-legacy-browser(ie, "7") {
         *display: inline;
         *zoom: 1;
     }
@@ -110,29 +140,31 @@ template {
    Base
    ========================================================================== */
 
+@if not $strict-normalize or support-legacy-browser(ie, "7") {
+    /**
+     * Establish a vertical rhythm unit using $base-font-size, $base-line-height,
+     * and $rhythm-unit variables. Also, correct text resizing oddly in IE 6/7 when
+     * body `font-size` is set using `em` units.
+     */
+
+    @include establish-baseline();
+}
+
 /**
  * 1. Set default font family to sans-serif.
  * 2. Prevent iOS text size adjust after orientation change, without disabling
  *    user zoom.
- * 3. Correct text resizing oddly in IE 6/7 when body `font-size` is set using
- *    `em` units.
  */
 
 html {
     font-family: $base-font-family; /* 1 */
-    @if not $strict-normalize or $legacy-support-for-ie6 or $legacy-support-for-ie7 {
-        font-size: 100% * ($base-font-size / 16px); /* 3 */
-    }
     -ms-text-size-adjust: 100%; /* 2 */
     -webkit-text-size-adjust: 100%; /* 2 */
-
-    @if not $strict-normalize {
-        /* Establish a vertical rhythm unit using $base-line-height. */
-        @include adjust-leading-to(1);
-    }
+    // Show a background image that can be used to debug your alignments.
+    // @include debug-vertical-alignment();
 }
 
-@if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
+@if support-legacy-browser(ie, "7") {
     /**
      * Address `font-family` inconsistency between `textarea` and other form
      * elements.
@@ -187,7 +219,7 @@ a:hover {
    Typography
    ========================================================================== */
 
-@if not $strict-normalize or $legacy-support-for-ie6 or $legacy-support-for-ie7 {
+@if not $strict-normalize or support-legacy-browser(ie, "7") {
     /**
      * Set 1 unit of vertical rhythm on the top and bottom margin.
      */
@@ -210,11 +242,11 @@ a:hover {
 
 h1 {
     /* Set the font-size and line-height while keeping a proper vertical rhythm. */
-    @if not $strict-normalize or $legacy-support-for-ie6 or $legacy-support-for-ie7 {
+    @if not $strict-normalize or support-legacy-browser(ie, "7") {
         @include adjust-font-size-to( $h1-font-size );
     }
     @else {
-        font-size: 1em * ($h1-font-size / $base-font-size);
+        font-size: if($rhythm-unit == "px", $h1-font-size, ($h1-font-size / $base-font-size)#{$rhythm-unit});
     }
 
     /* Set 1 unit of vertical rhythm on the top and bottom margins. */
@@ -222,7 +254,7 @@ h1 {
     @include trailer(1, $h1-font-size);
 }
 
-@if not $strict-normalize or $legacy-support-for-ie6 or $legacy-support-for-ie7 {
+@if not $strict-normalize or support-legacy-browser(ie, "7") {
     h2 {
         @include adjust-font-size-to( $h2-font-size );
         @include leader(1, $h2-font-size);
@@ -306,7 +338,7 @@ kbd,
 pre,
 samp {
     font-family: monospace, serif;
-    @if $legacy-support-for-ie6 {
+    @if support-legacy-browser(ie, "6") {
         _font-family: 'courier new', monospace;
     }
     font-size: 1em;
@@ -317,7 +349,7 @@ samp {
  */
 
 pre {
-    @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
+    @if support-legacy-browser(ie, "7") {
         white-space: pre;
         white-space: pre-wrap;
         word-wrap: break-word;
@@ -367,7 +399,7 @@ sub {
    Lists
    ========================================================================== */
 
-@if not $strict-normalize or $legacy-support-for-ie6 or $legacy-support-for-ie7 {
+@if not $strict-normalize or support-legacy-browser(ie, "7") {
     /**
      * Address margins set differently in IE 6/7.
      */
@@ -404,7 +436,7 @@ sub {
     }
 }
 
-@if $legacy-support-for-ie7 {
+@if support-legacy-browser(ie, "7") {
     /**
      * Correct list images handled incorrectly in IE 7.
      */
@@ -426,7 +458,7 @@ sub {
 
 img {
     border: 0;
-    @if $legacy-support-for-ie7 {
+    @if support-legacy-browser(ie, "7") {
         /* Improve image quality when scaled in IE 7. */
         -ms-interpolation-mode: bicubic;
     }
@@ -456,7 +488,7 @@ figure {
    Forms
    ========================================================================== */
 
-@if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
+@if support-legacy-browser(ie, "7") {
     /**
      * Correct margin displayed oddly in IE 6/7.
      */
@@ -489,7 +521,7 @@ fieldset {
 legend {
     border: 0; /* 1 */
     padding: 0; /* 2 */
-    @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
+    @if support-legacy-browser(ie, "7") {
         *margin-left: -7px; /* 3 */
     }
 }
@@ -508,7 +540,7 @@ textarea {
     font-family: inherit; /* 1 */
     font-size: 100%; /* 2 */
     margin: 0; /* 3 */
-    @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
+    @if support-legacy-browser(ie, "7") {
         vertical-align: baseline; /* 4 */
         *vertical-align: middle; /* 4 */
     }
@@ -552,7 +584,7 @@ input[type="reset"],
 input[type="submit"] {
     -webkit-appearance: button; /* 2 */
     cursor: pointer; /* 3 */
-    @if $legacy-support-for-ie7 {
+    @if support-legacy-browser(ie, "7") {
         *overflow: visible; /* 4 */
     }
 }
@@ -577,7 +609,7 @@ input[type="checkbox"],
 input[type="radio"] {
     @include box-sizing(border-box); /* 1 */
     padding: 0; /* 2 */
-    @if $legacy-support-for-ie7 {
+    @if support-legacy-browser(ie, "7") {
         *height: 13px; /* 3 */
         *width: 13px; /* 3 */
     }

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "normalize-scss",
-  "version": "2.2.0+normalize.2.1.3",
+  "version": "3.0.0-alpha.1+normalize.2.1.3",
   "homepage": "https://github.com/JohnAlbin/normalize.css-with-sass-or-compass",
   "authors": [
     "Nicolas Gallagher",

data/component.json

@@ -2,7 +2,7 @@
     "name": "normalize-scss",
     "repo": "JohnAlbin/normalize.css-with-sass-or-compass",
     "description": "A Sass/Compass version of Normalize.css.",
-    "version": "2.2.0+normalize.2.1.3",
+    "version": "3.0.0-alpha.1+normalize.2.1.3",
     "styles": ["_normalize.scss"],
     "author": ["Nicolas Gallagher", "John Albin Wilkins"],
     "license": "GPLv2"

data/normalize-scss.gemspec

@@ -9,15 +9,15 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://github.com/JohnAlbin/normalize.css-with-sass-or-compass'
   s.rubyforge_project =
 
-  s.version     = '2.2.0'
-  s.date        = '2014-01-22'
+  s.version     = '3.0.0.alpha.1'
+  s.date        = '2014-01-21'
   s.licenses    = ['GPL-2']
 
   s.authors     = ['John Albin Wilkins']
   s.email       = 'virtually.johnalbin@gmail.com'
 
-  s.add_runtime_dependency('sass', "~> 3.2.0")
-  s.add_runtime_dependency('compass', "~> 0.12.0")
+  s.add_runtime_dependency('sass',    ">= 3.3.0-rc.1")
+  s.add_runtime_dependency('compass', ">= 1.0.0.alpha.13")
 
   s.files       = %w[
     _normalize.scss

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: normalize-scss
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0.alpha.1
 platform: ruby
 authors:
 - John Albin Wilkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0.pre.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0.pre.rc.1
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 1.0.0.alpha.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 1.0.0.alpha.13
 description: A Sass/Compass version of Normalize.css. This port tracks the parent
   project very closely.
 email: virtually.johnalbin@gmail.com
@@ -70,11 +70,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 2.2.0
+rubyforge_project: 3.0.0.alpha.1
 rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4