mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-24 14:04:09 +03:00
Code Activity

Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev

Browse Source
This commit is contained in:
Mark Otto
2015-11-29 19:54:20 -08:00
parent 765c5e9c07 c68019e5d0
commit 0fa2c7c486
31 changed files with 218 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/dist/css/bootstrap.css
+16 -17
View File
@@ -3154,6 +3154,10 @@ input[type="button"].btn-block {
margin-bottom: 0;
}
.input-group .form-control:focus, .input-group .form-control:active, .input-group .form-control:hover {
z-index: 3;
}
.input-group-addon,
.input-group-btn,
.input-group .form-control {
@@ -3251,7 +3255,7 @@ input[type="button"].btn-block {
}
.input-group-btn > .btn:focus, .input-group-btn > .btn:active, .input-group-btn > .btn:hover {
z-index: 2;
z-index: 3;
}
.input-group-btn:first-child > .btn,
@@ -3265,6 +3269,13 @@ input[type="button"].btn-block {
margin-left: -1px;
}
.input-group-btn:last-child > .btn:focus, .input-group-btn:last-child > .btn:active, .input-group-btn:last-child > .btn:hover,
.input-group-btn:last-child > .btn-group:focus,
.input-group-btn:last-child > .btn-group:active,
.input-group-btn:last-child > .btn-group:hover {
z-index: 3;
}
.c-input {
position: relative;
display: inline;
@@ -4273,16 +4284,16 @@ a.label:focus, a.label:hover {
border-radius: .3rem;
}
.jumbotron-hr {
border-top-color: #d0d5d8;
}
@media (min-width: 544px) {
.jumbotron {
padding: 4rem 2rem;
}
}
.jumbotron-hr {
border-top-color: #d0d5d8;
}
.jumbotron-fluid {
padding-right: 0;
padding-left: 0;
@@ -5579,18 +5590,6 @@ button.close {
border: 0;
}
.text-left {
text-align: left !important;
}
.text-right {
text-align: right !important;
}
.text-center {
text-align: center !important;
}
.text-justify {
text-align: justify !important;
}