mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-20 20:00:36 +03:00
Code Activity

dist

Browse Source
This commit is contained in:
Mark Otto
2017-10-22 12:26:15 -07:00
parent a1a4e12bcc
commit 1b76b3cf2f
12 changed files with 730 additions and 719 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/css/docs.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
assets/css/docs.min.css.map
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap-grid.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap-reboot.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap.css
+31 -20
View File
@@ -557,7 +557,6 @@ mark,
background-color: #fff; background-color: #fff;
border: 1px solid #ddd; border: 1px solid #ddd;
border-radius: 0.25rem; border-radius: 0.25rem;
transition: all 0.2s ease-in-out;
max-width: 100%; max-width: 100%;
height: auto; height: auto;
} }
@@ -613,8 +612,6 @@ kbd kbd {
pre { pre {
display: block; display: block;
margin-top: 0;
margin-bottom: 1rem;
font-size: 90%; font-size: 90%;
color: #212529; color: #212529;
} }
@@ -1853,7 +1850,6 @@ pre code {
line-height: 1.5; line-height: 1.5;
color: #495057; color: #495057;
background-color: #fff; background-color: #fff;
background-image: none;
background-clip: padding-box; background-clip: padding-box;
border: 1px solid #ced4da; border: 1px solid #ced4da;
border-radius: 0.25rem; border-radius: 0.25rem;
@@ -1941,6 +1937,8 @@ select.form-control:focus::-ms-value {
} }
.form-control-plaintext { .form-control-plaintext {
display: block;
width: 100%;
padding-top: 0.375rem; padding-top: 0.375rem;
padding-bottom: 0.375rem; padding-bottom: 0.375rem;
margin-bottom: 0; margin-bottom: 0;
@@ -2992,14 +2990,14 @@ tbody.collapse.show {
.btn-group > .btn:hover, .btn-group > .btn:hover,
.btn-group-vertical > .btn:hover { .btn-group-vertical > .btn:hover {
z-index: 2; z-index: 1;
} }
.btn-group > .btn:focus, .btn-group > .btn:active, .btn-group > .btn.active, .btn-group > .btn:focus, .btn-group > .btn:active, .btn-group > .btn.active,
.btn-group-vertical > .btn:focus, .btn-group-vertical > .btn:focus,
.btn-group-vertical > .btn:active, .btn-group-vertical > .btn:active,
.btn-group-vertical > .btn.active { .btn-group-vertical > .btn.active {
z-index: 2; z-index: 1;
} }
.btn-group .btn + .btn, .btn-group .btn + .btn,
@@ -3134,6 +3132,11 @@ tbody.collapse.show {
border-top-right-radius: 0; border-top-right-radius: 0;
} }
[data-toggle="buttons"] > .btn,
[data-toggle="buttons"] > .btn-group > .btn {
margin-bottom: 0;
}
[data-toggle="buttons"] > .btn input[type="radio"], [data-toggle="buttons"] > .btn input[type="radio"],
[data-toggle="buttons"] > .btn input[type="checkbox"], [data-toggle="buttons"] > .btn input[type="checkbox"],
[data-toggle="buttons"] > .btn-group > .btn input[type="radio"], [data-toggle="buttons"] > .btn-group > .btn input[type="radio"],
@@ -3154,7 +3157,7 @@ tbody.collapse.show {
.input-group .form-control { .input-group .form-control {
position: relative; position: relative;
z-index: 2; z-index: 1;
-ms-flex: 1 1 auto; -ms-flex: 1 1 auto;
flex: 1 1 auto; flex: 1 1 auto;
width: 1%; width: 1%;
@@ -3162,7 +3165,7 @@ tbody.collapse.show {
} }
.input-group .form-control:focus, .input-group .form-control:active, .input-group .form-control:hover { .input-group .form-control:focus, .input-group .form-control:active, .input-group .form-control:hover {
z-index: 3; z-index: 2;
} }
.input-group-addon, .input-group-addon,
@@ -3266,7 +3269,7 @@ tbody.collapse.show {
} }
.input-group-btn > .btn:focus, .input-group-btn > .btn:active, .input-group-btn > .btn:hover { .input-group-btn > .btn:focus, .input-group-btn > .btn:active, .input-group-btn > .btn:hover {
z-index: 3; z-index: 2;
} }
.input-group-btn:first-child > .btn + .btn { .input-group-btn:first-child > .btn + .btn {
@@ -3280,7 +3283,7 @@ tbody.collapse.show {
.input-group-btn:not(:first-child) > .btn, .input-group-btn:not(:first-child) > .btn,
.input-group-btn:not(:first-child) > .btn-group { .input-group-btn:not(:first-child) > .btn-group {
z-index: 2; z-index: 1;
margin-left: 0; margin-left: 0;
} }
@@ -3293,7 +3296,7 @@ tbody.collapse.show {
.input-group-btn:not(:first-child) > .btn-group:focus, .input-group-btn:not(:first-child) > .btn-group:focus,
.input-group-btn:not(:first-child) > .btn-group:active, .input-group-btn:not(:first-child) > .btn-group:active,
.input-group-btn:not(:first-child) > .btn-group:hover { .input-group-btn:not(:first-child) > .btn-group:hover {
z-index: 3; z-index: 2;
} }
.custom-control { .custom-control {
@@ -4217,30 +4220,36 @@ tbody.collapse.show {
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
} }
.card-group .card:first-child .card-img-top { .card-group .card:first-child .card-img-top,
.card-group .card:first-child .card-header {
border-top-right-radius: 0; border-top-right-radius: 0;
} }
.card-group .card:first-child .card-img-bottom { .card-group .card:first-child .card-img-bottom,
.card-group .card:first-child .card-footer {
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
} }
.card-group .card:last-child { .card-group .card:last-child {
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
.card-group .card:last-child .card-img-top { .card-group .card:last-child .card-img-top,
.card-group .card:last-child .card-header {
border-top-left-radius: 0; border-top-left-radius: 0;
} }
.card-group .card:last-child .card-img-bottom { .card-group .card:last-child .card-img-bottom,
.card-group .card:last-child .card-footer {
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
.card-group .card:only-child { .card-group .card:only-child {
border-radius: 0.25rem; border-radius: 0.25rem;
} }
.card-group .card:only-child .card-img-top { .card-group .card:only-child .card-img-top,
.card-group .card:only-child .card-header {
border-top-left-radius: 0.25rem; border-top-left-radius: 0.25rem;
border-top-right-radius: 0.25rem; border-top-right-radius: 0.25rem;
} }
.card-group .card:only-child .card-img-bottom { .card-group .card:only-child .card-img-bottom,
.card-group .card:only-child .card-footer {
border-bottom-right-radius: 0.25rem; border-bottom-right-radius: 0.25rem;
border-bottom-left-radius: 0.25rem; border-bottom-left-radius: 0.25rem;
} }
@@ -4248,7 +4257,9 @@ tbody.collapse.show {
border-radius: 0; border-radius: 0;
} }
.card-group .card:not(:first-child):not(:last-child):not(:only-child) .card-img-top, .card-group .card:not(:first-child):not(:last-child):not(:only-child) .card-img-top,
.card-group .card:not(:first-child):not(:last-child):not(:only-child) .card-img-bottom { .card-group .card:not(:first-child):not(:last-child):not(:only-child) .card-img-bottom,
.card-group .card:not(:first-child):not(:last-child):not(:only-child) .card-header,
.card-group .card:not(:first-child):not(:last-child):not(:only-child) .card-footer {
border-radius: 0; border-radius: 0;
} }
} }
@@ -4322,7 +4333,7 @@ tbody.collapse.show {
} }
.page-item.active .page-link { .page-item.active .page-link {
z-index: 2; z-index: 1;
color: #fff; color: #fff;
background-color: #007bff; background-color: #007bff;
border-color: #007bff; border-color: #007bff;
@@ -4772,7 +4783,7 @@ tbody.collapse.show {
} }
.list-group-item.active { .list-group-item.active {
z-index: 2; z-index: 1;
color: #fff; color: #fff;
background-color: #007bff; background-color: #007bff;
border-color: #007bff; border-color: #007bff;
dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap.min.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long