aboutsummaryrefslogtreecommitdiff
path: root/docs/assets
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-02-21 22:09:51 -0800
committerMark Otto <[email protected]>2012-02-21 22:09:51 -0800
commit8bd67bb124ccc87ecfe7959f3e75bb497d7991e1 (patch)
treef10ae493e75aba6fb2b3dafc47641b07c93bd49b /docs/assets
parent20221a67c2590e5d5d2d3a78dd79d61498e80661 (diff)
downloadbootstrap-8bd67bb124ccc87ecfe7959f3e75bb497d7991e1.tar.xz
bootstrap-8bd67bb124ccc87ecfe7959f3e75bb497d7991e1.zip
clean up and simplify support for bottom navbar by automagically turning dropdowns into dropups
Diffstat (limited to 'docs/assets')
-rw-r--r--docs/assets/bootstrap.zipbin56599 -> 56637 bytes
-rw-r--r--docs/assets/css/bootstrap.css8
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index dde638c05..91d731edb 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index c9c2ee891..912be887a 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1867,12 +1867,12 @@ table .span24 {
left: auto;
right: 0;
}
-.dropup .caret {
+.dropup .caret, .navbar-fixed-bottom .dropdown .caret {
border-top: 0;
border-bottom: 4px solid #000000;
content: "\2191";
}
-.dropup .dropdown-menu {
+.dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu {
top: auto;
bottom: 100%;
margin-bottom: 1px;
@@ -2945,14 +2945,14 @@ button.btn.btn-small, input[type="submit"].btn.btn-small {
top: -6px;
left: 10px;
}
-.navbar .dropdown-menu.bottom-up:before {
+.navbar-fixed-bottom .dropdown-menu:before {
border-top: 7px solid #ccc;
border-top-color: rgba(0, 0, 0, 0.2);
border-bottom: 0;
bottom: -7px;
top: auto;
}
-.navbar .dropdown-menu.bottom-up:after {
+.navbar-fixed-bottom .dropdown-menu:after {
border-top: 6px solid #ffffff;
border-bottom: 0;
bottom: -6px;