sass-rails-bootstrap 2.0.4 → 2.1.0

data/vendor/assets/stylesheets/twitter/bootstrap/_button-groups.sass

@@ -1,11 +1,13 @@
-// BUTTON GROUPS
-// -------------
+//
+// Button groups
+// --------------------------------------------------
 
 
 // Make the div behave like a button
 .btn-group
   position: relative
-  +clearfix  // clears the floated buttons
+  font-size: 0  // remove as part 1 of font-size inline-block hack
+  white-space: nowrap  // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
   +ie7-restore-left-whitespace
 
 // Space out series of button groups
@@ -14,18 +16,37 @@
 
 // Optional: Group multiple button groups together for a toolbar
 .btn-toolbar
+  font-size: 0  // Hack to remove whitespace that results from using inline-block
   margin-top: $baseLineHeight / 2
   margin-bottom: $baseLineHeight / 2
   .btn-group
     display: inline-block
     +ie7-inline-block
+  .btn + .btn,
+  .btn-group + .btn,
+  .btn + .btn-group
+    margin-left: 5px
 
 // Float them, remove border radius, then re-add to first and last elements
 .btn-group > .btn
   position: relative
-  float: left
-  margin-left: -1px
   +border-radius(0)
+
+.btn-group > .btn + .btn
+  margin-left: -1px
+
+.btn-group > .btn,
+.btn-group > .dropdown-menu
+  font-size: $baseFontSize  // redeclare as part 2 of font-size inline-block hack
+
+// Reset fonts for other sizes
+.btn-group > .btn-mini
+  font-size: 11px
+.btn-group > .btn-small
+  font-size: 12px
+
+.btn-group > .btn-large
+  font-size: 16px
   
 // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
 .btn-group > .btn:first-child
@@ -84,25 +105,29 @@
 // ----------------------
 
 // Give the line between buttons some depth
-.btn-group > .dropdown-toggle
+.btn-group > .btn + .dropdown-toggle
   padding-left: 8px
   padding-right: 8px
   $shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)
   +box-shadow($shadow)
-  *padding-top: 4px
-  *padding-bottom: 4px
+  *padding-top: 5px
+  *padding-bottom: 5px
   
-.btn-group > .btn-mini.dropdown-toggle
+.btn-group > .btn-mini + .dropdown-toggle
   padding-left: 5px
   padding-right: 5px
+  *padding-top: 2px
+  *padding-bottom: 2px
   
-.btn-group > .btn-small.dropdown-toggle
-  *padding-top: 4px
+.btn-group > .btn-small + .dropdown-toggle
+  *padding-top: 5px
   *padding-bottom: 4px
   
-.btn-group > .btn-large.dropdown-toggle
+.btn-group > .btn-large + .dropdown-toggle
   padding-left: 12px
   padding-right: 12px
+  *padding-top: 7px
+  *padding-bottom: 7px
 
 .btn-group.open
   // The clickable button for toggling the menu
@@ -137,22 +162,16 @@
 
 // Reposition the caret
 .btn .caret
-  margin-top: 7px
+  margin-top: 8px
   margin-left: 0
 
-.btn:hover .caret,
-.open.btn-group .caret
-  +opacity(100)
-
 // Carets in other button sizes
-.btn-mini .caret
-  margin-top: 5px
-  
-.btn-small .caret
+.btn-mini .caret,
+.btn-small .caret,
+.btn-large .caret
   margin-top: 6px
 
 .btn-large .caret
-  margin-top: 6px
   border-left-width:  5px
   border-right-width: 5px
   border-top-width:   5px
@@ -172,5 +191,34 @@
   .caret
     border-top-color: $white
     border-bottom-color: $white
-    +opacity(75)
 
+
+
+// Vertical button groups
+// ----------------------
+
+.btn-group-vertical
+  display: inline-block  // makes buttons only take up the width they need
+  +ie7-inline-block
+
+.btn-group-vertical .btn
+  display: block
+  float: none
+  width: 100%
+  +border-radius(0)
+
+.btn-group-vertical .btn + .btn
+  margin-left: 0
+  margin-top: -1px
+
+.btn-group-vertical .btn:first-child
+  +border-radius(4px 4px 0 0)
+
+.btn-group-vertical .btn:last-child
+  +border-radius(0 0 4px 4px)
+
+.btn-group-vertical .btn-large:first-child
+  +border-radius(6px 6px 0 0)
+
+.btn-group-vertical .btn-large:last-child
+  +border-radius(0 0 6px 6px)

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

@@ -1,5 +1,6 @@
-// BUTTON STYLES
-// -------------
+//
+// Button styles
+// --------------------------------------------------
 
 
 // Base styles
@@ -9,58 +10,56 @@
 .btn
   display: inline-block
   +ie7-inline-block
-  padding: 4px 10px 4px
+  padding: 4px 14px
   margin-bottom: 0  // For input.btn
-  font-size: $baseFontSize
-  line-height: $baseLineHeight
+  font-size: 13px
+  line-height: 20px
   *line-height: 20px
-  color: $grayDark
   text-align: center
-  text-shadow: 0 1px 1px rgba(255,255,255,.75)
   vertical-align: middle
   cursor: pointer
-  +button-background($btnBackground, $btnBackgroundHighlight)
+  +button-background($btnBackground, $btnBackgroundHighlight, $grayDark, 0 1px 1px rgba(255,255,255,.75))
   border: 1px solid $btnBorder
   *border: 0  // Remove the border to prevent IE7's black border on input:focus
   border-bottom-color: darken($btnBorder, 10%)
   +border-radius(4px)
   +ie7-restore-left-whitespace  // Give IE7 some love
-  $shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)
+  $shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 2px rgba(0,0,0,.05)
   +box-shadow($shadow)
 
-// Hover state
-.btn:hover
-  color: $grayDark
-  text-decoration: none
-  background-color: darken($white, 10%)
-  *background-color: darken($white, 15%)  /* Buttons in IE7 don't get borders, so darken on hover */
-  background-position: 0 -15px
-  // transition is only when going to hover, otherwise the background
-  // behind the gradient (there for IE<=9 fallback) gets mismatched
-  +transition(background-position .1s linear)
-
-// Focus state for keyboard and accessibility
-.btn:focus
-  +tab-focus
-
-// Active state
-.btn.active,
-.btn:active
-  background-color: darken($white, 10%)
-  background-color: darken($white, 15%) #{"\9"}
-  background-image: none
-  outline: 0
-  $shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)
-  +box-shadow($shadow)
-  
-// Disabled state
-.btn.disabled,
-.btn[disabled]
-  cursor: default
-  background-color: darken($white, 10%)
-  background-image: none
-  +opacity(65)
-  +box-shadow(none)
+  // Hover state
+  &:hover
+    color: $grayDark
+    text-decoration: none
+    background-color: darken($white, 10%)
+    *background-color: darken($white, 15%)  /* Buttons in IE7 don't get borders, so darken on hover */
+    background-position: 0 -15px
+    // transition is only when going to hover, otherwise the background
+    // behind the gradient (there for IE<=9 fallback) gets mismatched
+    +transition(background-position .1s linear)
+
+  // Focus state for keyboard and accessibility
+  &:focus
+    +tab-focus
+
+  // Active state
+  &.active,
+  &:active
+    background-color: darken($white, 10%)
+    background-color: darken($white, 15%) #{"\9"}
+    background-image: none
+    outline: 0
+    $shadow: inset 0 2px 4px rgba(0,0,0,.1), 0 1px 2px rgba(0,0,0,.05)
+    +box-shadow($shadow)
+    
+  // Disabled state
+  &.disabled,
+  &[disabled]
+    cursor: default
+    background-color: darken($white, 10%)
+    background-image: none
+    +opacity(65)
+    +box-shadow(none)
 
 // Button sizes
 // --------------------------------------------------
@@ -72,43 +71,36 @@
   line-height: normal
   +border-radius(5px)
   [class^="icon-"]
-    margin-top: 1px
+    margin-top: 2px
     
 // Small
 .btn-small
-  padding: 5px 9px
+  padding: 3px 9px
   font-size: $baseFontSize - 2px
   line-height: $baseLineHeight - 2px
   [class^="icon-"]
-    margin-top: -1px
+    margin-top: 0
     
 // Mini
 .btn-mini
   padding: 2px 6px
   font-size: $baseFontSize - 2px
   line-height: $baseLineHeight - 4px
+
+// Block button
+.btn-block
+  display: block
+  width: 100%
+  padding-left: 0
+  padding-right: 0
+  +box-sizing(border-box)
+.btn-block + .btn-block
+  margin-top: 5px
       
       
 // Alternate buttons
 // --------------------------------------------------
 
-// Set text color
-// -------------------------
-.btn-primary,
-.btn-primary:hover,
-.btn-warning,
-.btn-warning:hover,
-.btn-danger,
-.btn-danger:hover,
-.btn-success,
-.btn-success:hover,
-.btn-info,
-.btn-info:hover,
-.btn-inverse,
-.btn-inverse:hover
-  color: $white
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25)
-    
 // Provide *some* extra contrast for those who can get it
 .btn-primary.active,
 .btn-warning.active,
@@ -122,8 +114,8 @@
 // -------------------------
 .btn
   // reset here as of 2.0.3 due to Recess property order
-  border-color: #ccc
-  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25)
+  border-color: #c5c5c5
+  border-color: rgba(0,0,0,.15) rgba(0,0,0,.15) rgba(0,0,0,.25)
 .btn-primary
   +button-background($btnPrimaryBackground, $btnPrimaryBackgroundHighlight)
 // Warning appears as orange
@@ -154,8 +146,9 @@ input[type="submit"].btn
     border: 0
     
   // IE7 has some default padding on button controls
-  *padding-top: 2px
-  *padding-bottom: 2px
+  *padding-top: 3px
+  *padding-bottom: 3px
+
   &.btn-large
     *padding-top: 7px
     *padding-bottom: 7px
@@ -165,3 +158,25 @@ input[type="submit"].btn
   &.btn-mini
     *padding-top: 1px
     *padding-bottom: 1px
+
+
+// Link buttons
+// --------------------------------------------------
+
+// Make a button look and behave like a link
+.btn-link,
+.btn-link:active
+  background-color: transparent
+  background-image: none
+  +box-shadow(none)
+
+.btn-link
+  border-color: transparent
+  cursor: pointer
+  color: $linkColor
+  +border-radius(0)
+
+.btn-link:hover
+  color: $linkColorHover
+  text-decoration: underline
+  background-color: transparent

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

@@ -1,5 +1,7 @@
-// CAROUSEL
-// --------
+//
+// Carousel
+// --------------------------------------------------
+
 
 .carousel
   position: relative
@@ -96,10 +98,17 @@
   left: 0
   right: 0
   bottom: 0
-  padding: 10px 15px 5px
+  padding: 15px
   background: $grayDark
   background: rgba(0,0,0,.75)
 
 .carousel-caption h4,
 .carousel-caption p
   color: $white
+  line-height: $baseLineHeight
+
+.carousel-caption h4
+  margin: 0 0 5px
+
+.carousel-caption p
+  margin-bottom: 0

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

@@ -1,5 +1,7 @@
-// CLOSE ICONS
-// -----------
+//
+// Close icons
+// --------------------------------------------------
+
 
 .close
   float: right

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

@@ -1,12 +1,14 @@
-// Code typography styles for the <code> and <pre> elements
-// --------------------------------------------------------
+//
+// Code (inline and block)
+// --------------------------------------------------
+
 
 // Inline and block code styles
 code,
 pre
   padding: 0 3px 2px
   +font-family-monospace
-  font-size: $baseFontSize - 1
+  font-size: $baseFontSize - 2
   color: $grayDark
   +border-radius(3px)
 
@@ -22,7 +24,7 @@ pre
   display: block
   padding: ($baseLineHeight - 1) / 2
   margin: 0 0 $baseLineHeight / 2
-  font-size: $baseFontSize * 0.925  // 13px to 12px
+  font-size: $baseFontSize - 1  // 14px to 13px
   line-height: $baseLineHeight
   word-break: break-all
   word-wrap: break-word

data/vendor/assets/stylesheets/twitter/bootstrap/_component-animations.sass

@@ -1,5 +1,7 @@
-// COMPONENT ANIMATIONS
-// --------------------
+//
+// Component animations
+// --------------------------------------------------
+
 
 .fade
   opacity: 0
@@ -11,6 +13,7 @@
   position: relative
   height: 0
   overflow: hidden
+  overflow: visible \9
   +transition(height .35s ease)
   &.in
     height: auto

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

@@ -1,5 +1,7 @@
-// DROPDOWN MENUS
-// --------------
+//
+// Dropdown menus
+// --------------------------------------------------
+
 
 // Use the .menu class on any <li> element within the topbar or ul.tabs and you'll get some superfancy dropdowns
 .dropup,
@@ -24,16 +26,12 @@
   border-right: 4px solid transparent
   border-left:  4px solid transparent
   content: ""
-  +opacity(30)
   
 // Place the caret
 .dropdown .caret
   margin-top: 8px
   margin-left: 2px
   
-.dropdown:hover .caret,
-.open .caret
-  +opacity(100)
   
 // The dropdown menu (ul)
 // ----------------------
@@ -46,15 +44,15 @@
   float: left
   min-width: 160px
   max-width: 220px
-  padding: 4px 0
-  margin: 1px 0 0  // override default ul
+  padding: 5px 0
+  margin: 2px 0 0  // override default ul
   list-style: none
   background-color: $dropdownBackground
-  border: 1px solid #ccc
-  border: 1px solid rgba(0, 0, 0, 0.2)
+  border: 1px solid #ccc  // Fallback for IE7-8
+  border: 1px solid $dropdownBorder
   *border-right-width: 2px
   *border-bottom-width: 2px
-  +border-radius(5px)
+  +border-radius(6px)
   +box-shadow(0 5px 10px rgba(0,0,0,.2))
   -webkit-background-clip: padding-box
   -moz-background-clip: padding
@@ -72,7 +70,7 @@
   // Links within the dropdown menu
   a
     display: block
-    padding: 3px 15px
+    padding: 3px 20px
     clear: both
     font-weight: normal
     line-height: $baseLineHeight
@@ -82,11 +80,34 @@
 // Hover state
 // -----------
 .dropdown-menu li > a:hover,
+.dropdown-menu li > a:focus,
+.dropdown-submenu:hover > a
+  text-decoration: none
+  color: $dropdownLinkColorHover
+  background-color: $dropdownLinkBackgroundHover
+
+// Active state
+// ------------
 .dropdown-menu .active > a,
 .dropdown-menu .active > a:hover
   color: $dropdownLinkColorHover
   text-decoration: none
-  background-color: $dropdownLinkBackgroundHover
+  outline: 0
+  background-color: $dropdownLinkBackgroundActive
+  +gradient-vertical($dropdownLinkBackgroundActive, darken($dropdownLinkBackgroundActive, 5%))
+
+// Disabled state
+// --------------
+// Gray out text and ensure the hover state remains gray
+.dropdown-menu .disabled > a,
+.dropdown-menu .disabled > a:hover
+  color: $grayLight
+
+// Nuke hover effects
+.dropdown-menu .disabled > a:hover
+  text-decoration: none
+  background-color: transparent
+  cursor: default
 
 // Open state for the dropdown
 // ---------------------------
@@ -120,7 +141,49 @@
     bottom: 100%
     margin-bottom: 1px
 
+// Sub menus
+// ---------------------------
+.dropdown-submenu
+  position: relative
+
+.dropdown-submenu > .dropdown-menu
+  top: 0
+  left: 100%
+  margin-top: -6px
+  margin-left: -1px
+  -webkit-border-radius: 0 6px 6px 6px
+  -moz-border-radius: 0 6px 6px 6px
+  border-radius: 0 6px 6px 6px
+
+.dropdown-submenu:hover .dropdown-menu
+  display: block
+
+.dropdown-submenu > a:after
+  display: block
+  content: " "
+  float: right
+  width: 0
+  height: 0
+  border-color: transparent
+  border-style: solid
+  border-width: 5px 0 5px 5px
+  border-left-color: darken($dropdownBackground, 20%)
+  margin-top: 5px
+  margin-right: -10px
+.dropdown-submenu:hover > a:after
+  border-left-color: $dropdownLinkColorHover
+
+
+// Tweak nav headers
+// -----------------
+// Increase padding from 15px to 20px on sides
+.dropdown .dropdown-menu .nav-header
+  padding-left: 20px
+  padding-right: 20px
+
+
 // Typeahead
+// ---------
 .typeahead
   margin-top: 2px  // give it some space to breathe
   +border-radius(4px)