aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-07-05 14:22:46 -0500
committerMark Otto <[email protected]>2013-07-05 14:22:46 -0500
commit30c138c4bfc058ff49e3a99d947f81f549e5876c (patch)
tree74929045bb73c86a5775bde8f4043033945bdab0
parent4f922d6e3f6df13e93f6066a47a3c1c8139d1481 (diff)
parentdd691b5c3687d706969fe05b8b2e04ece4558d41 (diff)
downloadbootstrap-30c138c4bfc058ff49e3a99d947f81f549e5876c.tar.xz
bootstrap-30c138c4bfc058ff49e3a99d947f81f549e5876c.zip
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
-rw-r--r--docs/assets/css/bootstrap.css4
-rw-r--r--less/dropdowns.less6
2 files changed, 0 insertions, 10 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index c11879433..f3ff478a9 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2310,10 +2310,6 @@ input[type="button"].btn-block {
padding-left: 20px;
}
-.typeahead {
- z-index: 1051;
-}
-
.list-group {
padding-left: 0;
margin-bottom: 20px;
diff --git a/less/dropdowns.less b/less/dropdowns.less
index f2ddc4392..0a412f9c3 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -158,9 +158,3 @@
padding-left: 20px;
padding-right: 20px;
}
-
-// Typeahead
-// ---------------------------
-.typeahead {
- z-index: 1051;
-}