Skip to content

Commit

Permalink
Merge pull request #7 from sogko/master
Browse files Browse the repository at this point in the history
Update to 3.0.3 released on 31 March 2015
  • Loading branch information
appleboy committed Apr 22, 2015
2 parents 9e1f63a + 62b8a41 commit 4daa6ff
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 22 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
=== HEAD

=== 3.0.3 (March 30, 2015)

* Remove unnecessary vendor prefixes.
* Add `main` property.

=== 3.0.2 (October 4, 2014)

* Only alter `background-color` of links in IE 10.
Expand Down
17 changes: 7 additions & 10 deletions _normalize.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ $legacy_browser_support: false !default;

/**
* 1. Set default font family to sans-serif.
* 2. Prevent iOS text size adjust after orientation change, without disabling
* user zoom.
* 2. Prevent iOS and IE text size adjust after device orientation change,
* without disabling user zoom.
* 3. Corrects text resizing oddly in IE 6/7 when body `font-size` is set using
* `em` units.
*/
Expand Down Expand Up @@ -92,7 +92,7 @@ audio:not([controls]) {

/**
* Address `[hidden]` styling not present in IE 8/9/10.
* Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
* Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22.
*/

[hidden],
Expand All @@ -112,7 +112,8 @@ a {
}

/**
* Improve readability when focused and also mouse hovered in all browsers.
* Improve readability of focused elements when they are also in an
* active/hover state.
*/

a {
Expand Down Expand Up @@ -341,7 +342,6 @@ figure {
*/

hr {
-moz-box-sizing: content-box;
box-sizing: content-box;
height: 0;
}
Expand Down Expand Up @@ -498,15 +498,12 @@ input[type="number"]::-webkit-outer-spin-button {

/**
* 1. Address `appearance` set to `searchfield` in Safari and Chrome.
* 2. Address `box-sizing` set to `border-box` in Safari and Chrome
* (include `-moz` to future-proof).
* 2. Address `box-sizing` set to `border-box` in Safari and Chrome.
*/

input[type="search"] {
-webkit-appearance: textfield; /* 1 */
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box; /* 2 */
box-sizing: content-box;
box-sizing: content-box; /* 2 */
}

/**
Expand Down
21 changes: 9 additions & 12 deletions normalize.css
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */

/**
* 1. Set default font family to sans-serif.
* 2. Prevent iOS text size adjust after orientation change, without disabling
* user zoom.
* 2. Prevent iOS and IE text size adjust after device orientation change,
* without disabling user zoom.
*/

html {
Expand Down Expand Up @@ -71,7 +71,7 @@ audio:not([controls]) {

/**
* Address `[hidden]` styling not present in IE 8/9/10.
* Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
* Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22.
*/

[hidden],
Expand All @@ -91,7 +91,8 @@ a {
}

/**
* Improve readability when focused and also mouse hovered in all browsers.
* Improve readability of focused elements when they are also in an
* active/hover state.
*/

a:active,
Expand Down Expand Up @@ -209,7 +210,6 @@ figure {
*/

hr {
-moz-box-sizing: content-box;
box-sizing: content-box;
height: 0;
}
Expand Down Expand Up @@ -350,15 +350,12 @@ input[type="number"]::-webkit-outer-spin-button {

/**
* 1. Address `appearance` set to `searchfield` in Safari and Chrome.
* 2. Address `box-sizing` set to `border-box` in Safari and Chrome
* (include `-moz` to future-proof).
* 2. Address `box-sizing` set to `border-box` in Safari and Chrome.
*/

input[type="search"] {
-webkit-appearance: textfield; /* 1 */
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box; /* 2 */
box-sizing: content-box;
box-sizing: content-box; /* 2 */
}

/**
Expand Down Expand Up @@ -424,4 +421,4 @@ table {
td,
th {
padding: 0;
}
}

0 comments on commit 4daa6ff

Please sign in to comment.