sass-rails-bootstrap 2.0.4 → 2.1.0

data/vendor/assets/stylesheets/twitter/bootstrap/_navs.sass

@@ -1,6 +1,6 @@
-// NAVIGATIONS
-// -----------
-
+//
+// Navs
+// --------------------------------------------------
 
 
 // BASE CLASS
@@ -18,22 +18,22 @@
 .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
+.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, 0.5)
+  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
@@ -53,7 +53,7 @@
   margin-left:  -15px
   margin-right: -15px
   text-shadow: 0 1px 0 rgba(255,255,255,.5)
-  
+
 .nav-list > li > a
   padding: 3px 15px
 
@@ -63,10 +63,9 @@
   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
   +nav-divider
@@ -80,13 +79,18 @@
 .nav-tabs,
 .nav-pills
   +clearfix
-  > li
-    float: left
-    > a
-      padding-right: 12px
-      padding-left: 12px
-      margin-right: 2px
-      line-height: 14px  // keeps the overall height an even number
+
+.nav-tabs > li,
+.nav-pills > li
+  float: left
+
+.nav-tabs > li > a,
+.nav-pills > li > a
+  padding-right: 12px
+  padding-left: 12px
+  margin-right: 2px
+  line-height: 14px  // keeps the overall height an even number
+
 
 // TABS
 // ----
@@ -94,47 +98,48 @@
 // Give the tabs something to sit on
 .nav-tabs
   border-bottom: 1px solid #ddd
-  
-  // Make the list-items overlay the bottom border
-  > li
-    margin-bottom: -1px
-    
-    // Actual tabs (as links)
-    > a
-      padding-top: 8px
-      padding-bottom: 8px
-      line-height: $baseLineHeight
-      border: 1px solid transparent
-      +border-radius(4px 4px 0 0)
-      &:hover
-        border-color: $grayLighter $grayLighter #ddd
-        
-  // Active state, and it's :hover to override normal :hover
-  > .active > a,
-  > .active > a:hover
-    color: $gray
-    background-color: $white
-    border: 1px solid #ddd
-    border-bottom-color: transparent
-    cursor: default
+
+// Make the list-items overlay the bottom border
+.nav-tabs > li
+  margin-bottom: -1px
+
+// Actual tabs (as links)
+.nav-tabs > li > a
+  padding-top: 8px
+  padding-bottom: 8px
+  line-height: $baseLineHeight
+  border: 1px solid transparent
+  +border-radius(4px 4px 0 0)
+  &:hover
+    border-color: $grayLighter $grayLighter #ddd
+
+// Active state, and it's :hover to override normal :hover
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover
+  color: $gray
+  background-color: $white
+  border: 1px solid #ddd
+  border-bottom-color: transparent
+  cursor: default
+
+
 
 // PILLS
 // -----
 
 // Links rendered as pills
-.nav-pills
-  > li > a
-    padding-top: 8px
-    padding-bottom: 8px
-    margin-top: 2px
-    margin-bottom: 2px
-    +border-radius(5px)
-
-  // Active state
-  > .active > a,
-  > .active > a:hover
-    color: $white
-    background-color: $linkColor
+.nav-pills > li > a
+  padding-top: 8px
+  padding-bottom: 8px
+  margin-top: 2px
+  margin-bottom: 2px
+  +border-radius(5px)
+
+// Active state
+.nav-pills > .active > a,
+.nav-pills > .active > a:hover
+  color: $white
+  background-color: $linkColor
 
 
 
@@ -142,75 +147,85 @@
 // -----------
 
 // Stacked tabs and pills
-.nav-stacked
-  > li
-    float: none
-    > a
-      margin-right: 0  // no need for the gap between nav items
+.nav-stacked > li
+  float: none
+
+.nav-stacked > li > a
+  margin-right: 0  // no need for the gap between nav items
+
 
 // Tabs
-.tabs-stacked
+.nav-tabs.nav-stacked
   border-bottom: 0
-  > li > a
-    border: 1px solid #ddd
-    +border-radius(0)
-  > li:first-child > a
-    +border-radius(4px 4px 0 0)
-  > li:last-child > a
-    +border-radius(0 0 4px 4px)
-  > li > a:hover
-    border-color: #ddd
-    z-index: 2
+
+.nav-tabs.nav-stacked > li > a
+  border: 1px solid #ddd
+  +border-radius(0)
+
+.nav-tabs.nav-stacked > li:first-child > a
+  +border-top-radius(4px)
+
+.nav-tabs.nav-stacked > li:last-child > a
+  +border-bottom-radius(4px)
+
+.nav-tabs.nav-stacked > li > a:hover
+  border-color: #ddd
+  z-index: 2
 
 
 // Pills
-.pills-stacked
-  > li > a
-    margin-bottom: 3px
-  > li:last-child > a
-    margin-bottom: 1px  // decrease margin to match sizing of stacked tabs
+.nav-pills.nav-stacked > li > a
+  margin-bottom: 3px
+
+.nav-pills.nav-stacked > li:last-child > a
+  margin-bottom: 1px  // decrease margin to match sizing of stacked tabs
 
 
 
 // DROPDOWNS
 // ---------
 
-// Position the menu
-.nav-tabs .dropdown-menu,
-.nav-pills .dropdown-menu
-  margin-top: 1px
-  border-width: 1px
-  
+.nav-tabs .dropdown-menu
+  +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
-  +border-radius(4px)
+  +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
 // -------------------------
 .nav-tabs .open .dropdown-toggle,
@@ -227,6 +242,7 @@
   border-bottom-color: $white
   +opacity(100)
 
+
 // Dropdowns in stacked tabs
 .tabs-stacked .open > a:hover
   border-color: $grayLight
@@ -243,9 +259,10 @@
 // Clear any floats
 .tabbable
   +clearfix
-  
+
 .tab-content
-  overflow: auto
+  overflow: auto  // prevent content from running below tabs
+
 
 // Remove border on bottom, left, right
 .tabs-below > .nav-tabs,
@@ -263,7 +280,6 @@
   display: block
 
 
-
 // BOTTOM
 // ------
 
@@ -279,11 +295,12 @@
   &:hover
     border-bottom-color: transparent
     border-top-color: #ddd
-    
+
 .tabs-below > .nav-tabs > .active > a,
 .tabs-below > .nav-tabs > .active > a:hover
   border-color: transparent #ddd #ddd #ddd
 
+
 // LEFT & RIGHT
 // ------------
 
@@ -298,6 +315,7 @@
   margin-right: 0
   margin-bottom: 3px
 
+
 // Tabs on the left
 .tabs-left > .nav-tabs
   float: left
@@ -316,6 +334,7 @@
   border-color: #ddd transparent #ddd #ddd
   *border-right-color: $white
 
+
 // Tabs on the right
 .tabs-right > .nav-tabs
   float: right
@@ -333,3 +352,18 @@
 .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

data/vendor/assets/stylesheets/twitter/bootstrap/_pager.sass

@@ -1,9 +1,10 @@
-// PAGER
-// -----
+//
+// Pager pagination
+// --------------------------------------------------
+
 
 .pager
-  margin-left: 0
-  margin-bottom: $baseLineHeight
+  margin: $baseLineHeight 0
   list-style: none
   text-align: center
   +clearfix

data/vendor/assets/stylesheets/twitter/bootstrap/_pagination.sass

@@ -1,5 +1,7 @@
-// PAGINATION
-// ----------
+//
+// Pagination (multiple pages)
+// --------------------------------------------------
+
 
 .pagination
   height: $baseLineHeight * 2
@@ -13,17 +15,21 @@
   +box-shadow(0 1px 2px rgba(0,0,0,.05))
 .pagination li
   display: inline
-.pagination a
+.pagination a,
+.pagination span
   float: left
   padding: 0 14px
   line-height: $baseLineHeight * 2 - 2
   text-decoration: none
-  border: 1px solid #ddd
+  background-color: $paginationBackground
+  border: 1px solid $paginationBorder
   border-left-width: 0
 .pagination a:hover,
-.pagination .active a
+.pagination .active a,
+.pagination .active span
   background-color: #f5f5f5
-.pagination .active a
+.pagination .active a,
+.pagination .active span
   color: $grayLight
   cursor: default
 .pagination .disabled span,
@@ -32,10 +38,12 @@
   color: $grayLight
   background-color: transparent
   cursor: default
-.pagination li:first-child a
+.pagination li:first-child a,
+.pagination li:first-child span
   border-left-width: 1px
   +border-radius(3px 0 0 3px)
-.pagination li:last-child a
+.pagination li:last-child a,
+.pagination li:last-child span
   +border-radius(0 3px 3px 0)
 
 // Centered

data/vendor/assets/stylesheets/twitter/bootstrap/_popovers.sass

@@ -1,5 +1,7 @@
-// POPOVERS
-// --------
+//
+// Popovers
+// --------------------------------------------------
+
 
 .popover
   position: absolute
@@ -7,48 +9,100 @@
   left: 0
   z-index: $zindexPopover
   display: none
-  padding: 5px
+  width: 236px
+  padding: 1px
+  background-color: $popoverBackground
+  -webkit-background-clip: padding-box
+  -moz-background-clip: padding
+  background-clip: padding-box
+  border: 1px solid #ccc
+  border: 1px solid rgba(0,0,0,.2)
+  +border-radius(6px)
+  +box-shadow(0 5px 10px rgba(0,0,0,.2))
+
+  // Offset the popover to account for the popover arrow
   &.top
-    margin-top: -5px
+    margin-bottom: 10px
   &.right
-    margin-left: 5px
+    margin-left: 10px
   &.bottom
-    margin-top: 5px
-  &.left 
-    margin-left: -5px
-  &.top .arrow 
-    +popover-arrow-top
-  &.right .arrow
-    +popover-arrow-right
-  &.bottom .arrow
-    +popover-arrow-bottom
-  &.left .arrow
-    +popover-arrow-left
-  .arrow
-    position: absolute
-    width: 0
-    height: 0
-    
-.popover-inner
-  padding: 3px
-  width: 280px
-  overflow: hidden
-  background: $black  // has to be full background declaration for IE fallback
-  background: rgba(0,0,0,.8)
-  +border-radius(6px)
-  +box-shadow(0 3px 7px rgba(0,0,0,0.3))
+    margin-top: 10px
+  &.right
+    margin-left: 10px
 
 .popover-title
-  padding: 9px 15px
-  line-height: 1
-  background-color: #f5f5f5
-  border-bottom: 1px solid #eee
-  +border-radius(3px 3px 0 0)
+  margin: 0  // reset heading margin
+  padding: 8px 14px
+  font-size: 14px
+  font-weight: normal
+  line-height: 18px
+  background-color: $popoverTitleBackground
+  border-bottom: 1px solid darken($popoverTitleBackground, 5%)
+  +border-radius(5px 5px 0 0)
 
 .popover-content
-  padding: 14px
-  background-color: $white
-  +border-radius(0 0 3px 3px)
-  +background-clip(padding-box)
+  padding: 9px 14px
   p, ul, ol
     margin-bottom: 0
+
+// Arrows
+.popover .arrow,
+.popover .arrow:after
+  position: absolute
+  display: inline-block
+  width: 0
+  height: 0
+  border-color: transparent
+  border-style: solid
+.popover .arrow:after
+  content: ""
+  z-index: -1
+
+.popover
+  &.top .arrow
+    bottom: -$popoverArrowWidth
+    left: 50%
+    margin-left: -$popoverArrowWidth
+    border-width: $popoverArrowWidth $popoverArrowWidth 0
+    border-top-color: $popoverArrowColor
+    &:after
+      border-width: $popoverArrowOuterWidth $popoverArrowOuterWidth 0
+      border-top-color: $popoverArrowOuterColor
+      bottom: -1px
+      left: -$popoverArrowOuterWidth
+
+  &.right .arrow
+    top: 50%
+    left: -$popoverArrowWidth
+    margin-top: -$popoverArrowWidth
+    border-width: $popoverArrowWidth $popoverArrowWidth $popoverArrowWidth 0
+    border-right-color: $popoverArrowColor
+    &:after
+      border-width: $popoverArrowOuterWidth $popoverArrowOuterWidth $popoverArrowOuterWidth 0
+      border-right-color: $popoverArrowOuterColor
+      bottom: -$popoverArrowOuterWidth
+      left: -1px
+
+  &.bottom .arrow
+    top: -$popoverArrowWidth
+    left: 50%
+    margin-left: -$popoverArrowWidth
+    border-width: 0 $popoverArrowWidth $popoverArrowWidth
+    border-bottom-color: $popoverArrowColor
+    &:after
+      border-width: 0 $popoverArrowOuterWidth $popoverArrowOuterWidth
+      border-bottom-color: $popoverArrowOuterColor
+      top: -1px
+      left: -$popoverArrowOuterWidth
+
+  &.left .arrow
+    top: 50%
+    right: -$popoverArrowWidth
+    margin-top: -$popoverArrowWidth
+    border-width: $popoverArrowWidth 0 $popoverArrowWidth $popoverArrowWidth
+    border-left-color: $popoverArrowColor
+    &:after
+      border-width: $popoverArrowOuterWidth 0 $popoverArrowOuterWidth $popoverArrowOuterWidth
+      border-left-color: $popoverArrowOuterColor
+      bottom: -$popoverArrowOuterWidth
+      right: -1px

data/vendor/assets/stylesheets/twitter/bootstrap/_progress-bars.sass

@@ -1,5 +1,6 @@
-// PROGRESS BARS
-// -------------
+//
+// Progress bars
+// --------------------------------------------------
 
 
 // ANIMATIONS
@@ -48,8 +49,8 @@
 // Outer container
 .progress
   overflow: hidden
-  height: 18px
-  margin-bottom: 18px
+  height: $baseLineHeight
+  margin-bottom: $baseLineHeight
   +gradient-vertical(#f5f5f5, #f9f9f9)
   +box-shadow(inset 0 1px 2px rgba(0,0,0,.1))
   +border-radius(4px)
@@ -57,8 +58,9 @@
 // Bar of progress
 .progress .bar
   width: 0%
-  height: 18px
+  height: 100%
   color: $white
+  float: left
   font-size: 12px
   text-align: center
   text-shadow: 0 -1px 0 rgba(0,0,0,.25)
@@ -66,6 +68,9 @@
   +box-shadow(inset 0 -1px 0 rgba(0,0,0,.15))
   +box-sizing(border-box)
   +transition(width .6s ease)
+.progress .bar + .bar
+  $shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15)
+  +box-shadow($shadow)
 
 // Striped bars
 .progress-striped .bar
@@ -86,29 +91,29 @@
 // ------
 
 // Danger (red)
-.progress-danger .bar
+.progress-danger .bar, .progress .bar-danger
   +gradient-vertical(#ee5f5b, #c43c35)
   
-.progress-danger.progress-striped .bar
+.progress-danger.progress-striped .bar, .progress-striped .bar-danger
   +gradient-striped(#ee5f5b)
 
 // Success (green)
-.progress-success .bar
+.progress-success .bar, .progress .bar-success
   +gradient-vertical(#62c462, #57a957)
 
-.progress-success.progress-striped .bar
+.progress-success.progress-striped .bar, .progress-striped .bar-success
   +gradient-striped(#62c462)
 
 // Info (teal)
-.progress-info .bar
+.progress-info .bar, .progress .bar-info
   +gradient-vertical(#5bc0de, #339bb9)
 
-.progress-info.progress-striped .bar
+.progress-info.progress-striped .bar, .progress-striped .bar-info
   +gradient-striped(#5bc0de)
   
 // Warning (orange)
-.progress-warning .bar
+.progress-warning .bar, .progress .bar-warning
   +gradient-vertical(lighten($orange, 15%), $orange)
   
-.progress-warning.progress-striped .bar
+.progress-warning.progress-striped .bar, .progress-striped .bar-warning
   +gradient-striped(lighten($orange, 15%))

data/vendor/assets/stylesheets/twitter/bootstrap/_reset.sass

@@ -1,5 +1,8 @@
-// Adapted from Normalize.css http://github.com/necolas/normalize.css
-// ------------------------------------------------------------------------
+//
+// Reset
+// Adapted from http://github.com/necolas/normalize.css
+// --------------------------------------------------
+
 
 // Display in IE6-9 and FF3
 // -------------------------
@@ -67,6 +70,7 @@ sub
 
 img
   max-width: 100%  // Make images inherently responsive
+  height: auto  // Make images inherently responsive
   vertical-align: middle
   border: 0
   -ms-interpolation-mode: bicubic