compass_twitter_bootstrap 2.0.3 → 2.2.2

data/stylesheets/compass_twitter_bootstrap/_forms.scss

@@ -1,6 +1,6 @@
-// Forms.less
-// Base styles for various input types, form layouts, and states
-// -------------------------------------------------------------
+//
+// Forms
+// --------------------------------------------------
 
 
 // GENERAL STYLES
@@ -22,12 +22,12 @@ 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;
   border: 0;
-  border-bottom: 1px solid #eee;
+  border-bottom: 1px solid #e5e5e5;
 
   // Small
   small {
@@ -42,7 +42,7 @@ input,
 button,
 select,
 textarea {
-  @include bootstrap-font-shorthand($baseFontSize,normal,$baseLineHeight); // Set size, weight, line-height here
+  @include ctb-font-shorthand($baseFontSize,normal,$baseLineHeight); // Set size, weight, line-height here
 }
 input,
 button,
@@ -55,93 +55,115 @@ textarea {
 label {
   display: block;
   margin-bottom: 5px;
-  color: $grayDark;
 }
 
-// Inputs, Textareas, Selects
-input,
-textarea,
+// Form controls
+// -------------------------
+
+// Shared size and type resets
 select,
+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 {
   display: inline-block;
-  width: 210px;
   height: $baseLineHeight;
-  padding: 4px;
-  margin-bottom: 9px;
+  padding: 4px 6px;
+  margin-bottom: $baseLineHeight / 2;
   font-size: $baseFontSize;
   line-height: $baseLineHeight;
   color: $gray;
-  background-color: $inputBackground;
-  border: 1px solid $inputBorder;
-  @include bootstrap-border-radius($inputBorderRadius);
+  @include ctb-border-radius($inputBorderRadius);
+  vertical-align: middle;
 }
-.uneditable-textarea {
-  width: auto;
+
+// 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,
+.uneditable-input {
+  width: 206px; // plus 12px padding and 2px border
+}
+// Reset height since textareas have rows
+textarea {
   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 ctb-box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
+  @include ctb-transition(#{border linear .2s, box-shadow linear .2s});
 
-// Inputs within a label
-label input,
-label textarea,
-label select {
-  display: block;
+  // Focus state
+  &:focus {
+    border-color: rgba(82,168,236,.8);
+    outline: 0;
+    outline: thin dotted \9; /* IE6-9 */
+    @include ctb-box-shadow(#{inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)});
+  }
 }
 
-// Mini reset for unique input types
-input[type="image"],
-input[type="checkbox"],
-input[type="radio"] {
-  width: auto;
-  height: auto;
-  padding: 0;
-  margin: 3px 0;
+// Position radios and checkboxes better
+input[type="radio"],
+input[type="checkbox"] {
+  margin: 4px 0 0;
   *margin-top: 0; /* IE7 */
+  margin-top: 1px \9; /* IE8-9 */
   line-height: normal;
-  cursor: pointer;
-  background-color: transparent;
-  border: 0 \9; /* IE9 and down */
-  @include bootstrap-border-radius(0);
-}
-input[type="image"] {
-  border: 0;
-}
-
-// Reset the file input to browser defaults
-input[type="file"] {
-  width: auto;
-  padding: initial;
-  line-height: initial;
-  background-color: $inputBackground;
-  background-color: initial;
-  border: initial;
-  @include bootstrap-box-shadow(none);
 }
 
-// Help out input buttons
-input[type="button"],
+// Reset width of input images, buttons, radios, checkboxes
+input[type="file"],
+input[type="image"],
+input[type="submit"],
 input[type="reset"],
-input[type="submit"] {
-  width: auto;
-  height: auto;
+input[type="button"],
+input[type="radio"],
+input[type="checkbox"] {
+  width: auto; // Override of generic input selector
 }
 
 // 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: $inputHeight; /* 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: $inputHeight;
 }
 
-// Reset line-height for IE
-input[type="file"] {
-  line-height: 18px \9;
-}
-
-// Chrome on Linux and Mobile Safari need background-color
+// Make select elements obey height by applying a border
 select {
   width: 220px; // default input width + 10px of padding that doesn't get applied
-  background-color: $inputBackground;
+  border: 1px solid $inputBorder;
+  background-color: $inputBackground; // Chrome on Linux and Mobile Safari need background-color
 }
 
 // Make multiple select elements height not fixed
@@ -150,22 +172,50 @@ select[size] {
   height: auto;
 }
 
-// Remove shadow from image inputs
-input[type="image"] {
-  @include bootstrap-box-shadow(none);
+// Focus for select, file, radio, and checkbox
+select:focus,
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus {
+  @include ctb-tab-focus();
 }
 
-// Make textarea height behave
-textarea {
-  height: auto;
+
+// Uneditable inputs
+// -------------------------
+
+// Make uneditable inputs look inactive
+.uneditable-input,
+.uneditable-textarea {
+  color: $grayLight;
+  background-color: darken($inputBackground, 1%);
+  border-color: $inputBorder;
+  @include ctb-box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
+  cursor: not-allowed;
 }
 
-// Hidden inputs
-input[type="hidden"] {
-  display: none;
+// 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 because when browsers invalidate entire lines if it doesn't understand a selector
+input,
+textarea {
+  @include ctb-placeholder();
+}
+
 
 // CHECKBOXES & RADIOS
 // -------------------
@@ -173,14 +223,13 @@ 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;
+  min-height: $baseLineHeight; // clear the floating input if there is no label text
+  padding-left: 20px;
 }
-
 .radio input[type="radio"],
 .checkbox input[type="checkbox"] {
   float: left;
-  margin-left: -18px;
+  margin-left: -20px;
 }
 
 // Move the options list down to align with labels
@@ -205,32 +254,6 @@ input[type="hidden"] {
 
 
 
-// FOCUS STATE
-// -----------
-
-input,
-textarea {
-  @include bootstrap-box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
-  $transition: border linear .2s, box-shadow linear .2s;
-  @include bootstrap-transition($transition);
-}
-input:focus,
-textarea:focus {
-  border-color: rgba(82,168,236,.8);
-  outline: 0;
-  outline: thin dotted \9; /* IE6-9 */
-  @include bootstrap-box-shadow("inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
-}
-input[type="file"]:focus,
-input[type="radio"]:focus,
-input[type="checkbox"]:focus,
-select:focus {
-  @include bootstrap-tab-focus();
-  @include bootstrap-box-shadow(none); // override for file inputs
-}
-
-
-
 // INPUT SIZES
 // -----------
 
@@ -255,13 +278,44 @@ textarea[class*="span"],
   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[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;
+}
 
 
 
 // GRID SIZING FOR INPUTS
 // ----------------------
 
-@include bootstrap-grid-input($gridColumnWidth, $gridGutterWidth);
+// Grid sizes
+@include ctb-grid-input($gridColumnWidth, $gridGutterWidth);
+
+// Control row for multiple inputs per line
+.controls-row {
+  @include ctb-clearfix(); // Clear the float from controls
+}
+
+// Float to collapse white-space for proper grid alignment
+.controls-row [class*="span"],
+// Redeclare the fluid grid collapse since we undo the float for inputs
+.row-fluid .controls-row [class*="span"] {
+  float: left;
+}
+// Explicity set top padding on all checkboxes/radios, not just first-child
+.controls-row .checkbox[class*="span"],
+.controls-row .radio[class*="span"] {
+  padding-top: 5px;
+}
 
 
 
@@ -278,7 +332,6 @@ select[readonly],
 textarea[readonly] {
   cursor: not-allowed;
   background-color: $inputDisabledBackground;
-  border-color: #ddd;
 }
 // Explicitly reset the colors here
 input[type="radio"][disabled],
@@ -296,27 +349,32 @@ input[type="checkbox"][readonly] {
 
 // Warning
 .control-group.warning {
-  @include bootstrap-formFieldState($warningText, $warningText, $warningBackground);
+  @include ctb-formFieldState($warningText, $warningText, $warningBackground);
 }
 // Error
 .control-group.error {
-  @include bootstrap-formFieldState($errorText, $errorText, $errorBackground);
+  @include ctb-formFieldState($errorText, $errorText, $errorBackground);
 }
 // Success
 .control-group.success {
-  @include bootstrap-formFieldState($successText, $successText, $successBackground);
+  @include ctb-formFieldState($successText, $successText, $successBackground);
+}
+// Success
+.control-group.info {
+  @include ctb-formFieldState($infoText, $infoText, $infoBackground);
 }
 
 // HTML5 invalid states
 // Shares styles with the .control-group.error above
-input:focus:required:invalid,
-textarea:focus:required:invalid,
-select:focus:required:invalid {
+input:focus:invalid,
+textarea:focus:invalid,
+select:focus:invalid {
   color: #b94a48;
   border-color: #ee5f5b;
   &:focus {
     border-color: darken(#ee5f5b, 10%);
-    @include bootstrap-box-shadow(0 0 6px lighten(#ee5f5b, 20%));
+    $shadow: 0 0 6px lighten(#ee5f5b, 20%);
+    @include ctb-box-shadow($shadow);
   }
 }
 
@@ -330,23 +388,10 @@ select:focus:required:invalid {
   margin-top: $baseLineHeight;
   margin-bottom: $baseLineHeight;
   background-color: $formActionsBackground;
-  border-top: 1px solid #ddd;
-  @include bootstrap-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 {
-  overflow: hidden; // prevent text from wrapping, but still cut it off like an input does
-  white-space: nowrap;
-  cursor: not-allowed;
-  background-color: $inputBackground;
-  border-color: #eee;
-  @include bootstrap-box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
+  border-top: 1px solid #e5e5e5;
+  @include ctb-clearfix(); // Adding clearfix to allow for .pull-right button containers
 }
 
-// Placeholder text gets special styles; can't be bundled together though for some reason
-@include bootstrap-placeholder($grayLight);
-
 
 
 // HELP TEXT
@@ -354,7 +399,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 {
@@ -364,7 +409,7 @@ select:focus:required:invalid {
 
 .help-inline {
   display: inline-block;
-  @include bootstrap-ie7-inline-block();
+  @include ctb-ie7-inline-block();
   vertical-align: middle;
   padding-left: 5px;
 }
@@ -375,50 +420,59 @@ 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;
-  @include bootstrap-clearfix(); // Clear the float to prevent wrapping
+  font-size: 0; // white space collapse hack
+  white-space: nowrap; // Prevent span and input from separating
+
+  // Reset the white space collapse hack
+  input,
+  select,
+  .uneditable-input,
+  .dropdown-menu {
+    font-size: $baseFontSize;
+  }
+
   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 bootstrap-border-radius(0 $inputBorderRadius $inputBorderRadius 0);
+    vertical-align: top;
+    @include ctb-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;
-    @include bootstrap-border-radius(0);
+  .btn,
+  .btn-group > .dropdown-toggle {
+    vertical-align: top;
+    @include ctb-border-radius(0);
   }
   .active {
     background-color: lighten($green, 30);
     border-color: $green;
   }
 }
+
 .input-prepend {
   .add-on,
   .btn {
@@ -426,56 +480,90 @@ select:focus:required:invalid {
   }
   .add-on:first-child,
   .btn:first-child {
-    @include bootstrap-border-radius($inputBorderRadius 0 0 $inputBorderRadius);
+    // FYI, `.btn:first-child` accounts for a button group that's prepended
+    @include ctb-border-radius($inputBorderRadius 0 0 $inputBorderRadius);
   }
 }
+
 .input-append {
   input,
   select,
   .uneditable-input {
-    @include bootstrap-border-radius($inputBorderRadius 0 0 $inputBorderRadius);
+    @include ctb-border-radius($inputBorderRadius 0 0 $inputBorderRadius);
+    + .btn-group .btn:last-child {
+      @include ctb-border-radius(0 $inputBorderRadius $inputBorderRadius 0);
+    }
   }
-  .uneditable-input {
-    border-right-color: #ccc;
-    border-left-color: #eee;
+  .add-on,
+  .btn,
+  .btn-group {
+    margin-left: -1px;
   }
   .add-on:last-child,
-  .btn:last-child {
-    @include bootstrap-border-radius(0 $inputBorderRadius $inputBorderRadius 0);
+  .btn:last-child,
+  .btn-group:last-child > .dropdown-toggle {
+    @include ctb-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 bootstrap-border-radius(0);
+    @include ctb-border-radius(0);
+    + .btn-group .btn {
+      @include ctb-border-radius(0 $inputBorderRadius $inputBorderRadius 0);
+    }
   }
   .add-on:first-child,
   .btn:first-child {
     margin-right: -1px;
-    @include bootstrap-border-radius($inputBorderRadius 0 0 $inputBorderRadius);
+    @include ctb-border-radius($inputBorderRadius 0 0 $inputBorderRadius);
   }
   .add-on:last-child,
   .btn:last-child {
     margin-left: -1px;
-    @include bootstrap-border-radius(0 $inputBorderRadius $inputBorderRadius 0);
+    @include ctb-border-radius(0 $inputBorderRadius $inputBorderRadius 0);
+  }
+  .btn-group:first-child {
+    margin-left: 0;
   }
 }
 
 
 
+
 // 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
-  @include bootstrap-border-radius(14px);
+  margin-bottom: 0; // Remove the default margin on all inputs
+  @include ctb-border-radius(15px);
+}
+
+/* Allow for input prepend/append in search forms */
+.form-search .input-append .search-query,
+.form-search .input-prepend .search-query {
+  @include ctb-border-radius(0); // Override due to specificity
+}
+.form-search .input-append .search-query {
+  @include ctb-border-radius(14px 0 0 14px);
 }
+.form-search .input-append .btn {
+  @include ctb-border-radius(0 14px 14px 0);
+}
+.form-search .input-prepend .search-query {
+  @include ctb-border-radius(0 14px 14px 0);
+}
+.form-search .input-prepend .btn {
+  @include ctb-border-radius(14px 0 0 14px);
+}
+
 
 
 
@@ -496,8 +584,9 @@ select:focus:required:invalid {
   .input-prepend,
   .input-append {
     display: inline-block;
-    @include bootstrap-ie7-inline-block();
+    @include ctb-ie7-inline-block();
     margin-bottom: 0;
+    vertical-align: middle;
   }
   // Re-hide hidden elements due to specifity
   .hide {
@@ -505,7 +594,9 @@ select:focus:required:invalid {
   }
 }
 .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
@@ -553,12 +644,12 @@ legend + .control-group {
   // Increase spacing between groups
   .control-group {
     margin-bottom: $baseLineHeight;
-    @include bootstrap-clearfix();
+    @include ctb-clearfix();
   }
   // Float the labels left
   .control-label {
     float: left;
-    width: 140px;
+    width: $horizontalComponentOffset - 20;
     padding-top: 5px;
     text-align: right;
   }
@@ -568,19 +659,29 @@ legend + .control-group {
     // don't inherit the margin of the parent, in this case .controls
     *display: inline-block;
     *padding-left: 20px;
-    margin-left: 160px;
+    margin-left: $horizontalComponentOffset;
     *margin-left: 0;
     &:first-child {
-      *padding-left: 160px;
+      *padding-left: $horizontalComponentOffset;
     }
   }
   // 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;
   }
+  // And apply it only to .help-block instances that follow a form control
+  input,
+  select,
+  textarea,
+  .uneditable-input,
+  .input-prepend,
+  .input-append {
+    + .help-block {
+      margin-top: $baseLineHeight / 2;
+    }
+  }
   // Move over buttons in .form-actions to align with .controls
   .form-actions {
-    padding-left: 160px;
+    padding-left: $horizontalComponentOffset;
   }
 }