Skip to content

Commit

Permalink
Merge pull request #1 from justafish/normalize-303
Browse files Browse the repository at this point in the history
Pull updates from normalize.css 3.0.3
  • Loading branch information
krisbulman committed Jun 10, 2015
2 parents 1ca011d + e9e3fc4 commit 86e9d11
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 13 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
=== normalize-libsass 1.0.3 (May 31, 2015)

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

=== normalize-libsass 1.0.2 (March 6, 2015)
* Added convert-units function to keep it real with Sass units (Thanks @HugoGiraudel)

Expand All @@ -23,6 +28,11 @@ Initial stable release published as npm module

=== 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
@@ -1,5 +1,5 @@
////
/// normalize-libsass 1.0.2
/// normalize-libsass 1.0.3
/// MIT/GPLv2 License
/// lb.cm/normalize-libsass
////
Expand Down Expand Up @@ -101,7 +101,8 @@ $normalize-base-font-family: if($strict-normalize, sans-serif, $base-font-family

/**
* 1. Set default font family to sans-serif.
* 2. Prevent iOS text size adjust after orientation change, without disabling
* 2. Prevent iOS and IE text size adjust after device orientation
* change, without disabling
* user zoom.
*/
html {
Expand Down Expand Up @@ -180,7 +181,7 @@ audio:not([controls]) {
}

/**
* 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.
*/

template {
Expand All @@ -201,7 +202,8 @@ template {
}

/**
* 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 @@ -327,7 +329,6 @@ sub {
*/

hr {
-moz-box-sizing: content-box;
box-sizing: content-box;
height: 0;
}
Expand Down Expand Up @@ -472,14 +473,10 @@ 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;
}

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-libsass",
"version": "1.0.2",
"version": "1.0.3",
"homepage": "https://github.com/krisbulman/normalize-libsass",
"author": [
"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-libsass",
"repo": "krisbulman/normalize-libsass",
"description": "A libsass compatible sass port of normalize.css, a collection of HTML element and attribute style-normalizations.",
"version": "1.0.2",
"version": "1.0.3",
"author": [
"Nicolas Gallagher",
"Kris Bulman"
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "normalize-libsass",
"version": "1.0.2",
"version": "1.0.3",
"description": "A libsass compatible sass port of normalize.css, a collection of HTML element and attribute style-normalizations.",
"devDependencies": {
"grunt": "~0.4",
Expand All @@ -10,13 +10,15 @@
},
"style": "_normalize.scss",
"files": [
"LICENSE.md",
"_normalize.scss"
],
"homepage": "https://github.com/krisbulman/normalize-libsass",
"repository": {
"type": "git",
"url": "git://github.com/krisbulman/normalize-libsass.git"
},
"main": "_normalize.scss",
"author": [
"Nicolas Gallagher",
"Kris Bulman"
Expand Down

0 comments on commit 86e9d11

Please sign in to comment.