Skip to content

Commit

Permalink
Update version to 3.0.0-alpha.1+normalize.2.1.3.
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnAlbin committed Jan 21, 2014
1 parent a6be355 commit 5827525
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 23 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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

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 3.0.0-alpha.1+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": "3.0.0-alpha.1+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": "3.0.0-alpha.1+normalize.2.1.3",
"styles": ["_normalize.scss"],
"author": ["Nicolas Gallagher", "John Albin Wilkins"],
"license": "GPLv2"
Expand Down
4 changes: 2 additions & 2 deletions normalize-scss.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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']
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 3.0.0-alpha.1+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 3.0.0-alpha.1+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 3.0.0-alpha.1+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/ie8.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 3.0.0-alpha.1+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 3.0.0-alpha.1+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 3.0.0-alpha.1+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 3.0.0-alpha.1+normalize.2.1.3 | MIT/GPLv2 License | bit.ly/normalize-with-compass */
/* ==========================================================================
HTML5 display definitions
========================================================================== */
Expand Down

0 comments on commit 5827525

Please sign in to comment.