From 582752520eb29e15f824587e86272025a923b7c9 Mon Sep 17 00:00:00 2001 From: JohnAlbin Date: Mon, 20 Jan 2014 15:46:00 +0800 Subject: [PATCH] Update version to 3.0.0-alpha.1+normalize.2.1.3. --- CHANGELOG.md | 7 ++++++- README.md | 5 +++-- _normalize.scss | 3 +-- bower.json | 2 +- component.json | 2 +- normalize-scss.gemspec | 4 ++-- tests/controls/font.css | 3 +-- tests/controls/ie6.css | 3 +-- tests/controls/ie7.css | 3 +-- tests/controls/ie8.css | 3 +-- tests/controls/indent-amount.css | 3 +-- tests/controls/strict-normalize-false.css | 3 +-- tests/controls/strict-normalize-true.css | 3 +-- 13 files changed, 21 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ffad92974..210576fe3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,12 @@ === HEAD -=== Unreleased development version +=== 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) diff --git a/README.md b/README.md index 038a4bcb6..bf6f8631d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ ## Latest downloadable version -The latest release of _normalize.scss is: [2.1.3](https://github.com/JohnAlbin/normalize.css-with-sass-or-compass/archive/2.1.3.zip). -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 diff --git a/_normalize.scss b/_normalize.scss index 56cf48c93..befb70d9f 100644 --- a/_normalize.scss +++ b/_normalize.scss @@ -1,5 +1,4 @@ -/* 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 3.0.0-alpha.1+normalize.2.1.3 | MIT/GPLv2 License | bit.ly/normalize-with-compass */ // ============================================================================= diff --git a/bower.json b/bower.json index 565003d42..5343de040 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "normalize-scss", - "version": "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", diff --git a/component.json b/component.json index b767aede5..25eeecda9 100644 --- a/component.json +++ b/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.1.3", + "version": "3.0.0-alpha.1+normalize.2.1.3", "styles": ["_normalize.scss"], "author": ["Nicolas Gallagher", "John Albin Wilkins"], "license": "GPLv2" diff --git a/normalize-scss.gemspec b/normalize-scss.gemspec index 783f7bb29..37886bbe0 100644 --- a/normalize-scss.gemspec +++ b/normalize-scss.gemspec @@ -9,8 +9,8 @@ Gem::Specification.new do |s| s.homepage = 'https://github.com/JohnAlbin/normalize.css-with-sass-or-compass' s.rubyforge_project = - s.version = '2.1.3' - s.date = '2013-11-03' + s.version = '3.0.0.alpha.1' + s.date = '2014-01-21' s.licenses = ['GPL-2'] s.authors = ['John Albin Wilkins'] diff --git a/tests/controls/font.css b/tests/controls/font.css index dd9bacaba..f581414c0 100644 --- a/tests/controls/font.css +++ b/tests/controls/font.css @@ -1,5 +1,4 @@ -/* 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 3.0.0-alpha.1+normalize.2.1.3 | MIT/GPLv2 License | bit.ly/normalize-with-compass */ /* ========================================================================== HTML5 display definitions ========================================================================== */ diff --git a/tests/controls/ie6.css b/tests/controls/ie6.css index 5f2428f78..ac91cb80d 100644 --- a/tests/controls/ie6.css +++ b/tests/controls/ie6.css @@ -1,5 +1,4 @@ -/* 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 3.0.0-alpha.1+normalize.2.1.3 | MIT/GPLv2 License | bit.ly/normalize-with-compass */ /* ========================================================================== HTML5 display definitions ========================================================================== */ diff --git a/tests/controls/ie7.css b/tests/controls/ie7.css index 43ae334a8..29bebe9db 100644 --- a/tests/controls/ie7.css +++ b/tests/controls/ie7.css @@ -1,5 +1,4 @@ -/* 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 3.0.0-alpha.1+normalize.2.1.3 | MIT/GPLv2 License | bit.ly/normalize-with-compass */ /* ========================================================================== HTML5 display definitions ========================================================================== */ diff --git a/tests/controls/ie8.css b/tests/controls/ie8.css index e56b06e2d..abf36a1a0 100644 --- a/tests/controls/ie8.css +++ b/tests/controls/ie8.css @@ -1,5 +1,4 @@ -/* 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 3.0.0-alpha.1+normalize.2.1.3 | MIT/GPLv2 License | bit.ly/normalize-with-compass */ /* ========================================================================== HTML5 display definitions ========================================================================== */ diff --git a/tests/controls/indent-amount.css b/tests/controls/indent-amount.css index a15dafb3c..6a5bf48b7 100644 --- a/tests/controls/indent-amount.css +++ b/tests/controls/indent-amount.css @@ -1,5 +1,4 @@ -/* 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 3.0.0-alpha.1+normalize.2.1.3 | MIT/GPLv2 License | bit.ly/normalize-with-compass */ /* ========================================================================== HTML5 display definitions ========================================================================== */ diff --git a/tests/controls/strict-normalize-false.css b/tests/controls/strict-normalize-false.css index 7beaff49f..9aae53ce6 100644 --- a/tests/controls/strict-normalize-false.css +++ b/tests/controls/strict-normalize-false.css @@ -1,5 +1,4 @@ -/* 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 3.0.0-alpha.1+normalize.2.1.3 | MIT/GPLv2 License | bit.ly/normalize-with-compass */ /* ========================================================================== HTML5 display definitions ========================================================================== */ diff --git a/tests/controls/strict-normalize-true.css b/tests/controls/strict-normalize-true.css index 43ae334a8..29bebe9db 100644 --- a/tests/controls/strict-normalize-true.css +++ b/tests/controls/strict-normalize-true.css @@ -1,5 +1,4 @@ -/* 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 3.0.0-alpha.1+normalize.2.1.3 | MIT/GPLv2 License | bit.ly/normalize-with-compass */ /* ========================================================================== HTML5 display definitions ========================================================================== */