2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-30 15:24:08 +03:00
This commit is contained in:
Mark Otto
2017-10-15 15:51:44 -07:00
parent 3ccb7ef16a
commit 7ce2b03b1a
39 changed files with 245 additions and 186 deletions
+113 -84
View File
@@ -120,7 +120,7 @@ body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
font-size: 1rem;
font-weight: normal;
font-weight: 400;
line-height: 1.5;
color: #212529;
text-align: left;
@@ -139,7 +139,7 @@ hr {
h1, h2, h3, h4, h5, h6 {
margin-top: 0;
margin-bottom: .5rem;
margin-bottom: 0.5rem;
}
p {
@@ -177,7 +177,7 @@ ul ol {
}
dt {
font-weight: bold;
font-weight: 700;
}
dd {
@@ -276,7 +276,7 @@ a,
area,
button,
[role="button"],
input:not([type=range]),
input:not([type="range"]),
label,
select,
summary,
@@ -500,7 +500,7 @@ hr {
small,
.small {
font-size: 80%;
font-weight: normal;
font-weight: 400;
}
mark,
@@ -608,7 +608,7 @@ kbd {
kbd kbd {
padding: 0;
font-size: 100%;
font-weight: bold;
font-weight: 700;
}
pre {
@@ -1028,7 +1028,7 @@ pre code {
order: 12;
}
.offset-sm-0 {
margin-left: 0%;
margin-left: 0;
}
.offset-sm-1 {
margin-left: 8.333333%;
@@ -1192,7 +1192,7 @@ pre code {
order: 12;
}
.offset-md-0 {
margin-left: 0%;
margin-left: 0;
}
.offset-md-1 {
margin-left: 8.333333%;
@@ -1356,7 +1356,7 @@ pre code {
order: 12;
}
.offset-lg-0 {
margin-left: 0%;
margin-left: 0;
}
.offset-lg-1 {
margin-left: 8.333333%;
@@ -1520,7 +1520,7 @@ pre code {
order: 12;
}
.offset-xl-0 {
margin-left: 0%;
margin-left: 0;
}
.offset-xl-1 {
margin-left: 8.333333%;
@@ -2266,7 +2266,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
.btn {
display: inline-block;
font-weight: normal;
font-weight: 400;
text-align: center;
white-space: nowrap;
vertical-align: middle;
@@ -2295,7 +2295,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
opacity: .65;
}
.btn:active, .btn.active {
.btn:not([disabled]):not(.disabled):active, .btn:not([disabled]):not(.disabled).active {
background-image: none;
}
@@ -2325,7 +2325,7 @@ fieldset[disabled] a.btn {
border-color: #007bff;
}
.btn-primary:active, .btn-primary.active,
.btn-primary:not([disabled]):not(.disabled):active, .btn-primary:not([disabled]):not(.disabled).active,
.show > .btn-primary.dropdown-toggle {
background-color: #0069d9;
background-image: none;
@@ -2353,7 +2353,7 @@ fieldset[disabled] a.btn {
border-color: #868e96;
}
.btn-secondary:active, .btn-secondary.active,
.btn-secondary:not([disabled]):not(.disabled):active, .btn-secondary:not([disabled]):not(.disabled).active,
.show > .btn-secondary.dropdown-toggle {
background-color: #727b84;
background-image: none;
@@ -2381,7 +2381,7 @@ fieldset[disabled] a.btn {
border-color: #28a745;
}
.btn-success:active, .btn-success.active,
.btn-success:not([disabled]):not(.disabled):active, .btn-success:not([disabled]):not(.disabled).active,
.show > .btn-success.dropdown-toggle {
background-color: #218838;
background-image: none;
@@ -2409,7 +2409,7 @@ fieldset[disabled] a.btn {
border-color: #17a2b8;
}
.btn-info:active, .btn-info.active,
.btn-info:not([disabled]):not(.disabled):active, .btn-info:not([disabled]):not(.disabled).active,
.show > .btn-info.dropdown-toggle {
background-color: #138496;
background-image: none;
@@ -2437,7 +2437,7 @@ fieldset[disabled] a.btn {
border-color: #ffc107;
}
.btn-warning:active, .btn-warning.active,
.btn-warning:not([disabled]):not(.disabled):active, .btn-warning:not([disabled]):not(.disabled).active,
.show > .btn-warning.dropdown-toggle {
background-color: #e0a800;
background-image: none;
@@ -2465,7 +2465,7 @@ fieldset[disabled] a.btn {
border-color: #dc3545;
}
.btn-danger:active, .btn-danger.active,
.btn-danger:not([disabled]):not(.disabled):active, .btn-danger:not([disabled]):not(.disabled).active,
.show > .btn-danger.dropdown-toggle {
background-color: #c82333;
background-image: none;
@@ -2493,7 +2493,7 @@ fieldset[disabled] a.btn {
border-color: #f8f9fa;
}
.btn-light:active, .btn-light.active,
.btn-light:not([disabled]):not(.disabled):active, .btn-light:not([disabled]):not(.disabled).active,
.show > .btn-light.dropdown-toggle {
background-color: #e2e6ea;
background-image: none;
@@ -2521,7 +2521,7 @@ fieldset[disabled] a.btn {
border-color: #343a40;
}
.btn-dark:active, .btn-dark.active,
.btn-dark:not([disabled]):not(.disabled):active, .btn-dark:not([disabled]):not(.disabled).active,
.show > .btn-dark.dropdown-toggle {
background-color: #23272b;
background-image: none;
@@ -2550,7 +2550,7 @@ fieldset[disabled] a.btn {
background-color: transparent;
}
.btn-outline-primary:active, .btn-outline-primary.active,
.btn-outline-primary:not([disabled]):not(.disabled):active, .btn-outline-primary:not([disabled]):not(.disabled).active,
.show > .btn-outline-primary.dropdown-toggle {
color: #fff;
background-color: #007bff;
@@ -2579,7 +2579,7 @@ fieldset[disabled] a.btn {
background-color: transparent;
}
.btn-outline-secondary:active, .btn-outline-secondary.active,
.btn-outline-secondary:not([disabled]):not(.disabled):active, .btn-outline-secondary:not([disabled]):not(.disabled).active,
.show > .btn-outline-secondary.dropdown-toggle {
color: #fff;
background-color: #868e96;
@@ -2608,7 +2608,7 @@ fieldset[disabled] a.btn {
background-color: transparent;
}
.btn-outline-success:active, .btn-outline-success.active,
.btn-outline-success:not([disabled]):not(.disabled):active, .btn-outline-success:not([disabled]):not(.disabled).active,
.show > .btn-outline-success.dropdown-toggle {
color: #fff;
background-color: #28a745;
@@ -2637,7 +2637,7 @@ fieldset[disabled] a.btn {
background-color: transparent;
}
.btn-outline-info:active, .btn-outline-info.active,
.btn-outline-info:not([disabled]):not(.disabled):active, .btn-outline-info:not([disabled]):not(.disabled).active,
.show > .btn-outline-info.dropdown-toggle {
color: #fff;
background-color: #17a2b8;
@@ -2666,7 +2666,7 @@ fieldset[disabled] a.btn {
background-color: transparent;
}
.btn-outline-warning:active, .btn-outline-warning.active,
.btn-outline-warning:not([disabled]):not(.disabled):active, .btn-outline-warning:not([disabled]):not(.disabled).active,
.show > .btn-outline-warning.dropdown-toggle {
color: #fff;
background-color: #ffc107;
@@ -2695,7 +2695,7 @@ fieldset[disabled] a.btn {
background-color: transparent;
}
.btn-outline-danger:active, .btn-outline-danger.active,
.btn-outline-danger:not([disabled]):not(.disabled):active, .btn-outline-danger:not([disabled]):not(.disabled).active,
.show > .btn-outline-danger.dropdown-toggle {
color: #fff;
background-color: #dc3545;
@@ -2724,7 +2724,7 @@ fieldset[disabled] a.btn {
background-color: transparent;
}
.btn-outline-light:active, .btn-outline-light.active,
.btn-outline-light:not([disabled]):not(.disabled):active, .btn-outline-light:not([disabled]):not(.disabled).active,
.show > .btn-outline-light.dropdown-toggle {
color: #212529;
background-color: #f8f9fa;
@@ -2753,7 +2753,7 @@ fieldset[disabled] a.btn {
background-color: transparent;
}
.btn-outline-dark:active, .btn-outline-dark.active,
.btn-outline-dark:not([disabled]):not(.disabled):active, .btn-outline-dark:not([disabled]):not(.disabled).active,
.show > .btn-outline-dark.dropdown-toggle {
color: #fff;
background-color: #343a40;
@@ -2761,7 +2761,7 @@ fieldset[disabled] a.btn {
}
.btn-link {
font-weight: normal;
font-weight: 400;
color: #007bff;
background-color: transparent;
}
@@ -2865,6 +2865,26 @@ tbody.collapse.show {
margin-left: 0;
}
.dropdown-menu {
position: absolute;
top: 100%;
left: 0;
z-index: 1000;
display: none;
float: left;
min-width: 10rem;
padding: 0.5rem 0;
margin: 0.125rem 0 0;
font-size: 1rem;
color: #212529;
text-align: left;
list-style: none;
background-color: #fff;
background-clip: padding-box;
border: 1px solid rgba(0, 0, 0, 0.15);
border-radius: 0.25rem;
}
.dropup .dropdown-menu {
margin-top: 0;
margin-bottom: 0.125rem;
@@ -2887,26 +2907,6 @@ tbody.collapse.show {
margin-left: 0;
}
.dropdown-menu {
position: absolute;
top: 100%;
left: 0;
z-index: 1000;
display: none;
float: left;
min-width: 10rem;
padding: 0.5rem 0;
margin: 0.125rem 0 0;
font-size: 1rem;
color: #212529;
text-align: left;
list-style: none;
background-color: #fff;
background-clip: padding-box;
border: 1px solid rgba(0, 0, 0, 0.15);
border-radius: 0.25rem;
}
.dropdown-divider {
height: 0;
margin: 0.5rem 0;
@@ -2919,7 +2919,7 @@ tbody.collapse.show {
width: 100%;
padding: 0.25rem 1.5rem;
clear: both;
font-weight: normal;
font-weight: 400;
color: #212529;
text-align: inherit;
white-space: nowrap;
@@ -3171,7 +3171,7 @@ tbody.collapse.show {
padding: 0.375rem 0.75rem;
margin-bottom: 0;
font-size: 1rem;
font-weight: normal;
font-weight: 400;
line-height: 1.5;
color: #495057;
text-align: center;
@@ -3714,6 +3714,10 @@ tbody.collapse.show {
.navbar-expand-sm .navbar-toggler {
display: none;
}
.navbar-expand-sm .dropup .dropdown-menu {
top: auto;
bottom: 100%;
}
}
@media (max-width: 767px) {
@@ -3760,6 +3764,10 @@ tbody.collapse.show {
.navbar-expand-md .navbar-toggler {
display: none;
}
.navbar-expand-md .dropup .dropdown-menu {
top: auto;
bottom: 100%;
}
}
@media (max-width: 991px) {
@@ -3806,6 +3814,10 @@ tbody.collapse.show {
.navbar-expand-lg .navbar-toggler {
display: none;
}
.navbar-expand-lg .dropup .dropdown-menu {
top: auto;
bottom: 100%;
}
}
@media (max-width: 1199px) {
@@ -3852,6 +3864,10 @@ tbody.collapse.show {
.navbar-expand-xl .navbar-toggler {
display: none;
}
.navbar-expand-xl .dropup .dropdown-menu {
top: auto;
bottom: 100%;
}
}
.navbar-expand {
@@ -3903,6 +3919,11 @@ tbody.collapse.show {
display: none;
}
.navbar-expand .dropup .dropdown-menu {
top: auto;
bottom: 100%;
}
.navbar-light .navbar-brand {
color: rgba(0, 0, 0, 0.9);
}
@@ -3952,11 +3973,11 @@ tbody.collapse.show {
}
.navbar-dark .navbar-brand {
color: white;
color: #fff;
}
.navbar-dark .navbar-brand:focus, .navbar-dark .navbar-brand:hover {
color: white;
color: #fff;
}
.navbar-dark .navbar-nav .nav-link {
@@ -3975,7 +3996,7 @@ tbody.collapse.show {
.navbar-dark .navbar-nav .active > .nav-link,
.navbar-dark .navbar-nav .nav-link.show,
.navbar-dark .navbar-nav .nav-link.active {
color: white;
color: #fff;
}
.navbar-dark .navbar-toggler {
@@ -3992,11 +4013,11 @@ tbody.collapse.show {
}
.navbar-dark .navbar-text a {
color: white;
color: #fff;
}
.navbar-dark .navbar-text a:focus, .navbar-dark .navbar-text a:hover {
color: white;
color: #fff;
}
.card {
@@ -4018,6 +4039,16 @@ tbody.collapse.show {
margin-left: 0;
}
.card > .list-group:first-child .list-group-item:first-child {
border-top-left-radius: 0.25rem;
border-top-right-radius: 0.25rem;
}
.card > .list-group:last-child .list-group-item:last-child {
border-bottom-right-radius: 0.25rem;
border-bottom-left-radius: 0.25rem;
}
.card-body {
-ms-flex: 1 1 auto;
flex: 1 1 auto;
@@ -4045,16 +4076,6 @@ tbody.collapse.show {
margin-left: 1.25rem;
}
.card > .list-group:first-child .list-group-item:first-child {
border-top-left-radius: 0.25rem;
border-top-right-radius: 0.25rem;
}
.card > .list-group:last-child .list-group-item:last-child {
border-bottom-right-radius: 0.25rem;
border-bottom-left-radius: 0.25rem;
}
.card-header {
padding: 0.75rem 1.25rem;
margin-bottom: 0;
@@ -4194,6 +4215,17 @@ tbody.collapse.show {
.card-group .card:last-child .card-img-bottom {
border-bottom-left-radius: 0;
}
.card-group .card:only-child {
border-radius: 0.25rem;
}
.card-group .card:only-child .card-img-top {
border-top-left-radius: 0.25rem;
border-top-right-radius: 0.25rem;
}
.card-group .card:only-child .card-img-bottom {
border-bottom-right-radius: 0.25rem;
border-bottom-left-radius: 0.25rem;
}
.card-group .card:not(:first-child):not(:last-child):not(:only-child) {
border-radius: 0;
}
@@ -4201,9 +4233,6 @@ tbody.collapse.show {
.card-group .card:not(:first-child):not(:last-child):not(:only-child) .card-img-bottom {
border-radius: 0;
}
.card-group .card:only-child {
border-radius: 0.25rem;
}
}
.card-columns .card {
@@ -4342,7 +4371,7 @@ tbody.collapse.show {
display: inline-block;
padding: 0.25em 0.4em;
font-size: 75%;
font-weight: bold;
font-weight: 700;
line-height: 1;
text-align: center;
white-space: nowrap;
@@ -4485,7 +4514,7 @@ tbody.collapse.show {
}
.alert-link {
font-weight: bold;
font-weight: 700;
}
.alert-dismissible .close {
@@ -4945,7 +4974,7 @@ button.list-group-item-dark.active {
.close {
float: right;
font-size: 1.5rem;
font-weight: bold;
font-weight: 700;
line-height: 1;
color: #000;
text-shadow: 0 1px 0 #fff;
@@ -5118,7 +5147,7 @@ button.close {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
font-style: normal;
font-weight: normal;
font-weight: 400;
line-height: 1.5;
text-align: left;
text-align: start;
@@ -5146,6 +5175,12 @@ button.close {
height: 5px;
}
.tooltip .arrow::before {
position: absolute;
border-color: transparent;
border-style: solid;
}
.tooltip.bs-tooltip-top, .tooltip.bs-tooltip-auto[x-placement^="top"] {
padding: 5px 0;
}
@@ -5207,12 +5242,6 @@ button.close {
border-left-color: #000;
}
.tooltip .arrow::before {
position: absolute;
border-color: transparent;
border-style: solid;
}
.tooltip-inner {
max-width: 200px;
padding: 3px 8px;
@@ -5232,7 +5261,7 @@ button.close {
padding: 1px;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
font-style: normal;
font-weight: normal;
font-weight: 400;
line-height: 1.5;
text-align: left;
text-align: start;
@@ -5528,11 +5557,11 @@ button.close {
}
.carousel-control-prev-icon {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 8 8'%3E%3Cpath d='M4 0l-4 4 4 4 1.5-1.5-2.5-2.5 2.5-2.5-1.5-1.5z'/%3E%3C/svg%3E");
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 8 8'%3E%3Cpath d='M5.25 0l-4 4 4 4 1.5-1.5-2.5-2.5 2.5-2.5-1.5-1.5z'/%3E%3C/svg%3E");
}
.carousel-control-next-icon {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 8 8'%3E%3Cpath d='M1.5 0l-1.5 1.5 2.5 2.5-2.5 2.5 1.5 1.5 4-4-4-4z'/%3E%3C/svg%3E");
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 8 8'%3E%3Cpath d='M2.75 0l-1.5 1.5 2.5 2.5-2.5 2.5 1.5 1.5 4-4-4-4z'/%3E%3C/svg%3E");
}
.carousel-indicators {
@@ -8232,11 +8261,11 @@ a.bg-dark:focus, a.bg-dark:hover {
}
.font-weight-normal {
font-weight: normal !important;
font-weight: 400 !important;
}
.font-weight-bold {
font-weight: bold !important;
font-weight: 700 !important;
}
.font-italic {