vendor/assets/stylesheets/twitter/bootstrap/_navs.scss in bootstrap-sass-rails-rtl-2.0.4.12 vs vendor/assets/stylesheets/twitter/bootstrap/_navs.scss in bootstrap-sass-rails-rtl-2.2.2.0
- old
+ new
@@ -1,10 +1,11 @@
-// NAVIGATIONS
-// -----------
+/* Partial: twitter/bootstrap/_navs.scss */
+//
+// Navs
+// --------------------------------------------------
-
// BASE CLASS
// ----------
.nav {
margin-left: 0;
@@ -19,17 +20,23 @@
.nav > li > a:hover {
text-decoration: none;
background-color: $grayLighter;
}
+// Prevent IE8 from misplacing imgs
+// See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
+.nav > li > a > img {
+ max-width: none;
+}
+
// Redeclare pull classes because of specifity
.nav > .pull-right {
float: right;
}
// Nav headers (for dropdowns and lists)
-.nav .nav-header {
+.nav-header {
display: block;
padding: 3px 15px;
font-size: 11px;
font-weight: bold;
line-height: $baseLineHeight;
@@ -41,10 +48,11 @@
.nav li + .nav-header {
margin-top: 9px;
}
+
// NAV LIST
// --------
.nav-list {
padding-left: 15px;
@@ -64,11 +72,12 @@
.nav-list > .active > a:hover {
color: $white;
text-shadow: 0 -1px 0 rgba(0,0,0,.2);
background-color: $linkColor;
}
-.nav-list [class^="icon-"] {
+.nav-list [class^="icon-"],
+.nav-list [class^=" icon-"] {
margin-right: 2px;
}
// Dividers (basically an hr) within the dropdown
.nav-list .divider {
@include nav-divider();
@@ -121,11 +130,11 @@
}
// Active state, and it's :hover to override normal :hover
.nav-tabs > .active > a,
.nav-tabs > .active > a:hover {
color: $gray;
- background-color: $white;
+ background-color: $bodyBackground;
border: 1px solid #ddd;
border-bottom-color: transparent;
cursor: default;
}
@@ -170,13 +179,15 @@
border: 1px solid #ddd;
@include border-radius(0);
}
.nav-tabs.nav-stacked > li:first-child > a {
@include border-radius(4px 4px 0 0);
+ @include border-top-radius(4px);
}
.nav-tabs.nav-stacked > li:last-child > a {
@include border-radius(0 0 4px 4px);
+ @include border-bottom-radius(4px);
}
.nav-tabs.nav-stacked > li > a:hover {
border-color: #ddd;
z-index: 2;
}
@@ -193,43 +204,47 @@
// DROPDOWNS
// ---------
.nav-tabs .dropdown-menu {
- @include border-radius(0 0 5px 5px); // remove the top rounded corners here since there is a hard edge above the menu
+ @include border-radius(0 0 6px 6px); // remove the top rounded corners here since there is a hard edge above the menu
}
.nav-pills .dropdown-menu {
- @include border-radius(4px); // make rounded corners match the pills
+ @include border-radius(6px); // make rounded corners match the pills
}
// Default dropdown links
// -------------------------
// Make carets use linkColor to start
-.nav-tabs .dropdown-toggle .caret,
-.nav-pills .dropdown-toggle .caret {
+.nav .dropdown-toggle .caret {
border-top-color: $linkColor;
border-bottom-color: $linkColor;
margin-top: 6px;
}
-.nav-tabs .dropdown-toggle:hover .caret,
-.nav-pills .dropdown-toggle:hover .caret {
+.nav .dropdown-toggle:hover .caret {
border-top-color: $linkColorHover;
border-bottom-color: $linkColorHover;
}
+/* move down carets for tabs */
+.nav-tabs .dropdown-toggle .caret {
+ margin-top: 8px;
+}
// Active dropdown links
// -------------------------
-.nav-tabs .active .dropdown-toggle .caret,
-.nav-pills .active .dropdown-toggle .caret {
- border-top-color: $grayDark;
- border-bottom-color: $grayDark;
+.nav .active .dropdown-toggle .caret {
+ border-top-color: #fff;
+ border-bottom-color: #fff;
}
+.nav-tabs .active .dropdown-toggle .caret {
+ border-top-color: $gray;
+ border-bottom-color: $gray;
+}
// Active:hover dropdown links
// -------------------------
.nav > .dropdown.active > a:hover {
- color: $black;
cursor: pointer;
}
// Open dropdowns
// -------------------------
@@ -359,6 +374,22 @@
}
.tabs-right > .nav-tabs .active > a,
.tabs-right > .nav-tabs .active > a:hover {
border-color: #ddd #ddd #ddd transparent;
*border-left-color: $white;
+}
+
+
+
+// DISABLED STATES
+// ---------------
+
+// Gray out text
+.nav > .disabled > a {
+ color: $grayLight;
+}
+// Nuke hover effects
+.nav > .disabled > a:hover {
+ text-decoration: none;
+ background-color: transparent;
+ cursor: default;
}