summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohnAlbin2013-07-03 07:10:47 (GMT)
committer JohnAlbin2013-07-03 07:17:27 (GMT)
commit2fdb8924e560ab44658fd82a9c8ba4b6b65fd80f (patch)
tree9040d487faae874673a8800b34be504b6711faac
parent98cb1c77b9993f09d4d25a303a90eea28d465996 (diff)
Update _normalize.scss to 2.1.2.
-rw-r--r--STARTERKIT/sass/_normalize.scss52
1 files changed, 32 insertions, 20 deletions
diff --git a/STARTERKIT/sass/_normalize.scss b/STARTERKIT/sass/_normalize.scss
index eaee4b6..995a0f9 100644
--- a/STARTERKIT/sass/_normalize.scss
+++ b/STARTERKIT/sass/_normalize.scss
@@ -1,5 +1,5 @@
-/* normalize.css v2.1.0 | MIT License | git.io/normalize */
-/* normalize.scss v2.1.0 | MIT/GPLv2 License | bit.ly/normalize-with-compass */
+/* normalize.css v2.1.2 | MIT License | git.io/normalize */
+/* normalize.scss v2.1.2 | MIT/GPLv2 License | bit.ly/normalize-with-compass */
/* =============================================================================
Normalize.css is intended to be used as an alternative to CSS resets.
@@ -60,8 +60,7 @@ audio:not([controls]) {
}
/**
- * Address styling not present in IE 7/8/9.
- * Known issue: no IE 6 support.
+ * Address styling not present in IE 8/9.
*/
[hidden] {
@@ -118,8 +117,8 @@ audio:not([controls]) {
html {
font-family: $base-font-family; /* 1 */
font-size: 100% * ($base-font-size / 16px); /* 3 */
- -webkit-text-size-adjust: 100%; /* 2 */
-ms-text-size-adjust: 100%; /* 2 */
+ -webkit-text-size-adjust: 100%; /* 2 */
// Establish a vertical rhythm unit using $base-line-height.
@include adjust-leading-to(1);
}
@@ -127,7 +126,7 @@ html {
@if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
/**
* Address `font-family` inconsistency between `textarea` and other form
- * elements in IE 6/7.
+ * elements.
*/
button,
@@ -281,12 +280,11 @@ dfn {
/**
* Address differences between Firefox and other browsers.
- * Known issue: no IE 6/7 normalization.
*/
hr {
- @include box-sizing(border-box);
- height: 1px;
+ @include box-sizing(content-box);
+ height: 0;
border: 1px solid #666;
padding-bottom: -1px;
margin: rhythm(1) 0;
@@ -315,7 +313,7 @@ var {
@if $legacy-support-for-ie6 {
_font-family: 'courier new', monospace;
}
- @include adjust-font-size-to( 1 * $base-font-size );
+ @include adjust-font-size-to( $base-font-size );
}
/**
@@ -323,7 +321,14 @@ var {
*/
pre {
- white-space: pre-wrap;
+ @if $legacy-support-for-ie6 or $legacy-support-for-ie7 {
+ white-space: pre;
+ white-space: pre-wrap;
+ word-wrap: break-word;
+ }
+ @else {
+ white-space: pre-wrap;
+ }
}
/**
@@ -367,7 +372,7 @@ sub {
========================================================================== */
/**
- * Set 1 unit of vertical rhythm and a consistent indentation.
+ * Address margins set differently in IE 6/7.
*/
dl,
@@ -375,23 +380,30 @@ menu,
ol,
ul {
margin: rhythm(1) 0;
- padding: 0 0 0 $indent-amount; /* LTR */
}
-ul, ol {
- ul, ol {
+ol,
+ul {
+ ol,
+ ul {
margin: 0; /* Turn off margins on nested lists. */
}
}
-dl {
- padding: 0;
-}
-
dd {
margin: 0 0 0 $indent-amount; /* LTR */
}
+/**
+ * Address paddings set differently in IE 6/7.
+ */
+
+menu,
+ol,
+ul {
+ padding: 0 0 0 $indent-amount; /* LTR */
+}
+
@if $legacy-support-for-ie7 {
/**
* Correct list images handled incorrectly in IE 7.
@@ -469,9 +481,9 @@ figure {
*/
fieldset {
- border-color: #c0c0c0;
margin: 0 2px;
/* Apply borders and padding that keep the vertical rhythm. */
+ border-color: #c0c0c0;
@include apply-side-rhythm-border(top, $width: 1px, $lines: 0.35);
@include apply-side-rhythm-border(bottom, $width: 1px, $lines: 0.65);
@include apply-side-rhythm-border(left, $width: 1px, $lines: 0.65);