Skip to content

Commit

Permalink
Update version to 2.2.0+normalize.2.1.3.
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnAlbin committed Jan 22, 2014
1 parent dd3d349 commit 80b0eb8
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 20 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions _normalize.scss
Original file line number Diff line number Diff line change
@@ -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 */


// =============================================================================
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions normalize-scss.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '[email protected]'

s.add_runtime_dependency('sass', ">= 3.2")
s.add_runtime_dependency('compass', ">= 0.12")

s.files = %w[
_normalize.scss
Expand Down
3 changes: 1 addition & 2 deletions tests/controls/font.css
Original file line number Diff line number Diff line change
@@ -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
========================================================================== */
Expand Down
3 changes: 1 addition & 2 deletions tests/controls/ie6.css
Original file line number Diff line number Diff line change
@@ -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
========================================================================== */
Expand Down
3 changes: 1 addition & 2 deletions tests/controls/ie7.css
Original file line number Diff line number Diff line change
@@ -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
========================================================================== */
Expand Down
3 changes: 1 addition & 2 deletions tests/controls/indent-amount.css
Original file line number Diff line number Diff line change
@@ -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
========================================================================== */
Expand Down
3 changes: 1 addition & 2 deletions tests/controls/strict-normalize-false.css
Original file line number Diff line number Diff line change
@@ -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
========================================================================== */
Expand Down
3 changes: 1 addition & 2 deletions tests/controls/strict-normalize-true.css
Original file line number Diff line number Diff line change
@@ -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
========================================================================== */
Expand Down

0 comments on commit 80b0eb8

Please sign in to comment.