vendor/assets/stylesheets/bootstrap/_navs.scss in bootstrap-sass-2.0.0 vs vendor/assets/stylesheets/bootstrap/_navs.scss in bootstrap-sass-2.0.1

- old
+ new

@@ -19,10 +19,25 @@ .nav > li > a:hover { text-decoration: none; background-color: $grayLighter; } +// Nav headers (for dropdowns and lists) +.nav .nav-header { + display: block; + padding: 3px 15px; + font-size: 11px; + font-weight: bold; + line-height: $baseLineHeight; + color: $grayLight; + text-shadow: 0 1px 0 rgba(255,255,255,.5); + text-transform: uppercase; +} +// Space them out when they follow another list item (link) +.nav li + .nav-header { + margin-top: 9px; +} // NAV LIST // -------- @@ -30,32 +45,23 @@ padding-left: 14px; padding-right: 14px; margin-bottom: 0; } .nav-list > li > a, .nav-list .nav-header { - display: block; - padding: 3px 15px; margin-left: -15px; margin-right: -15px; text-shadow: 0 1px 0 rgba(255,255,255,.5); } -.nav-list .nav-header { - font-size: 11px; - font-weight: bold; - line-height: $baseLineHeight; - color: $grayLight; - text-transform: uppercase; +.nav-list > li > a { + padding: 3px 15px; } -.nav-list > li + .nav-header { - margin-top: 9px; -} -.nav-list .active > a { +.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 .icon { +.nav-list [class^="icon-"] { margin-right: 2px; } @@ -211,11 +217,11 @@ background-color: $grayLight; border-color: $grayLight; } .nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret { border-top-color: $white; - @include opacity(100); + @include opacity(1); } // Dropdowns in stacked tabs .tabs-stacked .open > a:hover { border-color: $grayLight; @@ -232,10 +238,13 @@ // Clear any floats .tabbable { @include clearfix(); } +.tab-content { + overflow: hidden; // prevent content from running below tabs +} // Remove border on bottom, left, right .tabs-below .nav-tabs, .tabs-right .nav-tabs, .tabs-left .nav-tabs { border-bottom: 0; } @@ -315,6 +324,6 @@ border-color: $grayLighter $grayLighter $grayLighter #ddd; } .tabs-right .nav-tabs .active > a, .tabs-right .nav-tabs .active > a:hover { border-color: #ddd #ddd #ddd transparent; *border-left-color: $white; -} \ No newline at end of file +}