mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-22 21:22:52 +02:00
Merge branch 'master' into pr/12388
Conflicts: dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
139
dist/css/bootstrap.css
vendored
139
dist/css/bootstrap.css
vendored
@@ -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 | 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;
|
||||
@@ -293,6 +301,9 @@ a:focus {
|
||||
outline: 5px auto -webkit-focus-ring-color;
|
||||
outline-offset: -2px;
|
||||
}
|
||||
figure {
|
||||
margin: 0;
|
||||
}
|
||||
img {
|
||||
vertical-align: middle;
|
||||
}
|
||||
@@ -1661,11 +1672,6 @@ select[multiple],
|
||||
select[size] {
|
||||
height: auto;
|
||||
}
|
||||
select optgroup {
|
||||
font-family: inherit;
|
||||
font-size: inherit;
|
||||
font-style: inherit;
|
||||
}
|
||||
input[type="file"]:focus,
|
||||
input[type="radio"]:focus,
|
||||
input[type="checkbox"]:focus {
|
||||
@@ -1673,10 +1679,6 @@ input[type="checkbox"]:focus {
|
||||
outline: 5px auto -webkit-focus-ring-color;
|
||||
outline-offset: -2px;
|
||||
}
|
||||
input[type="number"]::-webkit-outer-spin-button,
|
||||
input[type="number"]::-webkit-inner-spin-button {
|
||||
height: auto;
|
||||
}
|
||||
output {
|
||||
display: block;
|
||||
padding-top: 7px;
|
||||
@@ -1800,7 +1802,8 @@ select.input-sm {
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
}
|
||||
textarea.input-sm {
|
||||
textarea.input-sm,
|
||||
select[multiple].input-sm {
|
||||
height: auto;
|
||||
}
|
||||
.input-lg {
|
||||
@@ -1814,7 +1817,8 @@ select.input-lg {
|
||||
height: 46px;
|
||||
line-height: 46px;
|
||||
}
|
||||
textarea.input-lg {
|
||||
textarea.input-lg,
|
||||
select[multiple].input-lg {
|
||||
height: auto;
|
||||
}
|
||||
.has-feedback {
|
||||
@@ -2027,7 +2031,6 @@ fieldset[disabled] .btn {
|
||||
-webkit-box-shadow: none;
|
||||
box-shadow: none;
|
||||
opacity: .65;
|
||||
opacity: 1;
|
||||
}
|
||||
.btn-default {
|
||||
color: #333;
|
||||
@@ -3331,7 +3334,10 @@ select.input-group-lg > .input-group-btn > .btn {
|
||||
}
|
||||
textarea.input-group-lg > .form-control,
|
||||
textarea.input-group-lg > .input-group-addon,
|
||||
textarea.input-group-lg > .input-group-btn > .btn {
|
||||
textarea.input-group-lg > .input-group-btn > .btn,
|
||||
select[multiple].input-group-lg > .form-control,
|
||||
select[multiple].input-group-lg > .input-group-addon,
|
||||
select[multiple].input-group-lg > .input-group-btn > .btn {
|
||||
height: auto;
|
||||
}
|
||||
.input-group-sm > .form-control,
|
||||
@@ -3351,7 +3357,10 @@ select.input-group-sm > .input-group-btn > .btn {
|
||||
}
|
||||
textarea.input-group-sm > .form-control,
|
||||
textarea.input-group-sm > .input-group-addon,
|
||||
textarea.input-group-sm > .input-group-btn > .btn {
|
||||
textarea.input-group-sm > .input-group-btn > .btn,
|
||||
select[multiple].input-group-sm > .form-control,
|
||||
select[multiple].input-group-sm > .input-group-addon,
|
||||
select[multiple].input-group-sm > .input-group-btn > .btn {
|
||||
height: auto;
|
||||
}
|
||||
.input-group-addon,
|
||||
@@ -3736,10 +3745,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
|
||||
}
|
||||
.navbar-brand {
|
||||
float: left;
|
||||
height: 20px;
|
||||
padding: 15px 15px;
|
||||
font-size: 18px;
|
||||
line-height: 20px;
|
||||
height: 20px;
|
||||
}
|
||||
.navbar-brand:hover,
|
||||
.navbar-brand:focus {
|
||||
|
||||
Reference in New Issue
Block a user