aboutsummaryrefslogtreecommitdiff
path: root/docs/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-11-29 19:54:20 -0800
committerMark Otto <[email protected]>2015-11-29 19:54:20 -0800
commit0fa2c7c4866a4ada900a0bebd45ab8b741db6788 (patch)
tree9aca4400012f25b1fb2f5f03f70cc658da9199a9 /docs/dist/css/bootstrap.css
parent765c5e9c07610a713a89e1664d6df539cdea44b4 (diff)
parentc68019e5d0ac1eba6cda998a0f4067809a10c443 (diff)
downloadbootstrap-0fa2c7c4866a4ada900a0bebd45ab8b741db6788.tar.xz
bootstrap-0fa2c7c4866a4ada900a0bebd45ab8b741db6788.zip
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to 'docs/dist/css/bootstrap.css')
-rw-r--r--docs/dist/css/bootstrap.css33
1 files changed, 16 insertions, 17 deletions
diff --git a/docs/dist/css/bootstrap.css b/docs/dist/css/bootstrap.css
index 0299ff049..c2ed0bb83 100644
--- a/docs/dist/css/bootstrap.css
+++ b/docs/dist/css/bootstrap.css
@@ -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;
}