Skip to content

Commit

Permalink
Merge normalize.css' v1 (version 1.1.3) into normalize.scss' master.
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnAlbin committed Nov 2, 2013
2 parents 02cce38 + 857aa8b commit 22ed04d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
18 changes: 11 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
== HEAD
=== HEAD

== 2.1.2 (May 11, 2013)

Expand Down Expand Up @@ -31,31 +31,35 @@
* Form elements automatically inherit `font-family` from ancestor.
* Drop support for IE 6/7, Firefox < 4, and Safari < 5.

== 1.1.2 (May 11, 2013)
=== 1.1.3 (August 30, 2013)

* Update component.json to fit new specification

=== 1.1.2 (May 11, 2013)

* Revert root `color` and `background` normalizations.

== 1.1.1 (April 8, 2013)
=== 1.1.1 (April 8, 2013)

* Normalize root `color` and `background` to counter the effects of system
color schemes.

== 1.1.0 (January 21, 2013)
=== 1.1.0 (January 21, 2013)

* Normalize `text-transform` for `button` and `select`.
* Normalize `hr` element (excluding IE 6/7).
* Add `main` element to HTML5 display definitions.
* Fix cursor style for disabled button `input`.

== 1.0.2 (November 17, 2012)
=== 1.0.2 (November 17, 2012)

* Correct `h6` font size normalization.

== 1.0.1 (August 19, 2012)
=== 1.0.1 (August 19, 2012)

* Adjust `small` font size normalization.

== 1.0.0 (August 14, 2012)
=== 1.0.0 (August 14, 2012)

(Only the notable changes since public release)

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Latest downloadable version

The latest release of _normalize.scss is: [2.1.2](https://github.com/JohnAlbin/normalize.css-with-sass-or-compass/archive/2.1.2.zip).
It combines normalize.css v2.1.2 and normalize v1.1.2.
It combines normalize.css v2.1.2 and normalize v1.1.3.

## The Compass port of normalize.css

Expand Down

0 comments on commit 22ed04d

Please sign in to comment.