aboutsummaryrefslogtreecommitdiff
path: root/docs/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-02-07 22:48:26 -0800
committerMark Otto <[email protected]>2016-02-07 22:48:26 -0800
commite455b6b8d2cd028d53640f14134f0e8b3f575786 (patch)
tree7d3ee33ae188ac37734fb92ec1d29d695d21fd63 /docs/dist/css/bootstrap.css
parente589cdbfe9421d58f6c3ff4d2820056983df6def (diff)
parente3b55aadea895bdb0910f3ffd3f74d89fee37925 (diff)
downloadbootstrap-e455b6b8d2cd028d53640f14134f0e8b3f575786.tar.xz
bootstrap-e455b6b8d2cd028d53640f14134f0e8b3f575786.zip
Merge branch 'v4-dev' into v4-form-sizing
Diffstat (limited to 'docs/dist/css/bootstrap.css')
-rw-r--r--docs/dist/css/bootstrap.css7
1 files changed, 1 insertions, 6 deletions
diff --git a/docs/dist/css/bootstrap.css b/docs/dist/css/bootstrap.css
index bfebc39b0..6e5c97221 100644
--- a/docs/dist/css/bootstrap.css
+++ b/docs/dist/css/bootstrap.css
@@ -2130,7 +2130,7 @@ pre code {
cursor: not-allowed;
}
-select.form-control:not([size], [multiple]) {
+select.form-control:not([size]):not([multiple]) {
height: 2.25rem;
}
@@ -3145,11 +3145,6 @@ input[type="button"].btn-block {
z-index: 990;
}
-.pull-right > .dropdown-menu {
- right: 0;
- left: auto;
-}
-
.dropup .caret,
.navbar-fixed-bottom .dropdown .caret {
content: "";