bootstrapped-rails 2.0.7.1 → 2.0.7.2

data/vendor/assets/stylesheets/{bootstrapped/carousel.scss → bootstrapped-sass/_carousel.scss}

@@ -27,16 +27,13 @@
     line-height: 1;
   }
 
-  .active,
-  .next,
-  .prev { display: block; }
+  .active, .next, .prev { display: block; }
 
   .active {
     left: 0;
   }
 
-  .next,
-  .prev {
+  .next, .prev {
     position: absolute;
     top: 0;
     width: 100%;
@@ -48,8 +45,7 @@
   .prev {
     left: -100%;
   }
-  .next.left,
-  .prev.right {
+  .next.left, .prev.right {
     left: 0;
   }
 
@@ -80,14 +76,14 @@
   background: $grayDarker;
   border: 3px solid $white;
   @include border-radius(23px);
-  @include opacity(50);
+  @include opacity(0.5);
 
   // we can't have this transition here
   // because webkit cancels the carousel
   // animation if you trip this while
   // in the middle of another animation
   // ;_;
-  // .transition(opacity .2s linear);
+  // @include transition(opacity .2s linear);
 
   // Reposition the right one
   &.right {
@@ -99,7 +95,7 @@
   &:hover {
     color: $white;
     text-decoration: none;
-    @include opacity(90);
+    @include opacity(0.9);
   }
 }
 
@@ -115,7 +111,6 @@
   background: $grayDark;
   background: rgba(0,0,0,.75);
 }
-.carousel-caption h4,
-.carousel-caption p {
+.carousel-caption h4, .carousel-caption p {
   color: $white;
 }

data/vendor/assets/stylesheets/{bootstrapped/close.scss → bootstrapped-sass/_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/{bootstrapped/code.scss → bootstrapped-sass/_code.scss}

@@ -1,22 +1,25 @@
-// Code.less
+// Code.css.scss
 // Code typography styles for the <code> and <pre> elements
 // --------------------------------------------------------
 
 // Inline and block code styles
-code,
-pre {
+code, pre {
   padding: 0 3px 2px;
-  @include font-family-monospace;
+  @include font-family-monospace();
   font-size: $baseFontSize - 1;
   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;
@@ -30,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 {
@@ -39,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/{bootstrapped/component-animations.scss → bootstrapped-sass/_component-animations.scss}

@@ -15,4 +15,4 @@
   overflow:hidden;
   height: 0;
   &.in { height: auto; }
-}
+}

data/vendor/assets/stylesheets/{bootstrapped/dropdowns.scss → bootstrapped-sass/_dropdowns.scss}

@@ -9,8 +9,7 @@
   // The caret makes the toggle a bit too tall in IE7
   *margin-bottom: -3px;
 }
-.dropdown-toggle:active,
-.open .dropdown-toggle {
+.dropdown-toggle:active, .open .dropdown-toggle {
   outline: 0;
 }
 // Dropdown arrow/caret
@@ -26,16 +25,15 @@
   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 {
   margin-top: 8px;
   margin-left: 2px;
 }
-.dropdown:hover .caret,
-.open.dropdown .caret {
-  @include opacity(100);
+.dropdown:hover .caret, .open.dropdown .caret {
+  @include opacity(1);
 }
 // The dropdown menu (ul)
 .dropdown-menu {
@@ -46,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
@@ -93,16 +90,14 @@
     padding: 3px 15px;
     clear: both;
     font-weight: normal;
-    line-height: 18px;
+    line-height: $baseLineHeight;
     color: $gray;
     white-space: nowrap;
   }
 }
 
 // Hover state
-.dropdown-menu li > a:hover,
-.dropdown-menu .active > a,
-.dropdown-menu .active > a:hover {
+.dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover {
   color: $white;
   text-decoration: none;
   background-color: $linkColor;

data/vendor/assets/stylesheets/{bootstrapped/forms.scss → bootstrapped-sass/_forms.scss}

@@ -28,15 +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);
+label, input, button, select, textarea {
+  @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
@@ -47,10 +53,7 @@ label {
 }
 
 // Inputs, Textareas, Selects
-input,
-textarea,
-select,
-.uneditable-input {
+input, textarea, select, .uneditable-input {
   display: inline-block;
   width: 210px;
   height: $baseLineHeight;
@@ -68,29 +71,29 @@ select,
 }
 
 // Inputs within a label
-label input,
-label textarea,
-label select {
+label input, label textarea, label select {
   display: block;
 }
 
 // Mini reset for unique input types
-input[type="image"],
-input[type="checkbox"],
-input[type="radio"] {
+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;
-  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;
@@ -100,21 +103,23 @@ input[type="file"] {
 }
 
 // Help out input buttons
-input[type="button"],
-input[type="reset"],
-input[type="submit"] {
+input[type="button"], input[type="reset"], input[type="submit"] {
   width: auto;
   height: auto;
 }
 
 // Set the height of select and file controls to match text inputs
-select,
-input[type="file"] {
+select, input[type="file"] {
   height: 28px; /* 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;
 }
 
+// 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
@@ -122,8 +127,7 @@ select {
 }
 
 // Make multiple select elements height not fixed
-select[multiple],
-select[size] {
+select[multiple], select[size] {
   height: auto;
 }
 
@@ -148,61 +152,49 @@ input[type="hidden"] {
 // -------------------
 
 // Indent the labels to position radios/checkboxes as hanging
-.radio,
-.checkbox {
+.radio, .checkbox {
   padding-left: 18px;
 }
-.radio input[type="radio"],
-.checkbox input[type="checkbox"] {
+.radio input[type="radio"], .checkbox input[type="checkbox"] {
   float: left;
   margin-left: -18px;
 }
 
 // Move the options list down to align with labels
-.controls > .radio:first-child,
-.controls > .checkbox:first-child {
+.controls > .radio:first-child, .controls > .checkbox:first-child {
   padding-top: 5px; // has to be padding because margin collaspes
 }
 
 // Radios and checkboxes on same line
-.radio.inline,
-.checkbox.inline {
+// 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 {
+.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;
-}
 
 
 
 // FOCUS STATE
 // -----------
 
-input,
-textarea {
+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 {
+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-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();
 }
@@ -221,10 +213,7 @@ select:focus {
 .input-xxlarge    { width: 530px; }
 
 // Grid style input sizes
-input[class*="span"],
-select[class*="span"],
-textarea[class*="span"],
-.uneditable-input {
+input[class*="span"], select[class*="span"], textarea[class*="span"], .uneditable-input {
   float: none;
   margin-left: 0;
 }
@@ -234,8 +223,7 @@ textarea[class*="span"],
 // GRID SIZING FOR INPUTS
 // ----------------------
 
-@include input-grid-system-generate($gridColumns, $gridColumnWidth, $gridGutterWidth);
-
+@include inputGridSystemGenerate($gridColumns, $gridColumnWidth, $gridGutterWidth);
 
 
 
@@ -244,12 +232,7 @@ textarea[class*="span"],
 // --------------
 
 // Disabled and read-only inputs
-input[disabled],
-select[disabled],
-textarea[disabled],
-input[readonly],
-select[readonly],
-textarea[readonly] {
+input[disabled], select[disabled], textarea[disabled], input[readonly], select[readonly], textarea[readonly] {
   background-color: #f5f5f5;
   border-color: #ddd;
   cursor: not-allowed;
@@ -261,51 +244,22 @@ textarea[readonly] {
 // FORM FIELD FEEDBACK STATES
 // --------------------------
 
-// Mixin for form field states
-@mixin form-field-state($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 form-field-state($warningText, $warningText, $warningBackground);
+  @include formFieldState($warningText, $warningText, $warningBackground);
 }
 // Error
 .control-group.error {
-  @include form-field-state($errorText, $errorText, $errorBackground);
+  @include formFieldState($errorText, $errorText, $errorBackground);
 }
 // Success
 .control-group.success {
-  @include form-field-state($successText, $successText, $successBackground);
+  @include formFieldState($successText, $successText, $successBackground);
 }
 
 // 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:required:invalid, textarea:focus:required:invalid, select:focus:required:invalid {
   color: #b94a48;
   border-color: #ee5f5b;
   &:focus {
@@ -345,6 +299,7 @@ select:focus:required:invalid {
 // ---------
 
 .help-block {
+  display: block; // account for any element using help-block
   margin-top: 5px;
   margin-bottom: 0;
   color: $grayLight;
@@ -364,12 +319,10 @@ select:focus:required:invalid {
 // ------------
 
 // Allow us to put symbols and text within the input field for a cleaner look
-.input-prepend,
-.input-append {
+.input-prepend, .input-append {
   margin-bottom: 5px;
   @include clearfix(); // Clear the float to prevent wrapping
-  input,
-  .uneditable-input {
+  input, .uneditable-input {
     @include border-radius(0 3px 3px 0);
     &:focus {
       position: relative;
@@ -377,7 +330,8 @@ select:focus:required:invalid {
     }
   }
   .uneditable-input {
-    border-left-color: #ccc;
+    border-left-color: #eee;
+    border-right-color: #ccc;
   }
   .add-on {
     float: left;
@@ -407,13 +361,12 @@ select:focus:required:invalid {
   }
 }
 .input-append {
-  input,
-  .uneditable-input {
+  input, .uneditable-input {
     float: left;
     @include border-radius(3px 0 0 3px);
   }
   .uneditable-input {
-    border-right-color: #ccc;    
+    border-right-color: #ccc;
   }
   .add-on {
     margin-right: 0;
@@ -451,31 +404,24 @@ select:focus:required:invalid {
 // Common properties
 // -----------------
 
-.form-search,
-.form-inline,
-.form-horizontal {
-  input,
-  textarea,
-  select,
-  .help-inline,
-  .uneditable-input {
+.form-search, .form-inline, .form-horizontal {
+  input, textarea, select, .help-inline, .uneditable-input {
     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 {
+.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;
 }
 // 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 {
+.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;
 }
 
@@ -484,22 +430,23 @@ select:focus:required:invalid {
   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;