diff --git a/CHANGELOG.md b/CHANGELOG.md index ffad92974..3815570aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ === HEAD -=== Unreleased development version +=== 2.2.0+normalize.2.1.3 (January 22, 2014) * Font size of "code, kbd, pre, samp" should always be 1em relative to parent. diff --git a/README.md b/README.md index 038a4bcb6..ad6657335 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## 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). +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 Compass port of normalize.css diff --git a/_normalize.scss b/_normalize.scss index e3fb9af40..95cf8f49b 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 2.2.0+normalize.2.1.3 | MIT/GPLv2 License | bit.ly/normalize-with-compass */ // ============================================================================= diff --git a/bower.json b/bower.json index 565003d42..a1cda2725 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "normalize-scss", - "version": "2.1.3", + "version": "2.2.0+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..5f6d7ef64 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": "2.2.0+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 03bf63570..6c5b103fd 100644 --- a/normalize-scss.gemspec +++ b/normalize-scss.gemspec @@ -9,14 +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.1.3' - s.date = '2013-11-03' + s.version = '2.2.0' + s.date = '2014-01-22' s.licenses = ['GPL-2'] s.authors = ['John Albin Wilkins'] s.email = 'virtually.johnalbin@gmail.com' s.add_runtime_dependency('sass', ">= 3.2") + s.add_runtime_dependency('compass', ">= 0.12") s.files = %w[ _normalize.scss diff --git a/tests/controls/font.css b/tests/controls/font.css index 7d95df765..0b2202ba1 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 2.2.0+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 e09d244e6..86e8d4830 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 2.2.0+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 7988e551d..18a8d4da3 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 2.2.0+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 f2e53ce39..82dc03746 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 2.2.0+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 d374662c9..96b9ac2b6 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 2.2.0+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 3956ad80c..0640c9b09 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 2.2.0+normalize.2.1.3 | MIT/GPLv2 License | bit.ly/normalize-with-compass */ /* ========================================================================== HTML5 display definitions ========================================================================== */