aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-08 02:15:47 -0800
committerMark Otto <[email protected]>2012-01-08 02:15:47 -0800
commitcf05dc86774ea05aa0f40aff771538e6e2f405d2 (patch)
tree4575beec31a3de3ae02ff613d3c18429e713d407
parent916761d56854ca4fcc8ea4afa68511fb26a93e4c (diff)
downloadbootstrap-cf05dc86774ea05aa0f40aff771538e6e2f405d2.tar.xz
bootstrap-cf05dc86774ea05aa0f40aff771538e6e2f405d2.zip
adjust navs for fine details on dropdowns in stacked nav and improved open state there
-rw-r--r--bootstrap.css17
-rw-r--r--bootstrap.min.css10
-rw-r--r--lib/navs.less22
3 files changed, 32 insertions, 17 deletions
diff --git a/bootstrap.css b/bootstrap.css
index 550f7fdce..e60baa663 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Sun Jan 8 01:56:47 PST 2012
+ * Date: Sun Jan 8 02:15:22 PST 2012
*/
html, body {
margin: 0;
@@ -1925,7 +1925,7 @@ i {
.pills.stacked > li:last-child > a {
margin-bottom: 1px;
}
-.tabs .dropdown-menu, .pills .dropdown-menu {
+.nav .dropdown-menu {
top: 33px;
border-width: 1px;
}
@@ -1934,19 +1934,26 @@ i {
-moz-border-radius: 4px;
border-radius: 4px;
}
-.tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret {
+.nav .dropdown-toggle .caret {
+ border-top-color: #0088cc;
margin-top: 6px;
}
-.tabs .open .dropdown-toggle, .pills .open .dropdown-toggle {
+.nav .dropdown-toggle:hover .caret {
+ border-top-color: #005580;
+}
+.nav .open .dropdown-toggle {
background-color: #999;
border-color: #999;
}
-.tabs .open .caret, .pills .open .caret {
+.nav .open .caret, .nav .open a:hover .caret {
border-top-color: #fff;
filter: alpha(opacity=100);
-moz-opacity: 1;
opacity: 1;
}
+.tabs.stacked .open > a:hover {
+ border-color: #999;
+}
.tabbable {
zoom: 1;
}
diff --git a/bootstrap.min.css b/bootstrap.min.css
index af321d314..a4352cf92 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -368,11 +368,13 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
.tabs.stacked>li>a:hover{border-color:#ddd;z-index:2;}
.pills.stacked>li>a{margin-bottom:3px;}
.pills.stacked>li:last-child>a{margin-bottom:1px;}
-.tabs .dropdown-menu,.pills .dropdown-menu{top:33px;border-width:1px;}
+.nav .dropdown-menu{top:33px;border-width:1px;}
.pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.tabs .dropdown-toggle .caret,.pills .dropdown-toggle .caret{margin-top:6px;}
-.tabs .open .dropdown-toggle,.pills .open .dropdown-toggle{background-color:#999;border-color:#999;}
-.tabs .open .caret,.pills .open .caret{border-top-color:#fff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
+.nav .dropdown-toggle .caret{border-top-color:#0088cc;margin-top:6px;}
+.nav .dropdown-toggle:hover .caret{border-top-color:#005580;}
+.nav .open .dropdown-toggle{background-color:#999;border-color:#999;}
+.nav .open .caret,.nav .open a:hover .caret{border-top-color:#fff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;}
+.tabs.stacked .open>a:hover{border-color:#999;}
.tabbable{zoom:1;}.tabbable:before,.tabbable:after{display:table;*display:inline;content:"";zoom:1;}
.tabbable:after{clear:both;}
.tabs-below .tabs,.tabs-right .tabs,.tabs-left .tabs{border-bottom:0;}
diff --git a/lib/navs.less b/lib/navs.less
index 743d772f3..dee482aea 100644
--- a/lib/navs.less
+++ b/lib/navs.less
@@ -175,29 +175,35 @@
// ---------
// Position the menu
-.tabs .dropdown-menu,
-.pills .dropdown-menu {
+.nav .dropdown-menu {
top: 33px;
border-width: 1px;
}
.pills .dropdown-menu {
.border-radius(4px);
}
-.tabs .dropdown-toggle .caret,
-.pills .dropdown-toggle .caret {
+.nav .dropdown-toggle .caret {
+ border-top-color: @linkColor;
margin-top: 6px;
}
-.tabs .open .dropdown-toggle,
-.pills .open .dropdown-toggle {
+.nav .dropdown-toggle:hover .caret {
+ border-top-color: @linkColorHover;
+}
+.nav .open .dropdown-toggle {
background-color: #999;
border-color: #999;
}
-.tabs .open .caret,
-.pills .open .caret {
+.nav .open .caret,
+.nav .open a:hover .caret {
border-top-color: #fff;
.opacity(100);
}
+// Dropdowns in stacked tabs
+.tabs.stacked .open > a:hover {
+ border-color: #999;
+}
+
// TABBABLE