aboutsummaryrefslogtreecommitdiff
path: root/scss/_normalize.scss
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-06-19 16:26:33 -0700
committerMark Otto <[email protected]>2015-06-19 16:26:33 -0700
commitbc29c016b7afefa2a9a42e94efaee58695049285 (patch)
treeac294f7fbc18d4ba8c6b4179b7d1cbeb6481d70b /scss/_normalize.scss
parent8410afe0e104459a613f6232ad46334aa8b99fda (diff)
parent3df2d085ed219a16848b96e90a72fcd5575a5270 (diff)
downloadbootstrap-bc29c016b7afefa2a9a42e94efaee58695049285.tar.xz
bootstrap-bc29c016b7afefa2a9a42e94efaee58695049285.zip
Merge branch 'v4' into v4_builds
Diffstat (limited to 'scss/_normalize.scss')
-rw-r--r--scss/_normalize.scss19
1 files changed, 8 insertions, 11 deletions
diff --git a/scss/_normalize.scss b/scss/_normalize.scss
index e49b5281c..2e62b53ec 100644
--- a/scss/_normalize.scss
+++ b/scss/_normalize.scss
@@ -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 {
@@ -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],
@@ -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 {
@@ -213,7 +214,6 @@ figure {
//
hr {
- -moz-box-sizing: content-box;
box-sizing: content-box;
height: 0;
}
@@ -354,15 +354,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
}
//