mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-29 08:10:47 +02:00
Merge branch 'v4-dev' into v4-forms-cleanup
This commit is contained in:
Mark Otto
@@ -270,7 +270,7 @@ th {
|
||||
.dropup > .btn > .caret {
|
||||
border-top-color: #000 !important;
|
||||
}
|
||||
.label {
|
||||
.tag {
|
||||
border: 1px solid #000;
|
||||
}
|
||||
.table {
|
||||
@@ -385,6 +385,20 @@ a:focus {
|
||||
outline-offset: -2px;
|
||||
}
|
||||
|
||||
a:not([href]) {
|
||||
color: inherit;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
a:not([href]):focus, a:not([href]):hover {
|
||||
color: inherit;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
a:not([href]):focus {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
pre {
|
||||
margin-top: 0;
|
||||
margin-bottom: 1rem;
|
||||
@@ -555,7 +569,7 @@ small,
|
||||
|
||||
mark,
|
||||
.mark {
|
||||
padding: .2em;
|
||||
padding: 0.2em;
|
||||
background-color: #fcf8e3;
|
||||
}
|
||||
|
||||
@@ -669,7 +683,7 @@ samp {
|
||||
}
|
||||
|
||||
code {
|
||||
padding: .2rem .4rem;
|
||||
padding: 0.2rem 0.4rem;
|
||||
font-size: 90%;
|
||||
color: #bd4147;
|
||||
background-color: #f7f7f9;
|
||||
@@ -677,7 +691,7 @@ code {
|
||||
}
|
||||
|
||||
kbd {
|
||||
padding: .2rem .4rem;
|
||||
padding: 0.2rem 0.4rem;
|
||||
font-size: 90%;
|
||||
color: #fff;
|
||||
background-color: #333;
|
||||
@@ -2143,8 +2157,27 @@ select.form-control:not([size]):not([multiple]) {
|
||||
}
|
||||
|
||||
.form-control-label {
|
||||
padding-top: 0.5rem;
|
||||
padding-bottom: 0.5rem;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.form-control-label-lg {
|
||||
padding-top: 0.75rem;
|
||||
padding-bottom: 0.75rem;
|
||||
font-size: 1.25rem;
|
||||
}
|
||||
|
||||
.form-control-label-sm {
|
||||
padding-top: 0.25rem;
|
||||
padding-bottom: 0.25rem;
|
||||
font-size: 0.875rem;
|
||||
}
|
||||
|
||||
.form-control-legend {
|
||||
padding: 0.5rem 0.75rem;
|
||||
margin-bottom: 0;
|
||||
font-size: 1rem;
|
||||
}
|
||||
|
||||
_::-webkit-full-page-media.form-control,
|
||||
@@ -2290,6 +2323,10 @@ input[type="checkbox"].disabled {
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
.form-control-feedback {
|
||||
margin-top: .5rem;
|
||||
}
|
||||
|
||||
.form-control-success,
|
||||
.form-control-warning,
|
||||
.form-control-danger {
|
||||
@@ -2300,7 +2337,7 @@ input[type="checkbox"].disabled {
|
||||
background-size: 1.25rem 1.25rem;
|
||||
}
|
||||
|
||||
.has-success .text-help,
|
||||
.has-success .form-control-feedback,
|
||||
.has-success .form-control-label,
|
||||
.has-success .radio,
|
||||
.has-success .checkbox,
|
||||
@@ -2309,7 +2346,8 @@ input[type="checkbox"].disabled {
|
||||
.has-success.radio label,
|
||||
.has-success.checkbox label,
|
||||
.has-success.radio-inline label,
|
||||
.has-success.checkbox-inline label {
|
||||
.has-success.checkbox-inline label,
|
||||
.has-success .custom-control {
|
||||
color: #5cb85c;
|
||||
}
|
||||
|
||||
@@ -2331,7 +2369,7 @@ input[type="checkbox"].disabled {
|
||||
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%235cb85c' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3E%3C/svg%3E");
|
||||
}
|
||||
|
||||
.has-warning .text-help,
|
||||
.has-warning .form-control-feedback,
|
||||
.has-warning .form-control-label,
|
||||
.has-warning .radio,
|
||||
.has-warning .checkbox,
|
||||
@@ -2340,7 +2378,8 @@ input[type="checkbox"].disabled {
|
||||
.has-warning.radio label,
|
||||
.has-warning.checkbox label,
|
||||
.has-warning.radio-inline label,
|
||||
.has-warning.checkbox-inline label {
|
||||
.has-warning.checkbox-inline label,
|
||||
.has-warning .custom-control {
|
||||
color: #f0ad4e;
|
||||
}
|
||||
|
||||
@@ -2362,7 +2401,7 @@ input[type="checkbox"].disabled {
|
||||
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%23f0ad4e' d='M4.4 5.324h-.8v-2.46h.8zm0 1.42h-.8V5.89h.8zM3.76.63L.04 7.075c-.115.2.016.425.26.426h7.397c.242 0 .372-.226.258-.426C6.726 4.924 5.47 2.79 4.253.63c-.113-.174-.39-.174-.494 0z'/%3E%3C/svg%3E");
|
||||
}
|
||||
|
||||
.has-danger .text-help,
|
||||
.has-danger .form-control-feedback,
|
||||
.has-danger .form-control-label,
|
||||
.has-danger .radio,
|
||||
.has-danger .checkbox,
|
||||
@@ -2371,7 +2410,8 @@ input[type="checkbox"].disabled {
|
||||
.has-danger.radio label,
|
||||
.has-danger.checkbox label,
|
||||
.has-danger.radio-inline label,
|
||||
.has-danger.checkbox-inline label {
|
||||
.has-danger.checkbox-inline label,
|
||||
.has-danger .custom-control {
|
||||
color: #d9534f;
|
||||
}
|
||||
|
||||
@@ -2768,17 +2808,32 @@ fieldset[disabled] a.btn {
|
||||
border-color: #0275d8;
|
||||
}
|
||||
|
||||
.btn-outline-primary:focus, .btn-outline-primary.focus, .btn-outline-primary:active, .btn-outline-primary.active,
|
||||
.btn-outline-primary:hover {
|
||||
color: #fff;
|
||||
background-color: #0275d8;
|
||||
border-color: #0275d8;
|
||||
}
|
||||
|
||||
.btn-outline-primary:focus, .btn-outline-primary.focus {
|
||||
color: #fff;
|
||||
background-color: #0275d8;
|
||||
border-color: #0275d8;
|
||||
}
|
||||
|
||||
.btn-outline-primary:active, .btn-outline-primary.active,
|
||||
.open > .btn-outline-primary.dropdown-toggle {
|
||||
color: #fff;
|
||||
background-color: #0275d8;
|
||||
border-color: #0275d8;
|
||||
}
|
||||
|
||||
.btn-outline-primary:hover {
|
||||
.btn-outline-primary:active:hover, .btn-outline-primary:active:focus, .btn-outline-primary:active.focus, .btn-outline-primary.active:hover, .btn-outline-primary.active:focus, .btn-outline-primary.active.focus,
|
||||
.open > .btn-outline-primary.dropdown-toggle:hover,
|
||||
.open > .btn-outline-primary.dropdown-toggle:focus,
|
||||
.open > .btn-outline-primary.dropdown-toggle.focus {
|
||||
color: #fff;
|
||||
background-color: #0275d8;
|
||||
border-color: #0275d8;
|
||||
background-color: #014682;
|
||||
border-color: #01315a;
|
||||
}
|
||||
|
||||
.btn-outline-primary.disabled:focus, .btn-outline-primary.disabled.focus, .btn-outline-primary:disabled:focus, .btn-outline-primary:disabled.focus {
|
||||
@@ -2796,17 +2851,32 @@ fieldset[disabled] a.btn {
|
||||
border-color: #ccc;
|
||||
}
|
||||
|
||||
.btn-outline-secondary:focus, .btn-outline-secondary.focus, .btn-outline-secondary:active, .btn-outline-secondary.active,
|
||||
.btn-outline-secondary:hover {
|
||||
color: #fff;
|
||||
background-color: #ccc;
|
||||
border-color: #ccc;
|
||||
}
|
||||
|
||||
.btn-outline-secondary:focus, .btn-outline-secondary.focus {
|
||||
color: #fff;
|
||||
background-color: #ccc;
|
||||
border-color: #ccc;
|
||||
}
|
||||
|
||||
.btn-outline-secondary:active, .btn-outline-secondary.active,
|
||||
.open > .btn-outline-secondary.dropdown-toggle {
|
||||
color: #fff;
|
||||
background-color: #ccc;
|
||||
border-color: #ccc;
|
||||
}
|
||||
|
||||
.btn-outline-secondary:hover {
|
||||
.btn-outline-secondary:active:hover, .btn-outline-secondary:active:focus, .btn-outline-secondary:active.focus, .btn-outline-secondary.active:hover, .btn-outline-secondary.active:focus, .btn-outline-secondary.active.focus,
|
||||
.open > .btn-outline-secondary.dropdown-toggle:hover,
|
||||
.open > .btn-outline-secondary.dropdown-toggle:focus,
|
||||
.open > .btn-outline-secondary.dropdown-toggle.focus {
|
||||
color: #fff;
|
||||
background-color: #ccc;
|
||||
border-color: #ccc;
|
||||
background-color: #a1a1a1;
|
||||
border-color: #8c8c8c;
|
||||
}
|
||||
|
||||
.btn-outline-secondary.disabled:focus, .btn-outline-secondary.disabled.focus, .btn-outline-secondary:disabled:focus, .btn-outline-secondary:disabled.focus {
|
||||
@@ -2824,17 +2894,32 @@ fieldset[disabled] a.btn {
|
||||
border-color: #5bc0de;
|
||||
}
|
||||
|
||||
.btn-outline-info:focus, .btn-outline-info.focus, .btn-outline-info:active, .btn-outline-info.active,
|
||||
.btn-outline-info:hover {
|
||||
color: #fff;
|
||||
background-color: #5bc0de;
|
||||
border-color: #5bc0de;
|
||||
}
|
||||
|
||||
.btn-outline-info:focus, .btn-outline-info.focus {
|
||||
color: #fff;
|
||||
background-color: #5bc0de;
|
||||
border-color: #5bc0de;
|
||||
}
|
||||
|
||||
.btn-outline-info:active, .btn-outline-info.active,
|
||||
.open > .btn-outline-info.dropdown-toggle {
|
||||
color: #fff;
|
||||
background-color: #5bc0de;
|
||||
border-color: #5bc0de;
|
||||
}
|
||||
|
||||
.btn-outline-info:hover {
|
||||
.btn-outline-info:active:hover, .btn-outline-info:active:focus, .btn-outline-info:active.focus, .btn-outline-info.active:hover, .btn-outline-info.active:focus, .btn-outline-info.active.focus,
|
||||
.open > .btn-outline-info.dropdown-toggle:hover,
|
||||
.open > .btn-outline-info.dropdown-toggle:focus,
|
||||
.open > .btn-outline-info.dropdown-toggle.focus {
|
||||
color: #fff;
|
||||
background-color: #5bc0de;
|
||||
border-color: #5bc0de;
|
||||
background-color: #269abc;
|
||||
border-color: #1f7e9a;
|
||||
}
|
||||
|
||||
.btn-outline-info.disabled:focus, .btn-outline-info.disabled.focus, .btn-outline-info:disabled:focus, .btn-outline-info:disabled.focus {
|
||||
@@ -2852,17 +2937,32 @@ fieldset[disabled] a.btn {
|
||||
border-color: #5cb85c;
|
||||
}
|
||||
|
||||
.btn-outline-success:focus, .btn-outline-success.focus, .btn-outline-success:active, .btn-outline-success.active,
|
||||
.btn-outline-success:hover {
|
||||
color: #fff;
|
||||
background-color: #5cb85c;
|
||||
border-color: #5cb85c;
|
||||
}
|
||||
|
||||
.btn-outline-success:focus, .btn-outline-success.focus {
|
||||
color: #fff;
|
||||
background-color: #5cb85c;
|
||||
border-color: #5cb85c;
|
||||
}
|
||||
|
||||
.btn-outline-success:active, .btn-outline-success.active,
|
||||
.open > .btn-outline-success.dropdown-toggle {
|
||||
color: #fff;
|
||||
background-color: #5cb85c;
|
||||
border-color: #5cb85c;
|
||||
}
|
||||
|
||||
.btn-outline-success:hover {
|
||||
.btn-outline-success:active:hover, .btn-outline-success:active:focus, .btn-outline-success:active.focus, .btn-outline-success.active:hover, .btn-outline-success.active:focus, .btn-outline-success.active.focus,
|
||||
.open > .btn-outline-success.dropdown-toggle:hover,
|
||||
.open > .btn-outline-success.dropdown-toggle:focus,
|
||||
.open > .btn-outline-success.dropdown-toggle.focus {
|
||||
color: #fff;
|
||||
background-color: #5cb85c;
|
||||
border-color: #5cb85c;
|
||||
background-color: #398439;
|
||||
border-color: #2d672d;
|
||||
}
|
||||
|
||||
.btn-outline-success.disabled:focus, .btn-outline-success.disabled.focus, .btn-outline-success:disabled:focus, .btn-outline-success:disabled.focus {
|
||||
@@ -2880,17 +2980,32 @@ fieldset[disabled] a.btn {
|
||||
border-color: #f0ad4e;
|
||||
}
|
||||
|
||||
.btn-outline-warning:focus, .btn-outline-warning.focus, .btn-outline-warning:active, .btn-outline-warning.active,
|
||||
.btn-outline-warning:hover {
|
||||
color: #fff;
|
||||
background-color: #f0ad4e;
|
||||
border-color: #f0ad4e;
|
||||
}
|
||||
|
||||
.btn-outline-warning:focus, .btn-outline-warning.focus {
|
||||
color: #fff;
|
||||
background-color: #f0ad4e;
|
||||
border-color: #f0ad4e;
|
||||
}
|
||||
|
||||
.btn-outline-warning:active, .btn-outline-warning.active,
|
||||
.open > .btn-outline-warning.dropdown-toggle {
|
||||
color: #fff;
|
||||
background-color: #f0ad4e;
|
||||
border-color: #f0ad4e;
|
||||
}
|
||||
|
||||
.btn-outline-warning:hover {
|
||||
.btn-outline-warning:active:hover, .btn-outline-warning:active:focus, .btn-outline-warning:active.focus, .btn-outline-warning.active:hover, .btn-outline-warning.active:focus, .btn-outline-warning.active.focus,
|
||||
.open > .btn-outline-warning.dropdown-toggle:hover,
|
||||
.open > .btn-outline-warning.dropdown-toggle:focus,
|
||||
.open > .btn-outline-warning.dropdown-toggle.focus {
|
||||
color: #fff;
|
||||
background-color: #f0ad4e;
|
||||
border-color: #f0ad4e;
|
||||
background-color: #d58512;
|
||||
border-color: #b06d0f;
|
||||
}
|
||||
|
||||
.btn-outline-warning.disabled:focus, .btn-outline-warning.disabled.focus, .btn-outline-warning:disabled:focus, .btn-outline-warning:disabled.focus {
|
||||
@@ -2908,17 +3023,32 @@ fieldset[disabled] a.btn {
|
||||
border-color: #d9534f;
|
||||
}
|
||||
|
||||
.btn-outline-danger:focus, .btn-outline-danger.focus, .btn-outline-danger:active, .btn-outline-danger.active,
|
||||
.btn-outline-danger:hover {
|
||||
color: #fff;
|
||||
background-color: #d9534f;
|
||||
border-color: #d9534f;
|
||||
}
|
||||
|
||||
.btn-outline-danger:focus, .btn-outline-danger.focus {
|
||||
color: #fff;
|
||||
background-color: #d9534f;
|
||||
border-color: #d9534f;
|
||||
}
|
||||
|
||||
.btn-outline-danger:active, .btn-outline-danger.active,
|
||||
.open > .btn-outline-danger.dropdown-toggle {
|
||||
color: #fff;
|
||||
background-color: #d9534f;
|
||||
border-color: #d9534f;
|
||||
}
|
||||
|
||||
.btn-outline-danger:hover {
|
||||
.btn-outline-danger:active:hover, .btn-outline-danger:active:focus, .btn-outline-danger:active.focus, .btn-outline-danger.active:hover, .btn-outline-danger.active:focus, .btn-outline-danger.active.focus,
|
||||
.open > .btn-outline-danger.dropdown-toggle:hover,
|
||||
.open > .btn-outline-danger.dropdown-toggle:focus,
|
||||
.open > .btn-outline-danger.dropdown-toggle.focus {
|
||||
color: #fff;
|
||||
background-color: #d9534f;
|
||||
border-color: #d9534f;
|
||||
background-color: #ac2925;
|
||||
border-color: #8b211e;
|
||||
}
|
||||
|
||||
.btn-outline-danger.disabled:focus, .btn-outline-danger.disabled.focus, .btn-outline-danger:disabled:focus, .btn-outline-danger:disabled.focus {
|
||||
@@ -3487,6 +3617,7 @@ input[type="button"].btn-block {
|
||||
position: relative;
|
||||
display: inline;
|
||||
padding-left: 1.5rem;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.custom-control + .custom-control {
|
||||
@@ -3645,7 +3776,7 @@ input[type="button"].btn-block {
|
||||
border-radius: 0.25rem;
|
||||
}
|
||||
|
||||
.custom-file-control::after {
|
||||
.custom-file-control:lang(en)::after {
|
||||
content: "Choose file...";
|
||||
}
|
||||
|
||||
@@ -3660,12 +3791,15 @@ input[type="button"].btn-block {
|
||||
padding: 0.5rem 1rem;
|
||||
line-height: 1.5;
|
||||
color: #555;
|
||||
content: "Browse";
|
||||
background-color: #eee;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 0 0.25rem 0.25rem 0;
|
||||
}
|
||||
|
||||
.custom-file-control:lang(en)::before {
|
||||
content: "Browse";
|
||||
}
|
||||
|
||||
.nav {
|
||||
padding-left: 0;
|
||||
margin-bottom: 0;
|
||||
@@ -3863,8 +3997,8 @@ input[type="button"].btn-block {
|
||||
|
||||
.navbar-brand {
|
||||
float: left;
|
||||
padding-top: .25rem;
|
||||
padding-bottom: .25rem;
|
||||
padding-top: 0.25rem;
|
||||
padding-bottom: 0.25rem;
|
||||
margin-right: 1rem;
|
||||
font-size: 1.25rem;
|
||||
}
|
||||
@@ -4410,9 +4544,9 @@ input[type="button"].btn-block {
|
||||
border-top-right-radius: 0.2rem;
|
||||
}
|
||||
|
||||
.label {
|
||||
.tag {
|
||||
display: inline-block;
|
||||
padding: .25em .4em;
|
||||
padding: 0.25em 0.4em;
|
||||
font-size: 75%;
|
||||
font-weight: bold;
|
||||
line-height: 1;
|
||||
@@ -4423,72 +4557,72 @@ input[type="button"].btn-block {
|
||||
border-radius: 0.25rem;
|
||||
}
|
||||
|
||||
.label:empty {
|
||||
.tag:empty {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.btn .label {
|
||||
.btn .tag {
|
||||
position: relative;
|
||||
top: -1px;
|
||||
}
|
||||
|
||||
a.label:focus, a.label:hover {
|
||||
a.tag:focus, a.tag:hover {
|
||||
color: #fff;
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.label-pill {
|
||||
padding-right: .6em;
|
||||
padding-left: .6em;
|
||||
.tag-pill {
|
||||
padding-right: 0.6em;
|
||||
padding-left: 0.6em;
|
||||
border-radius: 10rem;
|
||||
}
|
||||
|
||||
.label-default {
|
||||
.tag-default {
|
||||
background-color: #818a91;
|
||||
}
|
||||
|
||||
.label-default[href]:focus, .label-default[href]:hover {
|
||||
.tag-default[href]:focus, .tag-default[href]:hover {
|
||||
background-color: #687077;
|
||||
}
|
||||
|
||||
.label-primary {
|
||||
.tag-primary {
|
||||
background-color: #0275d8;
|
||||
}
|
||||
|
||||
.label-primary[href]:focus, .label-primary[href]:hover {
|
||||
.tag-primary[href]:focus, .tag-primary[href]:hover {
|
||||
background-color: #025aa5;
|
||||
}
|
||||
|
||||
.label-success {
|
||||
.tag-success {
|
||||
background-color: #5cb85c;
|
||||
}
|
||||
|
||||
.label-success[href]:focus, .label-success[href]:hover {
|
||||
.tag-success[href]:focus, .tag-success[href]:hover {
|
||||
background-color: #449d44;
|
||||
}
|
||||
|
||||
.label-info {
|
||||
.tag-info {
|
||||
background-color: #5bc0de;
|
||||
}
|
||||
|
||||
.label-info[href]:focus, .label-info[href]:hover {
|
||||
.tag-info[href]:focus, .tag-info[href]:hover {
|
||||
background-color: #31b0d5;
|
||||
}
|
||||
|
||||
.label-warning {
|
||||
.tag-warning {
|
||||
background-color: #f0ad4e;
|
||||
}
|
||||
|
||||
.label-warning[href]:focus, .label-warning[href]:hover {
|
||||
.tag-warning[href]:focus, .tag-warning[href]:hover {
|
||||
background-color: #ec971f;
|
||||
}
|
||||
|
||||
.label-danger {
|
||||
.tag-danger {
|
||||
background-color: #d9534f;
|
||||
}
|
||||
|
||||
.label-danger[href]:focus, .label-danger[href]:hover {
|
||||
.tag-danger[href]:focus, .tag-danger[href]:hover {
|
||||
background-color: #c9302c;
|
||||
}
|
||||
|
||||
@@ -4879,7 +5013,7 @@ base::-moz-progress-bar,
|
||||
.list-group-item {
|
||||
position: relative;
|
||||
display: block;
|
||||
padding: .75rem 1.25rem;
|
||||
padding: 0.75rem 1.25rem;
|
||||
margin-bottom: -1px;
|
||||
background-color: #fff;
|
||||
border: 1px solid #ddd;
|
||||
@@ -5816,6 +5950,18 @@ a.bg-danger:focus, a.bg-danger:hover {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.d-block {
|
||||
display: block !important;
|
||||
}
|
||||
|
||||
.d-inline-block {
|
||||
display: inline-block !important;
|
||||
}
|
||||
|
||||
.d-inline {
|
||||
display: inline !important;
|
||||
}
|
||||
|
||||
.pull-xs-left {
|
||||
float: left !important;
|
||||
}
|
||||
@@ -5896,6 +6042,10 @@ a.bg-danger:focus, a.bg-danger:hover {
|
||||
clip: auto;
|
||||
}
|
||||
|
||||
.w-100 {
|
||||
width: 100% !important;
|
||||
}
|
||||
|
||||
.m-x-auto {
|
||||
margin-right: auto !important;
|
||||
margin-left: auto !important;
|
||||
|
||||
Reference in New Issue
Block a user