2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-20 20:00:36 +03:00
This commit is contained in:
Mark Otto
2016-05-08 13:46:38 -07:00
parent 3547164f61
commit 69afc16867
8 changed files with 190 additions and 168 deletions
+92 -81
View File
@@ -3,7 +3,7 @@
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */
/*! normalize.css commit fe56763 | MIT License | github.com/necolas/normalize.css */ /*! normalize.css v4.0.0 | MIT License | github.com/necolas/normalize.css */
html { html {
font-family: sans-serif; font-family: sans-serif;
-ms-text-size-adjust: 100%; -ms-text-size-adjust: 100%;
@@ -34,7 +34,6 @@ canvas,
progress, progress,
video { video {
display: inline-block; display: inline-block;
vertical-align: baseline;
} }
audio:not([controls]) { audio:not([controls]) {
@@ -42,8 +41,12 @@ audio:not([controls]) {
height: 0; height: 0;
} }
[hidden], progress {
template { vertical-align: baseline;
}
template,
[hidden] {
display: none; display: none;
} }
@@ -51,21 +54,25 @@ a {
background-color: transparent; background-color: transparent;
} }
a:active { a:active,
outline: 0;
}
a:hover { a:hover {
outline: 0; outline-width: 0;
} }
abbr[title] { abbr[title] {
border-bottom: 1px dotted; border-bottom: none;
text-decoration: underline;
text-decoration: underline dotted;
} }
b, b,
strong { strong {
font-weight: bold; font-weight: inherit;
}
b,
strong {
font-weight: bolder;
} }
dfn { dfn {
@@ -78,7 +85,7 @@ h1 {
} }
mark { mark {
background: #ff0; background-color: #ff0;
color: #000; color: #000;
} }
@@ -94,36 +101,22 @@ sup {
vertical-align: baseline; vertical-align: baseline;
} }
sup {
top: -0.5em;
}
sub { sub {
bottom: -0.25em; bottom: -0.25em;
} }
sup {
top: -0.5em;
}
img { img {
border: 0; border-style: none;
} }
svg:not(:root) { svg:not(:root) {
overflow: hidden; overflow: hidden;
} }
figure {
margin: 1em 40px;
}
hr {
-webkit-box-sizing: content-box;
box-sizing: content-box;
height: 0;
}
pre {
overflow: auto;
}
code, code,
kbd, kbd,
pre, pre,
@@ -132,67 +125,73 @@ samp {
font-size: 1em; font-size: 1em;
} }
button, figure {
input, margin: 1em 40px;
optgroup,
select,
textarea {
color: inherit;
font: inherit;
margin: 0;
} }
button { hr {
-webkit-box-sizing: content-box;
box-sizing: content-box;
height: 0;
overflow: visible; overflow: visible;
} }
button,
input,
select,
textarea {
font: inherit;
}
optgroup {
font-weight: bold;
}
button,
input,
select {
overflow: visible;
}
button,
input,
select,
textarea {
margin: 0;
}
button, button,
select { select {
text-transform: none; text-transform: none;
} }
button, button,
html input[type="button"], [type="button"],
input[type="reset"], [type="reset"],
input[type="submit"] { [type="submit"] {
-webkit-appearance: button;
cursor: pointer; cursor: pointer;
} }
button[disabled], [disabled] {
html input[disabled] {
cursor: default; cursor: default;
} }
button,
html [type="button"],
[type="reset"],
[type="submit"] {
-webkit-appearance: button;
}
button::-moz-focus-inner, button::-moz-focus-inner,
input::-moz-focus-inner { input::-moz-focus-inner {
border: 0; border: 0;
padding: 0; padding: 0;
} }
input { button:-moz-focusring,
line-height: normal; input:-moz-focusring {
} outline: 1px dotted ButtonText;
input[type="checkbox"],
input[type="radio"] {
-webkit-box-sizing: border-box;
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-appearance: textfield;
}
input[type="search"]::-webkit-search-cancel-button,
input[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
} }
fieldset { fieldset {
@@ -202,28 +201,40 @@ fieldset {
} }
legend { legend {
border: 0; -webkit-box-sizing: border-box;
box-sizing: border-box;
color: inherit;
display: table;
max-width: 100%;
padding: 0; padding: 0;
white-space: normal;
} }
textarea { textarea {
overflow: auto; overflow: auto;
} }
optgroup { [type="checkbox"],
font-weight: bold; [type="radio"] {
} -webkit-box-sizing: border-box;
box-sizing: border-box;
table {
border-collapse: collapse;
border-spacing: 0;
}
td,
th {
padding: 0; padding: 0;
} }
[type="number"]::-webkit-inner-spin-button,
[type="number"]::-webkit-outer-spin-button {
height: auto;
}
[type="search"] {
-webkit-appearance: textfield;
}
[type="search"]::-webkit-search-cancel-button,
[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
@media print { @media print {
*, *,
*::before, *::before,
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+92 -81
View File
@@ -3,7 +3,7 @@
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */
/*! normalize.css commit fe56763 | MIT License | github.com/necolas/normalize.css */ /*! normalize.css v4.0.0 | MIT License | github.com/necolas/normalize.css */
html { html {
font-family: sans-serif; font-family: sans-serif;
-ms-text-size-adjust: 100%; -ms-text-size-adjust: 100%;
@@ -34,7 +34,6 @@ canvas,
progress, progress,
video { video {
display: inline-block; display: inline-block;
vertical-align: baseline;
} }
audio:not([controls]) { audio:not([controls]) {
@@ -42,8 +41,12 @@ audio:not([controls]) {
height: 0; height: 0;
} }
[hidden], progress {
template { vertical-align: baseline;
}
template,
[hidden] {
display: none; display: none;
} }
@@ -51,21 +54,25 @@ a {
background-color: transparent; background-color: transparent;
} }
a:active { a:active,
outline: 0;
}
a:hover { a:hover {
outline: 0; outline-width: 0;
} }
abbr[title] { abbr[title] {
border-bottom: 1px dotted; border-bottom: none;
text-decoration: underline;
text-decoration: underline dotted;
} }
b, b,
strong { strong {
font-weight: bold; font-weight: inherit;
}
b,
strong {
font-weight: bolder;
} }
dfn { dfn {
@@ -78,7 +85,7 @@ h1 {
} }
mark { mark {
background: #ff0; background-color: #ff0;
color: #000; color: #000;
} }
@@ -94,36 +101,22 @@ sup {
vertical-align: baseline; vertical-align: baseline;
} }
sup {
top: -0.5em;
}
sub { sub {
bottom: -0.25em; bottom: -0.25em;
} }
sup {
top: -0.5em;
}
img { img {
border: 0; border-style: none;
} }
svg:not(:root) { svg:not(:root) {
overflow: hidden; overflow: hidden;
} }
figure {
margin: 1em 40px;
}
hr {
-webkit-box-sizing: content-box;
box-sizing: content-box;
height: 0;
}
pre {
overflow: auto;
}
code, code,
kbd, kbd,
pre, pre,
@@ -132,67 +125,73 @@ samp {
font-size: 1em; font-size: 1em;
} }
button, figure {
input, margin: 1em 40px;
optgroup,
select,
textarea {
color: inherit;
font: inherit;
margin: 0;
} }
button { hr {
-webkit-box-sizing: content-box;
box-sizing: content-box;
height: 0;
overflow: visible; overflow: visible;
} }
button,
input,
select,
textarea {
font: inherit;
}
optgroup {
font-weight: bold;
}
button,
input,
select {
overflow: visible;
}
button,
input,
select,
textarea {
margin: 0;
}
button, button,
select { select {
text-transform: none; text-transform: none;
} }
button, button,
html input[type="button"], [type="button"],
input[type="reset"], [type="reset"],
input[type="submit"] { [type="submit"] {
-webkit-appearance: button;
cursor: pointer; cursor: pointer;
} }
button[disabled], [disabled] {
html input[disabled] {
cursor: default; cursor: default;
} }
button,
html [type="button"],
[type="reset"],
[type="submit"] {
-webkit-appearance: button;
}
button::-moz-focus-inner, button::-moz-focus-inner,
input::-moz-focus-inner { input::-moz-focus-inner {
border: 0; border: 0;
padding: 0; padding: 0;
} }
input { button:-moz-focusring,
line-height: normal; input:-moz-focusring {
} outline: 1px dotted ButtonText;
input[type="checkbox"],
input[type="radio"] {
-webkit-box-sizing: border-box;
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-appearance: textfield;
}
input[type="search"]::-webkit-search-cancel-button,
input[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
} }
fieldset { fieldset {
@@ -202,28 +201,40 @@ fieldset {
} }
legend { legend {
border: 0; -webkit-box-sizing: border-box;
box-sizing: border-box;
color: inherit;
display: table;
max-width: 100%;
padding: 0; padding: 0;
white-space: normal;
} }
textarea { textarea {
overflow: auto; overflow: auto;
} }
optgroup { [type="checkbox"],
font-weight: bold; [type="radio"] {
} -webkit-box-sizing: border-box;
box-sizing: border-box;
table {
border-collapse: collapse;
border-spacing: 0;
}
td,
th {
padding: 0; padding: 0;
} }
[type="number"]::-webkit-inner-spin-button,
[type="number"]::-webkit-outer-spin-button {
height: auto;
}
[type="search"] {
-webkit-appearance: textfield;
}
[type="search"]::-webkit-search-cancel-button,
[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
@media print { @media print {
*, *,
*::before, *::before,
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long