vendor/assets/stylesheets/navs.scss in anjlab-bootstrap-rails-2.0.1.1 vs vendor/assets/stylesheets/navs.scss in anjlab-bootstrap-rails-2.0.2.0
- old
+ new
@@ -40,12 +40,12 @@
// NAV LIST
// --------
.nav-list {
- padding-left: 14px;
- padding-right: 14px;
+ padding-left: 15px;
+ padding-right: 15px;
margin-bottom: 0;
}
.nav-list > li > a,
.nav-list .nav-header {
margin-left: -15px;
@@ -53,19 +53,23 @@
text-shadow: 0 1px 0 rgba(255,255,255,.5);
}
.nav-list > li > a {
padding: 3px 15px;
}
-.nav-list .active > a,
-.nav-list .active > a:hover {
+.nav-list > .active > a,
+.nav-list > .active > a:hover {
color: $white;
text-shadow: 0 -1px 0 rgba(0,0,0,.2);
background-color: $linkColor;
}
.nav-list [class^="icon-"] {
margin-right: 2px;
}
+// Dividers (basically an hr) within the dropdown
+.nav-list .divider {
+ @include nav-divider();
+}
// TABS AND PILLS
// -------------
@@ -100,12 +104,13 @@
margin-bottom: -1px;
}
// Actual tabs (as links)
.nav-tabs > li > a {
- padding-top: 9px;
- padding-bottom: 9px;
+ padding-top: 8px;
+ padding-bottom: 8px;
+ line-height: $baseLineHeight;
border: 1px solid transparent;
@include border-radius(4px 4px 0 0);
&:hover {
border-color: $grayLighter $grayLighter #ddd;
}
@@ -131,12 +136,12 @@
margin-bottom: 2px;
@include border-radius(5px);
}
// Active state
-.nav-pills .active > a,
-.nav-pills .active > a:hover {
+.nav-pills > .active > a,
+.nav-pills > .active > a:hover {
color: $white;
background-color: $linkColor;
}
@@ -198,22 +203,25 @@
// -------------------------
// Make carets use linkColor to start
.nav-tabs .dropdown-toggle .caret,
.nav-pills .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 {
border-top-color: $linkColorHover;
+ border-bottom-color: $linkColorHover;
}
// Active dropdown links
// -------------------------
.nav-tabs .active .dropdown-toggle .caret,
.nav-pills .active .dropdown-toggle .caret {
border-top-color: $grayDark;
+ border-bottom-color: $grayDark;
}
// Active:hover dropdown links
// -------------------------
.nav > .dropdown.active > a:hover {
@@ -232,10 +240,11 @@
}
.nav .open .caret,
.nav .open.active .caret,
.nav .open a:hover .caret {
border-top-color: $white;
+ border-bottom-color: $white;
@include opacity(100);
}
// Dropdowns in stacked tabs
.tabs-stacked .open > a:hover {
@@ -254,10 +263,11 @@
// Clear any floats
.tabbable {
@include clearfix();
}
.tab-content {
- overflow: hidden; // prevent content from running below tabs
+ display: table; // prevent content from running below tabs
+ width: 100%;
}
// Remove border on bottom, left, right
.tabs-below .nav-tabs,
.tabs-right .nav-tabs,