bootstrap-generators 2.0.4 → 2.1.1

data/vendor/twitter/bootstrap/sass/_forms.scss

@@ -1,6 +1,6 @@
+//
 // Forms
-// Base styles for various input types, form layouts, and states
-// -------------------------------------------------------------
+// --------------------------------------------------
 
 
 // GENERAL STYLES
@@ -22,7 +22,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;
@@ -80,18 +80,20 @@ 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;
+  @include 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)
 input,
-textarea {
-  width: 210px;
+textarea,
+.uneditable-input {
+  width: 206px; // plus 12px padding and 2px border
 }
 // Reset height since textareas have rows
 textarea {
@@ -116,7 +118,6 @@ 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});
 
@@ -132,13 +133,16 @@ 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
+// Reset width of input images, buttons, radios, checkboxes
+input[type="file"],
+input[type="image"],
 input[type="submit"],
 input[type="reset"],
 input[type="button"],
@@ -147,24 +151,19 @@ 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;
+  border: 1px solid $inputBorder;
+  background-color: $inputBackground; // Chrome on Linux and Mobile Safari need background-color
 }
 
 // Make multiple select elements height not fixed
@@ -182,6 +181,41 @@ input[type="checkbox"]:focus {
 }
 
 
+// Uneditable inputs
+// -------------------------
+
+// Make uneditable inputs look inactive
+.uneditable-input,
+.uneditable-textarea {
+  color: $grayLight;
+  background-color: darken($inputBackground, 1%);
+  border-color: $inputBorder;
+  @include 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 because when browsers invalidate entire lines if it doesn’t understand a selector
+input,
+textarea {
+  @include placeholder();
+}
+
 
 // CHECKBOXES & RADIOS
 // -------------------
@@ -249,6 +283,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;
@@ -259,8 +297,18 @@ textarea[class*="span"],
 // GRID SIZING FOR INPUTS
 // ----------------------
 
+// Grid sizes
 @include grid-input($gridColumnWidth, $gridGutterWidth);
 
+// Control row for multiple inputs per line
+.controls-row {
+  @include clearfix(); // Clear the float from controls
+}
+.controls-row [class*="span"] {
+  float: left; // Float to collapse white-space for proper grid alignment
+}
+
+
 
 
 // DISABLED STATE
@@ -275,7 +323,6 @@ select[readonly],
 textarea[readonly] {
   cursor: not-allowed;
   background-color: $inputDisabledBackground;
-  border-color: #ddd;
 }
 // Explicitly reset the colors here
 input[type="radio"][disabled],
@@ -303,6 +350,10 @@ input[type="checkbox"][readonly] {
 .control-group.success {
   @include formFieldState($successText, $successText, $successBackground);
 }
+// Info
+.control-group.info {
+  @include formFieldState($infoText, $infoText, $infoBackground);
+}
 
 // HTML5 invalid states
 // Shares styles with the .control-group.error above
@@ -331,19 +382,6 @@ select:focus:required:invalid {
   @include 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 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
-@include placeholder();
-
 
 
 // HELP TEXT
@@ -351,7 +389,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 {
@@ -372,42 +410,43 @@ 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;
     @include 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;
     @include border-radius(0);
   }
   .active {
@@ -431,9 +470,9 @@ select:focus:required:invalid {
   .uneditable-input {
     @include border-radius($inputBorderRadius 0 0 $inputBorderRadius);
   }
-  .uneditable-input {
-    border-right-color: #ccc;
-    border-left-color: #eee;
+  .add-on,
+  .btn {
+    margin-left: -1px;
   }
   .add-on:last-child,
   .btn:last-child {
@@ -464,14 +503,33 @@ 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
-  @include border-radius(14px);
+  margin-bottom: 0; // Remove the default margin on all inputs
+  @include border-radius(15px);
+}
+
+/* Allow for input prepend/append in search forms */
+.form-search .input-append .search-query,
+.form-search .input-prepend .search-query {
+  @include border-radius(0); // Override due to specificity
 }
+.form-search .input-append .search-query {
+  @include border-radius(14px 0 0 14px);
+}
+.form-search .input-append .btn {
+  @include border-radius(0 14px 14px 0);
+}
+.form-search .input-prepend .search-query {
+  @include border-radius(0 14px 14px 0);
+}
+.form-search .input-prepend .btn {
+  @include border-radius(14px 0 0 14px);
+}
+
 
 
 
@@ -494,6 +552,7 @@ select:focus:required:invalid {
     display: inline-block;
     @include ie7-inline-block();
     margin-bottom: 0;
+    vertical-align: middle;
   }
   // Re-hide hidden elements due to specifity
   .hide {
@@ -501,7 +560,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
@@ -554,7 +615,7 @@ legend + .control-group {
   // Float the labels left
   .control-label {
     float: left;
-    width: 140px;
+    width: $horizontalComponentOffset - 20;
     padding-top: 5px;
     text-align: right;
   }
@@ -564,19 +625,26 @@ 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 {
+    + .help-block {
+      margin-top: $baseLineHeight / 2;
+    }
+  }
   // Move over buttons in .form-actions to align with .controls
   .form-actions {
-    padding-left: 160px;
+    padding-left: $horizontalComponentOffset;
   }
 }

data/vendor/twitter/bootstrap/sass/_grid.scss

@@ -1,5 +1,21 @@
+//
+// Grid system
+// --------------------------------------------------
+
+
 // Fixed (940px)
 @include grid-core($gridColumnWidth, $gridGutterWidth);
 
 // Fluid (940px)
-@include grid-fluid($fluidGridColumnWidth, $fluidGridGutterWidth);
+@include grid-fluid($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/twitter/bootstrap/sass/_hero-unit.scss

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

data/vendor/twitter/bootstrap/sass/_labels-badges.scss

@@ -1,5 +1,7 @@
-// LABELS & BADGES
-// ---------------
+//
+// Labels and badges
+// --------------------------------------------------
+
 
 // Base classes
 .label,
@@ -36,17 +38,32 @@ a {
 // Colors
 // Only give background-color difference to links (and to simplify, we don't qualifty with `a` but [href] attribute)
 // Important (red)
-.label-important, .badge-important               { background-color: $errorText; }
-.label-important[href], .badge-important[href]   { background-color: darken($errorText, 10%); }
+.label-important, .badge-important              { background-color: $errorText; }
+.label-important[href], .badge-important[href]  { background-color: darken($errorText, 10%); }
 // Warnings (orange)
-.label-warning, .badge-warning                   { background-color: $orange; }
-.label-warning[href], .badge-warning[href]       { background-color: darken($orange, 10%); }
+.label-warning, .badge-warning                  { background-color: $orange; }
+.label-warning[href], .badge-warning[href]      { background-color: darken($orange, 10%); }
 // Success (green)
-.label-success, .badge-success                   { background-color: $successText; }
-.label-success[href], .badge-success[href]       { background-color: darken($successText, 10%); }
+.label-success, .badge-success                  { background-color: $successText; }
+.label-success[href], .badge-success[href]      { background-color: darken($successText, 10%); }
 // Info (turquoise)
-.label-info, .badge-info                         { background-color: $infoText; }
-.label-info[href], .badge-info[href]             { background-color: darken($infoText, 10%); }
+.label-info, .badge-info                        { background-color: $infoText; }
+.label-info[href], .badge-info[href]            { background-color: darken($infoText, 10%); }
 // Inverse (black)
-.label-inverse, .badge-inverse                   { background-color: $grayDark; }
-.label-inverse[href], .badge-inverse[href]       { background-color: darken($grayDark, 10%); }
+.label-inverse, .badge-inverse                  { background-color: $grayDark; }
+.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;
+  }
+}