sass-rails-bootstrap 2.0.2 → 2.0.3a

data/vendor/assets/stylesheets/twitter/_bootstrap.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v2.0.1
+ * Bootstrap v2.0.3
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
@@ -8,7 +8,7 @@
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
  */
 
-// NOTE: This file has to be in SCSS rather than SASS format because of an apparent bug
+// NOTE: This file's format has to be SCSS rather than SASS because of an apparent bug
 // with variable visibility when importing.
 
 // Core variables and mixins
@@ -55,8 +55,7 @@
 
 // Components: Misc
 @import "bootstrap/thumbnails";
-@import "bootstrap/labels";
-@import "bootstrap/badges";
+@import "bootstrap/labels-badges";
 @import "bootstrap/progress-bars";
 @import "bootstrap/accordion";
 @import "bootstrap/carousel";

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

@@ -20,6 +20,11 @@
   padding: 8px 15px
 
 
+// General toggle styles
+.accordion-toggle
+  cursor: pointer
+
+
 // Inner needs the styles because you can't animate properly with any styles on the element
 .accordion-inner
   padding: 9px 15px

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

@@ -21,14 +21,14 @@
     +ie7-inline-block
 
 // Float them, remove border radius, then re-add to first and last elements
-.btn-group .btn
+.btn-group > .btn
   position: relative
   float: left
   margin-left: -1px
   +border-radius(0)
   
 // 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
+.btn-group > .btn:first-child
   margin-left: 0
   -webkit-border-top-left-radius: 4px
   -moz-border-radius-topleft: 4px
@@ -37,8 +37,9 @@
   -moz-border-radius-bottomleft: 4px
   border-bottom-left-radius: 4px
 
-.btn-group .btn:last-child,
-.btn-group .dropdown-toggle
+// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle
   -webkit-border-top-right-radius: 4px
   -moz-border-radius-topright: 4px
   border-top-right-radius: 4px
@@ -47,7 +48,7 @@
   border-bottom-right-radius: 4px
   
 // Reset corners for large buttons
-.btn-group .btn.large:first-child
+.btn-group > .btn.large:first-child
   margin-left: 0
   -webkit-border-top-left-radius: 6px
   -moz-border-radius-topleft: 6px
@@ -56,8 +57,8 @@
   -moz-border-radius-bottomleft: 6px
   border-bottom-left-radius: 6px
 
-.btn-group .btn.large:last-child,
-.btn-group .large.dropdown-toggle
+.btn-group > .btn.large:last-child,
+.btn-group > .large.dropdown-toggle
   -webkit-border-top-right-radius: 6px
   -moz-border-radius-topright: 6px
   border-top-right-radius: 6px
@@ -66,10 +67,10 @@
   border-bottom-right-radius: 6px
 
 // On hover/focus/active, bring the proper btn to front
-.btn-group .btn:hover,
-.btn-group .btn:focus,
-.btn-group .btn:active,
-.btn-group .btn.active
+.btn-group > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group > .btn:active,
+.btn-group > .btn.active
   z-index: 2
 
 // On active and open, don't show outline
@@ -83,41 +84,56 @@
 // ----------------------
 
 // Give the line between buttons some depth
-.btn-group .dropdown-toggle
+.btn-group > .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: 3px
-  *padding-bottom: 3px
+  *padding-top: 4px
+  *padding-bottom: 4px
   
-.btn-group .btn-mini.dropdown-toggle
-  padding-left: 1px
-  padding-right: 1px
+.btn-group > .btn-mini.dropdown-toggle
+  padding-left: 5px
+  padding-right: 5px
   
-.btn-group .btn-small.dropdown-toggle
-  padding-left: 4px
-  padding-right: 4px
+.btn-group > .btn-small.dropdown-toggle
+  *padding-top: 4px
+  *padding-bottom: 4px
   
-.btn-group .btn-large.dropdown-toggle
+.btn-group > .btn-large.dropdown-toggle
   padding-left: 12px
   padding-right: 12px
 
 .btn-group.open
-  // IE7's z-index only goes to the nearest positioned ancestor, which would
-  // make the menu appear below buttons that appeared later on the page
-  *z-index: $zindexDropdown
-
-  // Reposition menu on open and round all corners
-  .dropdown-menu
-    display: block
-    margin-top: 1px
-    +border-radius(5px)
-
+  // The clickable button for toggling the menu
+  // Remove the gradient and set the same inset shadow as the :active state
   .dropdown-toggle
     background-image: none
-    $shadow: inset 0 1px 6px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)
+    $shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05)
     +box-shadow($shadow)
+    
+  // Keep the hover's background when dropdown is open
+  .btn.dropdown-toggle
+    background-color: $btnBackgroundHighlight
+    
+  .btn-primary.dropdown-toggle
+    background-color: $btnPrimaryBackgroundHighlight
+    
+  .btn-warning.dropdown-toggle
+    background-color: $btnWarningBackgroundHighlight
+    
+  .btn-danger.dropdown-toggle
+    background-color: $btnDangerBackgroundHighlight
+    
+  .btn-success.dropdown-toggle
+    background-color: $btnSuccessBackgroundHighlight
+    
+  .btn-info.dropdown-toggle
+    background-color: $btnInfoBackgroundHighlight
+    
+  .btn-inverse.dropdown-toggle
+    background-color: $btnInverseBackgroundHighlight
+    
 
 // Reposition the caret
 .btn .caret
@@ -137,9 +153,14 @@
 
 .btn-large .caret
   margin-top: 6px
-  border-left:  5px solid transparent
-  border-right: 5px solid transparent
-  border-top:   5px solid $black
+  border-left-width:  5px
+  border-right-width: 5px
+  border-top-width:   5px
+  
+// Upside down carets for .dropup
+.dropup .btn-large .caret
+  border-bottom: 5px solid $black
+  border-top: 0
 
 // Account for other colors
 .btn-primary,

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

@@ -10,28 +10,30 @@
   display: inline-block
   +ie7-inline-block
   padding: 4px 10px 4px
+  margin-bottom: 0  // For input.btn
   font-size: $baseFontSize
   line-height: $baseLineHeight
+  *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)
   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)
   +box-shadow($shadow)
-  cursor: pointer
-  
-  // Give IE7 some love
-  +reset-filter
-  +ie7-restore-left-whitespace
 
 // 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
@@ -44,19 +46,19 @@
 // Active state
 .btn.active,
 .btn:active
-  background-image: none
-  $shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)
-  +box-shadow($shadow)
   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-image: none
   background-color: darken($white, 10%)
+  background-image: none
   +opacity(65)
   +box-shadow(none)
 
@@ -104,8 +106,8 @@
 .btn-info:hover,
 .btn-inverse,
 .btn-inverse:hover
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25)
   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,
@@ -118,6 +120,10 @@
     
 // Set the backgrounds
 // -------------------------
+.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)
 .btn-primary
   +button-background($btnPrimaryBackground, $btnPrimaryBackgroundHighlight)
 // Warning appears as orange

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

@@ -12,5 +12,15 @@
   &:hover
     color: $black
     text-decoration: none
-    +opacity(40)
     cursor: pointer
+    +opacity(40)
+    
+// Additional properties for button version
+// iOS requires the button element instead of an anchor tag.
+// If you want the anchor version, it requires `href="#"`.
+button.close
+  padding: 0
+  cursor: pointer
+  background: transparent
+  border: 0
+  -webkit-appearance: none

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

@@ -24,14 +24,14 @@ pre
   margin: 0 0 $baseLineHeight / 2
   font-size: $baseFontSize * 0.925  // 13px to 12px
   line-height: $baseLineHeight
+  word-break: break-all
+  word-wrap: break-word
+  white-space: pre
+  white-space: pre-wrap
   background-color: #f5f5f5
   border: 1px solid #ccc  // fallback for IE7-8
   border: 1px solid rgba(0, 0, 0, 0.15)
   +border-radius(4px)
-  white-space: pre
-  white-space: pre-wrap
-  word-break: break-all
-  word-wrap: break-word
 
   // Make prettyprint styles more spaced out for readability
   &.prettyprint

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

@@ -2,15 +2,15 @@
 // --------------------
 
 .fade
+  +opacity(0)
   +transition(opacity .15s linear)
-  opacity: 0
   &.in
-    opacity: 1
+    +opacity(1)
 
 .collapse
-  +transition(height .35s ease)
   position: relative
-  overflow: hidden
   height: 0
+  overflow: hidden
+  +transition(height .35s ease)
   &.in
     height: auto

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

@@ -2,6 +2,7 @@
 // --------------
 
 // Use the .menu class on any <li> element within the topbar or ul.tabs and you'll get some superfancy dropdowns
+.dropup,
 .dropdown
   position: relative
   
@@ -19,11 +20,11 @@
   width: 0
   height: 0
   vertical-align: top
-  border-left:  4px solid transparent
-  border-right: 4px solid transparent
   border-top:   4px solid $black
-  +opacity(30)
+  border-right: 4px solid transparent
+  border-left:  4px solid transparent
   content: ""
+  +opacity(30)
   
 // Place the caret
 .dropdown .caret
@@ -31,7 +32,7 @@
   margin-left: 2px
   
 .dropdown:hover .caret,
-.open.dropdown .caret
+.open .caret
   +opacity(100)
   
 // The dropdown menu (ul)
@@ -41,25 +42,23 @@
   top: 100%
   left: 0
   z-index: $zindexDropdown
-  float: left
   display: none  // none by default, but block on "open" of the menu
+  float: left
   min-width: 160px
   max-width: 220px
   padding: 4px 0
-  margin: 0  // override default ul
+  margin: 1px 0 0  // override default ul
   list-style: none
   background-color: $dropdownBackground
-  border-color: #ccc
-  border-color: rgba(0,0,0,.2)
-  border-style: solid
-  border-width: 1px
-  +border-radius(0 0 5px 5px)
+  border: 1px solid #ccc
+  border: 1px solid rgba(0, 0, 0, 0.2)
+  *border-right-width: 2px
+  *border-bottom-width: 2px
+  +border-radius(5px)
   +box-shadow(0 5px 10px rgba(0,0,0,.2))
   -webkit-background-clip: padding-box
   -moz-background-clip: padding
   background-clip: padding-box
-  *border-right-width: 2px
-  *border-bottom-width: 2px
 
   // Aligns the dropdown menu to right
   &.pull-right
@@ -91,21 +90,18 @@
 
 // Open state for the dropdown
 // ---------------------------
-.dropdown.open
+.open
   // IE7's z-index only goes to the nearest positioned ancestor, which would
   // make the menu appear below buttons that appeared later on the page
   *z-index: $zindexDropdown
-  .dropdown-toggle
-    color: $white
-    background: #ccc
-    background: rgba(0,0,0,.3)
   .dropdown-menu
     display: block
     
 // Right aligned dropdowns
+// ---------------------------
 .pull-right .dropdown-menu
-  left: auto
   right: 0
+  left: auto
   
 // Allow for dropdowns to go bottom up (aka, dropup-menu)
 // ------------------------------------------------------

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

@@ -63,8 +63,9 @@ select,
   font-size: $baseFontSize
   line-height: $baseLineHeight
   color: $gray
+  background-color: $inputBackground
   border: 1px solid $inputBorder
-  +border-radius(3px)
+  +border-radius($inputBorderRadius)
   
 .uneditable-textarea
   width: auto
@@ -87,8 +88,9 @@ input[type="radio"]
   *margin-top: 0  // IE7
   line-height: normal
   cursor: pointer
-  +border-radius(0)
+  background-color: transparent
   border: 0 \9  // IE9 and down
+  +border-radius(0)
   
 input[type="image"]
   border: 0
@@ -97,9 +99,9 @@ input[type="image"]
 input[type="file"]
   padding: initial
   line-height: initial
-  border: initial
   background-color: $inputBackground
   background-color: initial
+  border: initial
   +box-shadow(none)
 
 // Help out input buttons
@@ -150,6 +152,7 @@ input[type="hidden"]
 // Indent the labels to position radios/checkboxes as hanging
 .radio,
 .checkbox
+  min-height: 18px  // clear the floating input if there is no label text
   padding-left: 18px
 
 .radio input[type="radio"],
@@ -188,17 +191,17 @@ textarea
 input:focus,
 textarea:focus
   border-color: rgba(82,168,236,.8)
-  $shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)
-  +box-shadow($shadow)
   outline: 0
   outline: thin dotted \9  /* IE6-9 */
+  $shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)
+  +box-shadow($shadow)
 
 input[type="file"]:focus,
 input[type="radio"]:focus,
 input[type="checkbox"]:focus,
 select:focus
-  +box-shadow(none)  // override for file inputs
   +tab-focus
+  +box-shadow(none)  // override for file inputs
 
 
 
@@ -223,7 +226,12 @@ select:focus
 input[class*="span"],
 select[class*="span"],
 textarea[class*="span"],
-.uneditable-input
+.uneditable-input[class*="span"],
+// Redeclare since the fluid row class is more specific
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"]
   float: none
   margin-left: 0
 
@@ -246,9 +254,16 @@ textarea[disabled],
 input[readonly],
 select[readonly],
 textarea[readonly]
+  cursor: not-allowed
   background-color: $inputDisabledBackground
   border-color: #ddd
-  cursor: not-allowed
+
+// Explicitly reset the colors here
+input[type="radio"][disabled],
+input[type="checkbox"][disabled],
+input[type="radio"][readonly],
+input[type="checkbox"][readonly]
+  background-color: transparent
 
 
 
@@ -282,17 +297,19 @@ select:focus:required:invalid
   padding: ($baseLineHeight - 1) 20px $baseLineHeight
   margin-top: $baseLineHeight
   margin-bottom: $baseLineHeight
-  background-color: $grayLighter
+  background-color: $formActionsBackground
   border-top: 1px solid #ddd
-  +clearfix
+  +clearfix  // Adding clearfix to allow for .pull-right button containers
 
 // For text that needs to appear as an input but should not be an input
 .uneditable-input
+  white-space: nowrap
+  overflow: hidden  // prevent text from wrapping, but still cut it off like an input does
+  cursor: not-allowed
   display: block
   background-color: $inputBackground
   border-color: #eee
   +box-shadow(inset 0 1px 2px rgba(0,0,0,.025))
-  cursor: not-allowed
 
 // Placeholder text gets special styles; can't be bundled together though for some reason
 +placeholder($grayLight)
@@ -329,18 +346,21 @@ select:focus:required:invalid
   input,
   select,
   .uneditable-input
+    position: relative  // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness
+    margin-bottom: 0  // prevent bottom margin from screwing up alignment in stacked forms
     *margin-left: 0
-    +border-radius(0 3px 3px 0)
+    vertical-align: middle
+    +border-radius(0 $inputBorderRadius $inputBorderRadius 0)
+    // Make input on top when focused so blue border and shadow always show
     &:focus
-      position: relative
       z-index: 2
   .uneditable-input
     border-left-color: #ccc
   .add-on
     display: inline-block
     width: auto
-    min-width: 16px
     height: $baseLineHeight
+    min-width: 16px
     padding: 4px 5px
     font-weight: normal
     line-height: $baseLineHeight
@@ -351,7 +371,8 @@ select:focus:required:invalid
     border: 1px solid #ccc
   .add-on,
   .btn
-    +border-radius(3px 0 0 3px)
+    margin-left: -1px
+    +border-radius(0)
   .active
     background-color: lighten($green, 30)
     border-color: $green
@@ -360,19 +381,21 @@ select:focus:required:invalid
   .add-on,
   .btn
     margin-right: -1px
+  .add-on:first-child,
+  .btn:first-child
+    +border-radius($inputBorderRadius 0 0 $inputBorderRadius)
     
 .input-append
   input,
   select,
   .uneditable-input
-    +border-radius(3px 0 0 3px)
+    +border-radius($inputBorderRadius 0 0 $inputBorderRadius)
   .uneditable-input
-    border-left-color: #eee
     border-right-color: #ccc
-  .add-on,
-  .btn
-    margin-left: -1px
-    +border-radius(0 3px 3px 0)
+    border-left-color: #eee
+  .add-on:last-child,
+  .btn:last-child
+    +border-radius(0 $inputBorderRadius $inputBorderRadius 0)
     
 // Remove all border-radius for inputs with both prepend and append
 .input-prepend.input-append
@@ -383,11 +406,11 @@ select:focus:required:invalid
   .add-on:first-child,
   .btn:first-child
     margin-right: -1px
-    +border-radius(3px 0 0 3px)
+    +border-radius($inputBorderRadius 0 0 $inputBorderRadius)
   .add-on:last-child,
   .btn:last-child
     margin-left: -1px
-    +border-radius(0 3px 3px 0)
+    +border-radius(0 $inputBorderRadius $inputBorderRadius 0)
 
 
 
@@ -395,8 +418,10 @@ select:focus:required:invalid
 // -----------
 
 .search-query
-  padding-left: 14px
   padding-right: 14px
+  padding-right: 4px \9
+  padding-left: 14px
+  padding-left: 4px \9  /* IE7-8 doesn't have border-radius, so don't indent the padding */
   margin-bottom: 0  // remove the default margin on all inputs
   +border-radius(14px)
 
@@ -419,6 +444,7 @@ select:focus:required:invalid
   .input-prepend,
   .input-append
     display: inline-block
+    +ie7-inline-block
     margin-bottom: 0
   // Re-hide hidden elements due to specifity
   .hide
@@ -450,8 +476,8 @@ select:focus:required:invalid
 .form-inline .radio input[type="radio"],
 .form-inline .checkbox input[type="checkbox"]
   float: left
-  margin-left: 0
   margin-right: 3px
+  margin-left: 0
 
 // Margin to space out fieldsets
 .control-group
@@ -479,11 +505,15 @@ legend + .control-group
     text-align: right
   // Move over all input controls and content
   .controls
-    margin-left: 160px
-    // Super jank IE7 fix to ensure the inputs in .input-append and input-prepend don't inherit the margin of the parent, in this case .controls
+    // Super jank IE7 fix to ensure the inputs in .input-append and input-prepend
+    // don't inherit the margin of the parent, in this case .controls
     *display: inline-block
-    *margin-left: 0
     *padding-left: 20px
+    margin-left: 160px
+    *margin-left: 0
+    &:first-child
+      *padding-left: 160px
+  // Remove bottom margin on block level help text since that's accounted for on .control-group
   .help-block
     margin-top: $baseLineHeight / 2
     margin-bottom: 0