diff --git a/sass/_normalize.scss b/sass/_normalize.scss index 3046bebc56..f15e0b81d6 100644 --- a/sass/_normalize.scss +++ b/sass/_normalize.scss @@ -1,7 +1,6 @@ html { - font-family: sans-serif; - -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; + -webkit-text-size-adjust: 100%; } body { @@ -18,58 +17,60 @@ header, main, menu, nav, -section, -summary { +section { display: block; } -audio, -canvas, -progress, -video { - display: inline-block; - vertical-align: baseline; +figure { + margin: 1em 40px; } -audio:not([controls]) { - display: none; +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +hr { + box-sizing: content-box; height: 0; + overflow: visible; } -[hidden], -template { - display: none; +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; } a { background-color: transparent; + -webkit-text-decoration-skip: objects; } -a:active, -a:hover { - outline: 0; +abbr[title] { + border-bottom: none; + text-decoration: underline; + text-decoration: underline dotted; } -abbr[title] { - border-bottom: 1px dotted; +b, +strong { + font-weight: inherit; } b, strong { - font-weight: bold; + font-weight: bolder; } dfn { font-style: italic; } -h1 { - font-size: 2em; - margin: 0.67em 0; -} - mark { - background: #ff0; + background-color: #ff0; color: #000; } @@ -85,41 +86,36 @@ sup { vertical-align: baseline; } -sup { - top: -0.5em; -} - sub { bottom: -0.25em; } -img { - border: 0; +sup { + top: -0.5em; } -svg:not(:root) { - overflow: hidden; +audio, +canvas, +progress, +video { + display: inline-block; } -figure { - margin: 1em 40px; +audio:not([controls]) { + display: none; + height: 0; } -hr { - box-sizing: content-box; - height: 0; +progress { + vertical-align: baseline; } -pre { - overflow: auto; +img { + border-style: none; } -code, -kbd, -pre, -samp { - font-family: monospace, monospace; - font-size: 1em; +svg:not(:root) { + overflow: hidden; } button, @@ -127,12 +123,14 @@ input, optgroup, select, textarea { - color: inherit; - font: inherit; + font-family: sans-serif; + font-size: 100%; + line-height: 1.15; margin: 0; } -button { +button, +input { overflow: visible; } @@ -142,69 +140,75 @@ select { } button, -html input[type="button"], -input[type="reset"], -input[type="submit"] { +html [type="button"], +[type="reset"], +[type="submit"] { -webkit-appearance: button; - cursor: pointer; -} - -button[disabled], -html input[disabled] { - cursor: default; } button::-moz-focus-inner, -input::-moz-focus-inner { - border: 0; +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; padding: 0; } -input { - line-height: normal; +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; +} + +fieldset { + padding: 0.35em 0.75em 0.625em; } -input[type="checkbox"], -input[type="radio"] { +legend { box-sizing: border-box; + color: inherit; + display: table; + max-width: 100%; padding: 0; + white-space: normal; } -input[type="number"]::-webkit-inner-spin-button, -input[type="number"]::-webkit-outer-spin-button { - height: auto; +textarea { + overflow: auto; } -input[type="search"]::-webkit-search-cancel-button, -input[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; + padding: 0; } -fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; } -legend { - border: 0; - padding: 0; +[type="search"] { + -webkit-appearance: textfield; + outline-offset: -2px; } -textarea { - overflow: auto; +[type="search"]::-webkit-search-cancel-button, +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; } -optgroup { - font-weight: bold; +::-webkit-file-upload-button { + -webkit-appearance: button; + font: inherit; } -table { - border-collapse: collapse; - border-spacing: 0; +summary { + display: list-item; } -td, -th { - padding: 0; +[hidden], +template { + display: none; } diff --git a/style.css b/style.css index c8362c0c49..00487f6a36 100644 --- a/style.css +++ b/style.css @@ -44,12 +44,11 @@ Nicolas Gallagher and Jonathan Neal http://necolas.github.io/normalize.css/ --------------------------------------------------------------*/ /*-------------------------------------------------------------- -# Normalize +# Normalize v7.0.0 --------------------------------------------------------------*/ html { - font-family: sans-serif; - -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; + -webkit-text-size-adjust: 100%; } body { @@ -66,58 +65,60 @@ header, main, menu, nav, -section, -summary { +section { display: block; } -audio, -canvas, -progress, -video { - display: inline-block; - vertical-align: baseline; +figure { + margin: 1em 40px; } -audio:not([controls]) { - display: none; +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +hr { + box-sizing: content-box; height: 0; + overflow: visible; } -[hidden], -template { - display: none; +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; } a { background-color: transparent; + -webkit-text-decoration-skip: objects; } -a:active, -a:hover { - outline: 0; +abbr[title] { + border-bottom: none; + text-decoration: underline; + text-decoration: underline dotted; } -abbr[title] { - border-bottom: 1px dotted; +b, +strong { + font-weight: inherit; } b, strong { - font-weight: bold; + font-weight: bolder; } dfn { font-style: italic; } -h1 { - font-size: 2em; - margin: 0.67em 0; -} - mark { - background: #ff0; + background-color: #ff0; color: #000; } @@ -133,41 +134,36 @@ sup { vertical-align: baseline; } -sup { - top: -0.5em; -} - sub { bottom: -0.25em; } -img { - border: 0; +sup { + top: -0.5em; } -svg:not(:root) { - overflow: hidden; +audio, +canvas, +progress, +video { + display: inline-block; } -figure { - margin: 1em 40px; +audio:not([controls]) { + display: none; + height: 0; } -hr { - box-sizing: content-box; - height: 0; +progress { + vertical-align: baseline; } -pre { - overflow: auto; +img { + border-style: none; } -code, -kbd, -pre, -samp { - font-family: monospace, monospace; - font-size: 1em; +svg:not(:root) { + overflow: hidden; } button, @@ -175,12 +171,14 @@ input, optgroup, select, textarea { - color: inherit; - font: inherit; + font-family: sans-serif; + font-size: 100%; + line-height: 1.15; margin: 0; } -button { +button, +input { overflow: visible; } @@ -190,71 +188,77 @@ select { } button, -html input[type="button"], -input[type="reset"], -input[type="submit"] { +html [type="button"], +[type="reset"], +[type="submit"] { -webkit-appearance: button; - cursor: pointer; -} - -button[disabled], -html input[disabled] { - cursor: default; } button::-moz-focus-inner, -input::-moz-focus-inner { - border: 0; +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; padding: 0; } -input { - line-height: normal; +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; } -input[type="checkbox"], -input[type="radio"] { +fieldset { + padding: 0.35em 0.75em 0.625em; +} + +legend { box-sizing: border-box; + color: inherit; + display: table; + max-width: 100%; padding: 0; + white-space: normal; } -input[type="number"]::-webkit-inner-spin-button, -input[type="number"]::-webkit-outer-spin-button { - height: auto; +textarea { + overflow: auto; } -input[type="search"]::-webkit-search-cancel-button, -input[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; + padding: 0; } -fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; } -legend { - border: 0; - padding: 0; +[type="search"] { + -webkit-appearance: textfield; + outline-offset: -2px; } -textarea { - overflow: auto; +[type="search"]::-webkit-search-cancel-button, +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; } -optgroup { - font-weight: bold; +::-webkit-file-upload-button { + -webkit-appearance: button; + font: inherit; } -table { - border-collapse: collapse; - border-spacing: 0; +summary { + display: list-item; } -td, -th { - padding: 0; +[hidden], +template { + display: none; } /*--------------------------------------------------------------