bootstrap-sass 2.0.0 → 2.0.1

data/vendor/assets/stylesheets/bootstrap/_close.scss

@@ -8,11 +8,11 @@
   line-height: $baseLineHeight;
   color: $black;
   text-shadow: 0 1px 0 rgba(255,255,255,1);
-  @include opacity(20);
+  @include opacity(0.2);
   &:hover {
     color: $black;
     text-decoration: none;
-    @include opacity(40);
+    @include opacity(0.4);
     cursor: pointer;
   }
-}
+}

data/vendor/assets/stylesheets/bootstrap/_code.scss

@@ -10,12 +10,16 @@ code, pre {
   color: $grayDark;
   @include border-radius(3px);
 }
+
+// Inline code
 code {
   padding: 3px 4px;
   color: #d14;
   background-color: #f7f7f9;
   border: 1px solid #e1e1e8;
 }
+
+// Blocks of code
 pre {
   display: block;
   padding: ($baseLineHeight - 1) / 2;
@@ -29,6 +33,7 @@ pre {
   white-space: pre;
   white-space: pre-wrap;
   word-break: break-all;
+  word-wrap: break-word;
 
   // Make prettyprint styles more spaced out for readability
   &.prettyprint {
@@ -38,6 +43,14 @@ pre {
   // Account for some code outputs that place code tags in pre tags
   code {
     padding: 0;
+    color: inherit;
     background-color: transparent;
+    border: 0;
   }
+}
+
+// Enable scrollable blocks of code
+.pre-scrollable {
+  max-height: 340px;
+  overflow-y: scroll;
 }

data/vendor/assets/stylesheets/bootstrap/_dropdowns.scss

@@ -25,7 +25,7 @@
   border-left:  4px solid transparent;
   border-right: 4px solid transparent;
   border-top:   4px solid $black;
-  @include opacity(30);
+  @include opacity(0.3);
   content: "\2193";
 }
 .dropdown .caret {
@@ -33,7 +33,7 @@
   margin-left: 2px;
 }
 .dropdown:hover .caret, .open.dropdown .caret {
-  @include opacity(100);
+  @include opacity(1);
 }
 // The dropdown menu (ul)
 .dropdown-menu {
@@ -44,7 +44,6 @@
   float: left;
   display: none; // none by default, but block on "open" of the menu
   min-width: 160px;
-  max-width: 220px;
   _width: 160px;
   padding: 4px 0;
   margin: 0; // override default ul
@@ -91,7 +90,7 @@
     padding: 3px 15px;
     clear: both;
     font-weight: normal;
-    line-height: 18px;
+    line-height: $baseLineHeight;
     color: $gray;
     white-space: nowrap;
   }
@@ -124,4 +123,4 @@
 .typeahead {
   margin-top: 2px; // give it some space to breathe
   @include border-radius(4px);
-}
+}

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

@@ -28,11 +28,21 @@ legend {
   color: $grayDark;
   border: 0;
   border-bottom: 1px solid #eee;
+
+  // Small
+  small {
+    font-size: $baseLineHeight * .75;
+    color: $grayLight;
+  }
 }
 
 // Set font for forms
 label, input, button, select, textarea {
-  @include font-sans-serif($baseFontSize, normal, $baseLineHeight);
+  @include font-shorthand($baseFontSize, normal, $baseLineHeight); // Set size, weight, line-height here
+}
+
+input, button, select, textarea {
+  @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
@@ -73,13 +83,17 @@ input[type="image"], input[type="checkbox"], input[type="radio"] {
   margin: 3px 0;
   *margin-top: 0; /* IE7 */
   line-height: normal;
-  border: 0;
   cursor: pointer;
   @include border-radius(0);
+  border: 0 \9; /* IE9 and down */
+}
+input[type="image"] {
+  border: 0;
 }
 
 // Reset the file input to browser defaults
 input[type="file"] {
+  width: auto;
   padding: initial;
   line-height: initial;
   border: initial;
@@ -101,6 +115,11 @@ select, input[type="file"] {
   line-height: 28px;
 }
 
+// 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
@@ -147,18 +166,16 @@ input[type="hidden"] {
 }
 
 // Radios and checkboxes on same line
+// TODO v3: Convert .inline to .control-inline
 .radio.inline, .checkbox.inline {
   display: inline-block;
+  padding-top: 5px;
   margin-bottom: 0;
   vertical-align: middle;
 }
 .radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline {
   margin-left: 10px; // space out consecutive inline controls
 }
-// But don't forget to remove their padding on first-child
-.controls > .radio.inline:first-child, .controls > .checkbox.inline:first-child {
-  padding-top: 0;
-}
 
 
 
@@ -175,9 +192,9 @@ input:focus, textarea:focus {
   $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-8 */
+  outline: thin dotted \9; /* IE6-9 */
 }
-input[type="file"]:focus, input[type="checkbox"]:focus, select:focus {
+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();
 }
@@ -227,28 +244,6 @@ input[disabled], select[disabled], textarea[disabled], input[readonly], select[r
 // FORM FIELD FEEDBACK STATES
 // --------------------------
 
-// Mixin for form field states
-@mixin formFieldState($textColor: #555, $borderColor: #ccc, $backgroundColor: #f5f5f5) {
-  // Set the text color
-  > label, .help-block, .help-inline {
-    color: $textColor;
-  }
-  // Style inputs accordingly
-  input, select, textarea {
-    color: $textColor;
-    border-color: $borderColor;
-    &:focus {
-      border-color: darken($borderColor, 10%);
-      @include box-shadow(0 0 6px lighten($borderColor, 20%));
-    }
-  }
-  // Give a small background color for input-prepend/-append
-  .input-prepend .add-on, .input-append .add-on {
-    color: $textColor;
-    background-color: $backgroundColor;
-    border-color: $textColor;
-  }
-}
 // Warning
 .control-group.warning {
   @include formFieldState($warningText, $warningText, $warningBackground);
@@ -304,6 +299,7 @@ input:focus:required:invalid, textarea:focus:required:invalid, select:focus:requ
 // ---------
 
 .help-block {
+  display: block; // account for any element using help-block
   margin-top: 5px;
   margin-bottom: 0;
   color: $grayLight;
@@ -334,7 +330,8 @@ input:focus:required:invalid, textarea:focus:required:invalid, select:focus:requ
     }
   }
   .uneditable-input {
-    border-left-color: #ccc;
+    border-left-color: #eee;
+    border-right-color: #ccc;
   }
   .add-on {
     float: left;
@@ -412,6 +409,8 @@ input:focus:required:invalid, textarea:focus:required:invalid, select:focus:requ
     display: inline-block;
     margin-bottom: 0;
   }
+  // Re-hide elemnts due to specifity
+  .hide { display: none; }
 }
 .form-search label, .form-inline label, .form-search .input-append, .form-inline .input-append, .form-search .input-prepend, .form-inline .input-prepend {
   display: inline-block;
@@ -420,28 +419,34 @@ input:focus:required:invalid, textarea:focus:required:invalid, select:focus:requ
 .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-inline .radio, .form-search .checkbox, .form-inline .checkbox {
+  margin-bottom: 0;
+  vertical-align: middle;
+}
 
 // Margin to space out fieldsets
 .control-group {
   margin-bottom: $baseLineHeight / 2;
 }
 
+// Legend collapses margin, so next elements is responsible for spacing
+legend + .control-group {
+  margin-top: $baseLineHeight;
+  -webkit-margin-top-collapse: separate;
+}
+
 // Horizontal-specific styles
 // --------------------------
 
 .form-horizontal {
-  // Legend collapses margin, so we're relegated to padding
-  legend + .control-group {
-    margin-top: $baseLineHeight;
-    -webkit-margin-top-collapse: separate;
-  }
   // Increase spacing between groups
   .control-group {
     margin-bottom: $baseLineHeight;
     @include clearfix();
   }
   // Float the labels left
-  .control-group > label {
+  .control-label {
     float: left;
     width: 140px;
     padding-top: 5px;

data/vendor/assets/stylesheets/bootstrap/_labels.scss

@@ -1,16 +1,32 @@
 // LABELS
 // ------
 
+// Base
 .label {
-  padding: 1px 3px 2px;
-  font-size: $baseFontSize * .75;
+  padding: 2px 4px 3px;
+  font-size: $baseFontSize * .85;
   font-weight: bold;
   color: $white;
-  text-transform: uppercase;
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
   background-color: $grayLight;
   @include border-radius(3px);
 }
-.label-important { background-color: $errorText; }
-.label-warning   { background-color: $orange; }
-.label-success   { background-color: $successText; }
-.label-info      { background-color: $infoText; }
+
+// Hover state
+.label:hover {
+  color: $white;
+  text-decoration: none;
+}
+
+// Colors
+.label-important        { background-color: $errorText; }
+.label-important:hover  { background-color: darken($errorText, 10%); }
+
+.label-warning          { background-color: $orange; }
+.label-warning:hover    { background-color: darken($orange, 10%); }
+
+.label-success          { background-color: $successText; }
+.label-success:hover    { background-color: darken($successText, 10%); }
+
+.label-info             { background-color: $infoText; }
+.label-info:hover       { background-color: darken($infoText, 10%); }

data/vendor/assets/stylesheets/bootstrap/_mixins.scss

@@ -20,12 +20,13 @@
     clear: both;
   }
 }
+.clearfix { @include clearfix(); }
 
 // Webkit-style focus
 // ------------------
 @mixin tab-focus() {
   // Default
-  outline: thin dotted;
+  outline: thin dotted #333;
   // Webkit
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
@@ -89,6 +90,13 @@
   }
 }
 
+// Text overflow
+// ------------------------
+@mixin text-overflow() {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 
 
 // FONTS
@@ -140,7 +148,7 @@
 // Setup the mixins to be used
 @mixin gridSystemColumns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, $columns) {
   width: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1));
-} 
+}
 @mixin gridSystemOffset($gridColumnWidth, $gridGutterWidth, $columns) {
   margin-left: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1)) + ($gridGutterWidth * 2);
 }
@@ -196,13 +204,11 @@
     }
     // Default columns
     @for $i from 1 through $gridColumns {
-      .span#{$i} { @include fluidGridSystemColumns($fluidGridGutterWidth, $fluidGridColumnWidth, $i); }
+      > .span#{$i} { @include fluidGridSystemColumns($fluidGridGutterWidth, $fluidGridColumnWidth, $i); }
     }
   }
 }
 
-
-
 // Input grid system
 // -------------------------
 @mixin inputGridSystemInputColumns($gridGutterWidth, $gridColumnWidth, $gridRowWidth, $columns) {
@@ -216,6 +222,45 @@
   }
 }
 
+// Make a grid
+// -------------------------
+// Use makeRow() and makeColumn() to assign semantic layouts grid system behaviour
+@mixin makeRow() {
+  margin-left: $gridGutterWidth * -1;
+  @include clearfix();
+}
+@mixin makeColumn($columns: 1) {
+  float: left;
+  margin-left: $gridGutterWidth;
+  width: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1));
+}
+
+
+// Form field states (used in forms.less)
+// --------------------------------------------------
+
+// Mixin for form field states
+@mixin formFieldState($textColor: #555, $borderColor: #ccc, $backgroundColor: #f5f5f5) {
+  // Set the text color
+  > label, .help-block, .help-inline {
+    color: $textColor;
+  }
+  // Style inputs accordingly
+  input, select, textarea {
+    color: $textColor;
+    border-color: $borderColor;
+    &:focus {
+      border-color: darken($borderColor, 10%);
+      @include box-shadow(0 0 6px lighten($borderColor, 20%));
+    }
+  }
+  // Give a small background color for input-prepend/-append
+  .input-prepend .add-on, .input-append .add-on {
+    color: $textColor;
+    background-color: $backgroundColor;
+    border-color: $textColor;
+  }
+}
 
 
 // CSS3 PROPERTIES
@@ -267,8 +312,6 @@
           transform: translate($x, $y);
 }
 
-// Removed duplicate mixin # TM.
-
 @mixin skew($x: 0, $y: 0) {
   -webkit-transform: skew($x, $y);
      -moz-transform: skew($x, $y);
@@ -277,6 +320,14 @@
           transform: skew($x, $y);
 }
 
+@mixin translate3d($x: 0, $y: 0, $z: 0) {
+  -webkit-transform: translate($x, $y, $z);
+     -moz-transform: translate($x, $y, $z);
+      -ms-transform: translate($x, $y, $z);
+       -o-transform: translate($x, $y, $z);
+          transform: translate($x, $y, $z);
+}
+
 // Background clipping
 // Heads up: FF 3.6 and under need "padding" instead of "padding-box"
 @mixin background-clip($clip) {
@@ -327,9 +378,9 @@
 }
 
 // Opacity
-@mixin opacity($opacity: 100) {
-  opacity: $opacity / 100;
-   filter: alpha(opacity=$opacity);
+@mixin opacity($opacity: 1) {
+  opacity: $opacity;
+   filter: alpha(opacity=$opacity * 100);
 }
 
 
@@ -476,4 +527,4 @@
   border-top: $arrowWidth solid transparent;
   border-bottom: $arrowWidth solid transparent;
   border-right: $arrowWidth solid $black;
-}
+}