sass-twitter-bootstrap 0.1.0 → 2.0.1

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

@@ -1,4 +1,4 @@
-// Forms
+// Forms.scss
 // Base styles for various input types, form layouts, and states
 // -------------------------------------------------------------
 
@@ -27,7 +27,7 @@ legend {
   line-height: $baseLineHeight * 2;
   color: $grayDark;
   border: 0;
-  border-bottom: 1px solid #e5e5e5;
+  border-bottom: 1px solid #eee;
 
   // Small
   small {
@@ -42,113 +42,83 @@ input,
 button,
 select,
 textarea {
-  @include font-shorthand($baseFontSize, normal, $baseLineHeight); // Set size, weight, line-height here
+  @include font-shorthand(); // Set size, weight, line-height here
 }
 input,
 button,
 select,
 textarea {
-  font-family: $baseFontFamily; // And only set font-family here for those that need it (note the missing label element)
+  @include font-family-sans-serif(); // And only set font-family here for those that need it (note the missing label element)
 }
 
 // Identify controls by their labels
 label {
   display: block;
   margin-bottom: 5px;
+  color: $grayDark;
 }
 
-// Form controls
-// -------------------------
-
-// Shared size and type resets
-select,
+// Inputs, Textareas, Selects
+input,
 textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
+select,
 .uneditable-input {
   display: inline-block;
+  width: 210px;
   height: $baseLineHeight;
   padding: 4px;
   margin-bottom: 9px;
   font-size: $baseFontSize;
   line-height: $baseLineHeight;
   color: $gray;
+  border: 1px solid #ccc;
+  @include border-radius(3px);
 }
-
-// Reset appearance properties for textual inputs and textarea
-// Declare width for legacy (can't be on input[type=*] selectors or it's too specific)
-input,
-textarea {
-  width: 210px;
-}
-// Reset height since textareas have rows
-textarea {
+.uneditable-textarea {
+  width: auto;
   height: auto;
 }
-// Everything else
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.uneditable-input {
-  background-color: $inputBackground;
-  border: 1px solid $inputBorder;
-  @include border-radius($inputBorderRadius);
-  @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
-  @include transition(#{border linear .2s, box-shadow linear .2s});
 
-  // Focus state
-  &:focus {
-    border-color: rgba(82,168,236,.8);
-    outline: 0;
-    outline: thin dotted \9; /* IE6-9 */
-    @include box-shadow(#{inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)});
-  }
+// Inputs within a label
+label input,
+label textarea,
+label select {
+  display: block;
 }
 
-// Position radios and checkboxes better
-input[type="radio"],
-input[type="checkbox"] {
+// Mini reset for unique input types
+input[type="image"],
+input[type="checkbox"],
+input[type="radio"] {
+  width: auto;
+  height: auto;
+  padding: 0;
   margin: 3px 0;
   *margin-top: 0; /* IE7 */
   line-height: normal;
   cursor: pointer;
+  @include border-radius(0);
+  border: 0 \9; /* IE9 and down */
+}
+input[type="image"] {
+  border: 0;
 }
 
-// Reset width of input buttons, radios, checkboxes
-input[type="submit"],
-input[type="reset"],
-input[type="button"],
-input[type="radio"],
-input[type="checkbox"] {
-  width: auto; // Override of generic input selector
+// Reset the file input to browser defaults
+input[type="file"] {
+  width: auto;
+  padding: initial;
+  line-height: initial;
+  border: initial;
+  background-color: $white;
+  background-color: initial;
+  @include box-shadow(none);
 }
 
-// Make uneditable textareas behave like a textarea
-.uneditable-textarea {
+// Help out input buttons
+input[type="button"],
+input[type="reset"],
+input[type="submit"] {
   width: auto;
   height: auto;
 }
@@ -161,10 +131,15 @@ input[type="file"] {
   line-height: 28px;
 }
 
-// Make select elements obey height by applying a border
+// Reset line-height for IE
+input[type="file"] {
+  line-height: 18px \9;
+}
+
+// Chrome on Linux and Mobile Safari need background-color
 select {
   width: 220px; // default input width + 10px of padding that doesn't get applied
-  border: 1px solid #bbb;
+  background-color: $white;
 }
 
 // Make multiple select elements height not fixed
@@ -173,12 +148,19 @@ select[size] {
   height: auto;
 }
 
-// Focus for select, file, radio, and checkbox
-select:focus,
-input[type="file"]:focus,
-input[type="radio"]:focus,
-input[type="checkbox"]:focus {
-  @include tab-focus();
+// Remove shadow from image inputs
+input[type="image"] {
+  @include box-shadow(none);
+}
+
+// Make textarea height behave
+textarea {
+  height: auto;
+}
+
+// Hidden inputs
+input[type="hidden"] {
+  display: none;
 }
 
 
@@ -189,7 +171,6 @@ input[type="checkbox"]:focus {
 // 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"],
@@ -220,6 +201,33 @@ input[type="checkbox"]:focus {
 
 
 
+// FOCUS STATE
+// -----------
+
+input,
+textarea {
+  @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
+  $transition: border linear .2s, box-shadow linear .2s;
+  @include transition($transition);
+}
+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);
+  @include box-shadow($shadow);
+  outline: 0;
+  outline: thin dotted \9; /* IE6-9 */
+}
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus,
+select:focus {
+  @include box-shadow(none); // override for file inputs
+  @include tab-focus();
+}
+
+
+
 // INPUT SIZES
 // -----------
 
@@ -235,31 +243,18 @@ input[type="checkbox"]:focus {
 input[class*="span"],
 select[class*="span"],
 textarea[class*="span"],
-.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"] {
+.uneditable-input {
   float: none;
   margin-left: 0;
 }
-// Ensure input-prepend/append never wraps
-.input-append input[class*="span"],
-.input-append .uneditable-input[class*="span"],
-.input-prepend input[class*="span"],
-.input-prepend .uneditable-input[class*="span"],
-.row-fluid .input-prepend [class*="span"],
-.row-fluid .input-append [class*="span"] {
-  display: inline-block;
-}
 
 
 
 // GRID SIZING FOR INPUTS
 // ----------------------
 
-@include grid-input($gridColumnWidth, $gridGutterWidth);
+@include inputGridSystem-generate($gridColumns, $gridColumnWidth, $gridGutterWidth);
+
 
 
 
@@ -273,16 +268,9 @@ textarea[disabled],
 input[readonly],
 select[readonly],
 textarea[readonly] {
-  cursor: not-allowed;
-  background-color: $inputDisabledBackground;
+  background-color: #f5f5f5;
   border-color: #ddd;
-}
-// Explicitly reset the colors here
-input[type="radio"][disabled],
-input[type="checkbox"][disabled],
-input[type="radio"][readonly],
-input[type="checkbox"][readonly] {
-  background-color: transparent;
+  cursor: not-allowed;
 }
 
 
@@ -313,7 +301,7 @@ select:focus:required:invalid {
   border-color: #ee5f5b;
   &:focus {
     border-color: darken(#ee5f5b, 10%);
-    @include box-shadow(0 0 6px lighten(#ee5f5b, 20%));
+    @include box-shadow(0 0 6px lighten(#ee5f5b, 20%));    
   }
 }
 
@@ -326,42 +314,38 @@ select:focus:required:invalid {
   padding: ($baseLineHeight - 1) 20px $baseLineHeight;
   margin-top: $baseLineHeight;
   margin-bottom: $baseLineHeight;
-  background-color: $formActionsBackground;
-  border-top: 1px solid #e5e5e5;
-  @include clearfix(); // Adding clearfix to allow for .pull-right button containers
+  background-color: #f5f5f5;
+  border-top: 1px solid #ddd;
 }
 
 // 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;
-  cursor: not-allowed;
-  background-color: $inputBackground;
+  display: block;
+  background-color: $white;
   border-color: #eee;
   @include 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
-@include placeholder();
+@include placeholder($grayLight);
 
 
 
 // HELP TEXT
 // ---------
 
-.help-block,
-.help-inline {
-  color: $gray; // lighten the text some for contrast
-}
-
 .help-block {
   display: block; // account for any element using help-block
-  margin-bottom: $baseLineHeight / 2;
+  margin-top: 5px;
+  margin-bottom: 0;
+  color: $grayLight;
 }
 
 .help-inline {
   display: inline-block;
   @include ie7-inline-block();
+  margin-bottom: 9px;
   vertical-align: middle;
   padding-left: 5px;
 }
@@ -375,16 +359,12 @@ select:focus:required:invalid {
 .input-prepend,
 .input-append {
   margin-bottom: 5px;
+  @include clearfix(); // Clear the float to prevent wrapping
   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;
-    @include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
-    // Make input on top when focused so blue border and shadow always show
+    @include border-radius(0 3px 3px 0);
     &:focus {
+      position: relative;
       z-index: 2;
     }
   }
@@ -392,23 +372,21 @@ select:focus:required:invalid {
     border-left-color: #ccc;
   }
   .add-on {
-    display: inline-block;
+    float: left;
+    display: block;
     width: auto;
-    height: $baseLineHeight;
     min-width: 16px;
+    height: $baseLineHeight;
+    margin-right: -1px;
     padding: 4px 5px;
     font-weight: normal;
     line-height: $baseLineHeight;
+    color: $grayLight;
     text-align: center;
     text-shadow: 0 1px 0 $white;
-    vertical-align: middle;
-    background-color: $grayLighter;
+    background-color: #f5f5f5;
     border: 1px solid #ccc;
-  }
-  .add-on,
-  .btn {
-    margin-left: -1px;
-    @include border-radius(0);
+    @include border-radius(3px 0 0 3px);
   }
   .active {
     background-color: lighten($green, 30);
@@ -416,46 +394,33 @@ select:focus:required:invalid {
   }
 }
 .input-prepend {
-  .add-on,
-  .btn {
-    margin-right: -1px;
-  }
-  .add-on:first-child,
-  .btn:first-child {
-    @include border-radius($inputBorderRadius 0 0 $inputBorderRadius);
+  .add-on {
+    *margin-top: 1px; /* IE6-7 */
   }
 }
 .input-append {
   input,
-  select,
   .uneditable-input {
-    @include border-radius($inputBorderRadius 0 0 $inputBorderRadius);
+    float: left;
+    @include border-radius(3px 0 0 3px);
   }
   .uneditable-input {
-    border-right-color: #ccc;
     border-left-color: #eee;
+    border-right-color: #ccc;
   }
-  .add-on:last-child,
-  .btn:last-child {
-    @include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
-  }
-}
-// Remove all border-radius for inputs with both prepend and append
-.input-prepend.input-append {
-  input,
-  select,
-  .uneditable-input {
-    @include border-radius(0);
-  }
-  .add-on:first-child,
-  .btn:first-child {
-    margin-right: -1px;
-    @include border-radius($inputBorderRadius 0 0 $inputBorderRadius);
-  }
-  .add-on:last-child,
-  .btn:last-child {
+  .add-on {
+    margin-right: 0;
     margin-left: -1px;
-    @include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
+    @include border-radius(0 3px 3px 0);
+  }
+  input:first-child {
+    // In IE7, having a hasLayout container (from clearfix's zoom:1) can make the first input
+    // inherit the sum of its ancestors' margins.
+    *margin-left: -160px;
+
+    &+.add-on {
+      *margin-left: -21px;
+    }
   }
 }
 
@@ -465,10 +430,8 @@ select:focus:required:invalid {
 // -----------
 
 .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 */
+  padding-right: 14px;
   margin-bottom: 0; // remove the default margin on all inputs
   @include border-radius(14px);
 }
@@ -488,11 +451,8 @@ select:focus:required:invalid {
   textarea,
   select,
   .help-inline,
-  .uneditable-input,
-  .input-prepend,
-  .input-append {
+  .uneditable-input {
     display: inline-block;
-    @include ie7-inline-block();
     margin-bottom: 0;
   }
   // Re-hide hidden elements due to specifity
@@ -501,35 +461,28 @@ select:focus:required:invalid {
   }
 }
 .form-search label,
-.form-inline label {
-  display: inline-block;
-}
-// Remove margin for input-prepend/-append
+.form-inline label,
 .form-search .input-append,
 .form-inline .input-append,
 .form-search .input-prepend,
 .form-inline .input-prepend {
-  margin-bottom: 0;
+  display: inline-block;
 }
-// Inline checkbox/radio labels (remove padding on left)
+// Make the prepend and append add-on vertical-align: middle;
+.form-search .input-append .add-on,
+.form-inline .input-prepend .add-on,
+.form-search .input-append .add-on,
+.form-inline .input-prepend .add-on {
+  vertical-align: middle;
+}
+// Inline checkbox/radio labels
 .form-search .radio,
-.form-search .checkbox,
 .form-inline .radio,
+.form-search .checkbox,
 .form-inline .checkbox {
-  padding-left: 0;
   margin-bottom: 0;
   vertical-align: middle;
 }
-// Remove float and margin, set to inline-block
-.form-search .radio input[type="radio"],
-.form-search .checkbox input[type="checkbox"],
-.form-inline .radio input[type="radio"],
-.form-inline .checkbox input[type="checkbox"] {
-  float: left;
-  margin-right: 3px;
-  margin-left: 0;
-}
-
 
 // Margin to space out fieldsets
 .control-group {
@@ -560,20 +513,7 @@ legend + .control-group {
   }
   // Move over all input controls and content
   .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;
-    *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;
   }
   // Move over buttons in .form-actions to align with .controls
   .form-actions {