_navs.sass in sass-rails-bootstrap-2.0.3a

- old
+ new

@@ -17,10 +17,14 @@
 
 .nav > li > a:hover
   text-decoration: none
   background-color: $grayLighter
   
+// Redeclare pull classes because of specifity
+.nav > .pull-right
+  float: right
+  
 // Nav headers (for dropdowns and lists)
 .nav .nav-header
   display: block
   padding: 3px 15px
   font-size: 11px
@@ -209,18 +213,18 @@
 
 // Open dropdowns
 // -------------------------
 .nav-tabs .open .dropdown-toggle,
 .nav-pills .open .dropdown-toggle,
-.nav > .open.active > a:hover
+.nav > li.dropdown.open.active > a:hover
   color: $white
   background-color: $grayLight
   border-color: $grayLight
 
-.nav .open .caret,
-.nav .open.active .caret,
-.nav .open a:hover .caret
+.nav li.dropdown.open .caret,
+.nav li.dropdown.open.active .caret,
+.nav li.dropdown.open a:hover .caret
   border-top-color: $white
   border-bottom-color: $white
   +opacity(100)
 
 // Dropdowns in stacked tabs
@@ -239,17 +243,16 @@
 // Clear any floats
 .tabbable
   +clearfix
   
 .tab-content
-  display: table  // prevent content from running below tabs
-  width: 100%
+  overflow: auto
 
 // Remove border on bottom, left, right
-.tabs-below .nav-tabs,
-.tabs-right .nav-tabs,
-.tabs-left .nav-tabs
+.tabs-below > .nav-tabs,
+.tabs-right > .nav-tabs,
+.tabs-left > .nav-tabs
   border-bottom: 0
 
 // Show/hide tabbable areas
 .tab-content > .tab-pane,
 .pill-content > .pill-pane
@@ -262,71 +265,71 @@
 
 
 // BOTTOM
 // ------
 
-.tabs-below .nav-tabs
+.tabs-below > .nav-tabs
   border-top: 1px solid #ddd
 
-.tabs-below .nav-tabs > li
+.tabs-below > .nav-tabs > li
   margin-top: -1px
   margin-bottom: 0
 
-.tabs-below .nav-tabs > li > a
+.tabs-below > .nav-tabs > li > a
   +border-radius(0 0 4px 4px)
   &:hover
     border-bottom-color: transparent
     border-top-color: #ddd
     
-.tabs-below .nav-tabs .active > a,
-.tabs-below .nav-tabs .active > a:hover
+.tabs-below > .nav-tabs > .active > a,
+.tabs-below > .nav-tabs > .active > a:hover
   border-color: transparent #ddd #ddd #ddd
 
 // LEFT & RIGHT
 // ------------
 
 // Common styles
-.tabs-left .nav-tabs > li,
-.tabs-right .nav-tabs > li
+.tabs-left > .nav-tabs > li,
+.tabs-right > .nav-tabs > li
   float: none
 
-.tabs-left .nav-tabs > li > a,
-.tabs-right .nav-tabs > li > a
+.tabs-left > .nav-tabs > li > a,
+.tabs-right > .nav-tabs > li > a
   min-width: 74px
   margin-right: 0
   margin-bottom: 3px
 
 // Tabs on the left
-.tabs-left .nav-tabs
+.tabs-left > .nav-tabs
   float: left
   margin-right: 19px
   border-right: 1px solid #ddd
 
-.tabs-left .nav-tabs > li > a
+.tabs-left > .nav-tabs > li > a
   margin-right: -1px
   +border-radius(4px 0 0 4px)
 
-.tabs-left .nav-tabs > li > a:hover
+.tabs-left > .nav-tabs > li > a:hover
   border-color: $grayLighter #ddd $grayLighter $grayLighter
 
-.tabs-left .nav-tabs .active > a,
-.tabs-left .nav-tabs .active > a:hover
+.tabs-left > .nav-tabs .active > a,
+.tabs-left > .nav-tabs .active > a:hover
   border-color: #ddd transparent #ddd #ddd
   *border-right-color: $white
 
 // Tabs on the right
-.tabs-right .nav-tabs
+.tabs-right > .nav-tabs
   float: right
   margin-left: 19px
   border-left: 1px solid #ddd
 
-.tabs-right .nav-tabs > li > a
+.tabs-right > .nav-tabs > li > a
   margin-left: -1px
   +border-radius(0 4px 4px 0)
 
-.tabs-right .nav-tabs > li > a:hover
+.tabs-right > .nav-tabs > li > a:hover
   border-color: $grayLighter $grayLighter $grayLighter #ddd
 
-.tabs-right .nav-tabs .active > a,
-.tabs-right .nav-tabs .active > a:hover
+.tabs-right > .nav-tabs .active > a,
+.tabs-right > .nav-tabs .active > a:hover
   border-color: #ddd #ddd #ddd transparent
   *border-left-color: $white