1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-21 04:41:36 +02:00

Upgrade to Normalize v3-rc1 in prep for v3 final

This commit is contained in:
Mark Otto
2014-01-27 12:08:55 -08:00
parent 45ea456468
commit 6a0a139cda
10 changed files with 213 additions and 186 deletions

File diff suppressed because one or more lines are too long

108
dist/css/bootstrap.css vendored
View File

@@ -4,7 +4,15 @@
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
/*! normalize.css v3.0.0-rc.1 | MIT License | git.io/normalize */
html {
font-family: sans-serif;
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
}
body {
margin: 0;
}
article,
aside,
details,
@@ -21,8 +29,10 @@ summary {
}
audio,
canvas,
progress,
video {
display: inline-block;
vertical-align: baseline;
}
audio:not([controls]) {
display: none;
@@ -32,29 +42,13 @@ audio:not([controls]) {
template {
display: none;
}
html {
font-family: sans-serif;
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
}
body {
margin: 0;
}
a {
background: transparent;
}
a:focus {
outline: thin dotted;
}
a:active,
a:hover {
outline: 0;
}
h1 {
margin: .67em 0;
font-size: 2em;
}
abbr[title] {
border-bottom: 1px dotted;
}
@@ -65,28 +59,14 @@ strong {
dfn {
font-style: italic;
}
hr {
height: 0;
-moz-box-sizing: content-box;
box-sizing: content-box;
h1 {
margin: .67em 0;
font-size: 2em;
}
mark {
color: #000;
background: #ff0;
}
code,
kbd,
pre,
samp {
font-family: monospace, serif;
font-size: 1em;
}
pre {
white-space: pre-wrap;
}
q {
quotes: "\201C" "\201D" "\2018" "\2019";
}
small {
font-size: 80%;
}
@@ -110,28 +90,34 @@ svg:not(:root) {
overflow: hidden;
}
figure {
margin: 0;
margin: 1em 40px;
}
fieldset {
padding: .35em .625em .75em;
margin: 0 2px;
border: 1px solid #c0c0c0;
hr {
height: 0;
-moz-box-sizing: content-box;
box-sizing: content-box;
}
legend {
padding: 0;
border: 0;
pre {
overflow: auto;
}
code,
kbd,
pre,
samp {
font-family: monospace, monospace;
font-size: 1em;
}
button,
input,
optgroup,
select,
textarea {
margin: 0;
font-family: inherit;
font-size: 100%;
font: inherit;
color: inherit;
}
button,
input {
line-height: normal;
button {
overflow: visible;
}
button,
select {
@@ -148,11 +134,23 @@ button[disabled],
html input[disabled] {
cursor: default;
}
button::-moz-focus-inner,
input::-moz-focus-inner {
padding: 0;
border: 0;
}
input {
line-height: normal;
}
input[type="checkbox"],
input[type="radio"] {
box-sizing: border-box;
padding: 0;
}
input[type="number"]::-webkit-inner-spin-button,
input[type="number"]::-webkit-outer-spin-button {
height: auto;
}
input[type="search"] {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
@@ -163,19 +161,29 @@ input[type="search"]::-webkit-search-cancel-button,
input[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
button::-moz-focus-inner,
input::-moz-focus-inner {
fieldset {
padding: .35em .625em .75em;
margin: 0 2px;
border: 1px solid #c0c0c0;
}
legend {
padding: 0;
border: 0;
}
textarea {
overflow: auto;
vertical-align: top;
}
optgroup {
font-weight: bold;
}
table {
border-spacing: 0;
border-collapse: collapse;
}
td,
th {
padding: 0;
}
@media print {
* {
color: #000 !important;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long