sass-rails-bootstrap 2.0.4 → 2.1.0

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

@@ -1,5 +1,6 @@
-// Base styles for various input types, form layouts, and states
-// -------------------------------------------------------------
+//
+// Forms
+// --------------------------------------------------
 
 
 // GENERAL STYLES
@@ -19,7 +20,7 @@ legend
   display: block
   width: 100%
   padding: 0
-  margin-bottom: $baseLineHeight * 1.5
+  margin-bottom: $baseLineHeight
   font-size: $baseFontSize * 1.5
   line-height: $baseLineHeight * 2
   color: $grayDark
@@ -72,11 +73,12 @@ input[type="color"],
 .uneditable-input
   display: inline-block
   height: $baseLineHeight
-  padding: 4px
+  padding: 4px 6px
   margin-bottom: 9px
   font-size: $baseFontSize
   line-height: $baseLineHeight
   color: $gray
+  +border-radius($inputBorderRadius)
   
 // Reset appearance properties for textual inputs and textarea
 // Declare width for legacy (can't be on input[type=*] selectors or it's too specific)
@@ -105,7 +107,6 @@ input[type="color"],
 .uneditable-input
   background-color: $inputBackground
   border: 1px solid $inputBorder
-  +border-radius($inputBorderRadius)
   +box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.075))
   $transition: border linear 0.2s, box-shadow linear 0.2s
   +transition($transition)
@@ -121,12 +122,14 @@ input[type="color"],
 //Position radios and checkboxes better
 input[type="radio"],
 input[type="checkbox"]
-  margin: 3px 0
+  margin: 4px 0 0
   *margin-top: 0  /* IE7 */
+  margin-top: 1px \9  /* IE8-9 */
   line-height: normal
   cursor: pointer
   
 // Reset width of input buttons, radios, checkboxes
+input[type="file"],
 input[type="submit"],
 input[type="reset"],
 input[type="button"],
@@ -134,22 +137,18 @@ input[type="radio"],
 input[type="checkbox"]
   width: auto  // Override of generic input selector
 
-// Make uneditable textareas behave like a textarea
-.uneditable-textarea
-  width: auto
-  height: auto
-
 // Set the height of select and file controls to match text inputs
 select,
 input[type="file"]
-  height: 28px  /* In IE7, the height of the select element cannot be changed by height, only font-size */
+  height: 30px  /* In IE7, the height of the select element cannot be changed by height, only font-size */
   *margin-top: 4px  /* For IE7, add top margin to align select with labels */
-  line-height: 28px
+  line-height: 30px
   
 // Make select elements obey height by applying a border
 select
   width: 220px  // default input width + 10px of padding that doesn't get applied
   border: 1px solid #bbb
+  background-color: $inputBackground  // Chrome on Linux and Mobile Safari need background-color
   
 // Make multiple select elements height not fixed
 select[multiple],
@@ -164,6 +163,37 @@ input[type="checkbox"]:focus
   +tab-focus
 
 
+// Uneditable inputs
+// -------------------------
+
+// Make uneditable inputs look inactive
+.uneditable-input,
+.uneditable-textarea
+  color: $grayLight
+  background-color: darken($inputBackground, 1%)
+  border-color: $inputBorder
+  +box-shadow(inset 0 1px 2px rgba(0,0,0,.025))
+  cursor: not-allowed
+
+// For text that needs to appear as an input but should not be an input
+.uneditable-input
+  overflow: hidden  // prevent text from wrapping, but still cut it off like an input does
+  white-space: nowrap
+
+// Make uneditable textareas behave like a textarea
+.uneditable-textarea
+  width: auto
+  height: auto
+
+
+// Placeholder
+// -------------------------
+
+// Placeholder text gets special styles; can't be bundled together though for some reason
+input,
+textarea
+  +placeholder
+
 
 // CHECKBOXES & RADIOS
 // -------------------
@@ -232,6 +262,10 @@ textarea[class*="span"],
 .input-append .uneditable-input[class*="span"],
 .input-prepend input[class*="span"],
 .input-prepend .uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"],
 .row-fluid .input-prepend [class*="span"],
 .row-fluid .input-append [class*="span"]
   display: inline-block
@@ -241,8 +275,16 @@ textarea[class*="span"],
 // GRID SIZING FOR INPUTS
 // ----------------------
 
+// Grid sizes
 +input-grid-generate($gridColumnWidth, $gridGutterWidth)
 
+// Control row for multiple inputs per line
+.controls-row
+  +clearfix  // Clear the float from controls
+
+.controls-row [class*="span"]
+  float: left  // Float to collapse white-space for proper grid alignment
+
 
 
 // DISABLED STATE
@@ -257,7 +299,6 @@ select[readonly],
 textarea[readonly]
   cursor: not-allowed
   background-color: $inputDisabledBackground
-  border-color: #ddd
 
 // Explicitly reset the colors here
 input[type="radio"][disabled],
@@ -302,19 +343,6 @@ select:focus:required:invalid
   border-top: 1px solid #e5e5e5
   +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))
-
-// Placeholder text gets special styles; can't be bundled together though for some reason
-+placeholder()
-
 
 
 // HELP TEXT
@@ -322,7 +350,7 @@ select:focus:required:invalid
 
 .help-block,
 .help-inline
-  color: $gray  // lighten the text some for contrast
+  color: lighten($textColor, 15%)  // lighten the text some for contrast
   
 
 .help-block
@@ -341,38 +369,40 @@ select:focus:required:invalid
 // ------------
 
 // Allow us to put symbols and text within the input field for a cleaner look
-.input-prepend,
-.input-append
+.input-append,
+.input-prepend
   margin-bottom: 5px
+  font-size: 0
+  white-space: nowrap  // Prevent span and input from separating
   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
-    vertical-align: middle
+    font-size: $baseFontSize
+    vertical-align: top
     +border-radius(0 $inputBorderRadius $inputBorderRadius 0)
     // Make input on top when focused so blue border and shadow always show
     &:focus
       z-index: 2
-  .uneditable-input
-    border-left-color: #ccc
   .add-on
     display: inline-block
     width: auto
     height: $baseLineHeight
     min-width: 16px
     padding: 4px 5px
+    font-size: $baseFontSize
     font-weight: normal
     line-height: $baseLineHeight
     text-align: center
     text-shadow: 0 1px 0 $white
-    vertical-align: middle
     background-color: $grayLighter
     border: 1px solid #ccc
   .add-on,
   .btn
     margin-left: -1px
+    vertical-align: top
     +border-radius(0)
   .active
     background-color: lighten($green, 30)
@@ -391,9 +421,6 @@ select:focus:required:invalid
   select,
   .uneditable-input
     +border-radius($inputBorderRadius 0 0 $inputBorderRadius)
-  .uneditable-input
-    border-right-color: #ccc
-    border-left-color: #eee
   .add-on:last-child,
   .btn:last-child
     +border-radius(0 $inputBorderRadius $inputBorderRadius 0)
@@ -418,13 +445,26 @@ select:focus:required:invalid
 // SEARCH FORM
 // -----------
 
-.search-query
+input.search-query
   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)
+  margin-bottom: 0  // Remove the default margin on all inputs
+  +border-radius(15px)
+
+// Allow for input prepend/append in search forms
+.form-search .input-append .search-query,
+.form-search .input-prepend .search-query
+  +border-radius(0)  // Override due to specificity
+.form-search .input-append .search-query
+  +border-radius(14px 0 0 14px)
+.form-search .input-append .btn
+  +border-radius(0 14px 14px 0)
+.form-search .input-prepend .search-query
+  +border-radius(0 14px 14px 0)
+.form-search .input-prepend .btn
+  +border-radius(14px 0 0 14px)
 
 
 
@@ -447,12 +487,15 @@ select:focus:required:invalid
     display: inline-block
     +ie7-inline-block
     margin-bottom: 0
+    vertical-align: middle
   // Re-hide hidden elements due to specifity
   .hide
     display: none
     
 .form-search label,
-.form-inline label
+.form-inline label,
+.form-search .btn-group,
+.form-inline .btn-group
   display: inline-block
 
 // Remove margin for input-prepend/-append

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

@@ -1,8 +1,19 @@
-// GRID SYSTEM
-// -----------
+//
+// Grid system
+// --------------------------------------------------
+
 
 // Fixed (940px)
 +core-grid-generate($gridColumnWidth, $gridGutterWidth)
 
 // Fluid (940px)
 +fluid-grid-generate($fluidGridColumnWidth, $fluidGridGutterWidth)
+
+// Reset utility classes due to specificity
+[class*="span"].hide,
+.row-fluid [class*="span"].hide
+  display: none
+
+[class*="span"].pull-right,
+.row-fluid [class*="span"].pull-right
+  float: right

data/vendor/assets/stylesheets/twitter/bootstrap/_hero-unit.sass

@@ -1,5 +1,7 @@
-// HERO UNIT
-// ---------
+//
+// Hero unit
+// --------------------------------------------------
+
 
 .hero-unit
   padding: 60px

data/vendor/assets/stylesheets/twitter/bootstrap/_labels-badges.sass

@@ -1,5 +1,7 @@
-// LABELS & BADGES
-// ---------------
+//
+// Labels and badges
+// --------------------------------------------------
+
 
 // Base classes
 .label,
@@ -75,3 +77,14 @@ a
 .label-inverse[href],
 .badge-inverse[href]
   background-color: darken($grayDark, 10%)
+
+// Quick fix for labels/badges in buttons
+.btn
+  .label,
+  .badge
+    position: relative
+    top: -1px
+.btn-mini
+  .label,
+  .badge
+    top: 0

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

@@ -1,5 +1,6 @@
-// Fixed-width and fluid (with sidebar) layouts
-// --------------------------------------------
+//
+// Layouts
+// --------------------------------------------------
 
 
 // Container (centered, fixed-width layouts)