anjlab-bootstrap-rails 2.0.1.1 → 2.0.2.0

data/vendor/assets/stylesheets/code.scss

@@ -14,7 +14,7 @@ pre {
 
 // Inline code
 code {
-  padding: 3px 4px;
+  padding: 2px 4px;
   color: #d14;
   background-color: #f7f7f9;
   border: 1px solid #e1e1e8;
@@ -25,7 +25,7 @@ pre {
   display: block;
   padding: ($baseLineHeight - 1) / 2;
   margin: 0 0 $baseLineHeight / 2;
-  font-size: 12px;
+  font-size: $baseFontSize * .925; // 13px to 12px
   line-height: $baseLineHeight;
   background-color: #f5f5f5;
   border: 1px solid #ccc; // fallback for IE7-8

data/vendor/assets/stylesheets/component-animations.scss

@@ -14,5 +14,7 @@
   position:relative;
   overflow:hidden;
   height: 0;
-  &.in { height: auto; }
+  &.in {
+    height: auto;
+  }
 }

data/vendor/assets/stylesheets/dropdowns.scss

@@ -13,22 +13,22 @@
 .open .dropdown-toggle {
   outline: 0;
 }
+
 // Dropdown arrow/caret
+// --------------------
 .caret {
   display: inline-block;
   width: 0;
   height: 0;
-  text-indent: -99999px;
-  // IE7 won't do the border trick if there's a text indent, but it doesn't
-  // do the content that text-indent is hiding, either, so we're ok.
-  *text-indent: 0;
   vertical-align: top;
   border-left:  4px solid transparent;
   border-right: 4px solid transparent;
   border-top:   4px solid $black;
   @include opacity(30);
-  content: "\2193";
+  content: "";
 }
+
+// Place the caret
 .dropdown .caret {
   margin-top: 8px;
   margin-left: 2px;
@@ -37,7 +37,9 @@
 .open.dropdown .caret {
   @include opacity(100);
 }
+
 // The dropdown menu (ul)
+// ----------------------
 .dropdown-menu {
   position: absolute;
   top: 100%;
@@ -46,11 +48,10 @@
   float: left;
   display: none; // none by default, but block on "open" of the menu
   min-width: 160px;
-  _width: 160px;
   padding: 4px 0;
   margin: 0; // override default ul
   list-style: none;
-  background-color: $white;
+  background-color: $dropdownBackground;
   border-color: #ccc;
   border-color: rgba(0,0,0,.2);
   border-style: solid;
@@ -63,27 +64,15 @@
   *border-right-width: 2px;
   *border-bottom-width: 2px;
 
-  // Allow for dropdowns to go bottom up (aka, dropup-menu)
-  &.bottom-up {
-    top: auto;
-    bottom: 100%;
-    margin-bottom: 2px;
+  // Aligns the dropdown menu to right
+  &.pull-right {
+    right: 0;
+    left: auto;
   }
 
   // Dividers (basically an hr) within the dropdown
   .divider {
-    height: 1px;
-    margin: 5px 1px;
-    overflow: hidden;
-    background-color: #e5e5e5;
-    border-bottom: 1px solid $white;
-
-    // IE7 needs a set width since we gave a height. Restricting just
-    // to IE7 to keep the 1px left/right space in other browsers.
-    // It is unclear where IE is getting the extra space that we need
-    // to negative-margin away, but so it goes.
-    *width: 100%;
-    *margin: -5px 0 5px;
+    @include nav-divider();
   }
 
   // Links within the dropdown menu
@@ -93,21 +82,23 @@
     clear: both;
     font-weight: normal;
     line-height: $baseLineHeight;
-    color: $gray;
+    color: $dropdownLinkColor;
     white-space: nowrap;
   }
 }
 
 // Hover state
+// -----------
 .dropdown-menu li > a:hover,
 .dropdown-menu .active > a,
 .dropdown-menu .active > a:hover {
-  color: $white;
+  color: $dropdownLinkColorHover;
   text-decoration: none;
-  background-color: $linkColor;
+  background-color: $dropdownLinkBackgroundHover;
 }
 
 // Open state for the dropdown
+// ---------------------------
 .dropdown.open {
   // IE7's z-index only goes to the nearest positioned ancestor, which would
   // make the menu appear below buttons that appeared later on the page
@@ -123,7 +114,34 @@
   }
 }
 
+// Right aligned dropdowns
+.pull-right .dropdown-menu {
+  left: auto;
+  right: 0;
+}
+
+// Allow for dropdowns to go bottom up (aka, dropup-menu)
+// ------------------------------------------------------
+// Just add .dropup after the standard .dropdown class and you're set, bro.
+// TODO: abstract this so that the navbar fixed styles are not placed here?
+.dropup,
+.navbar-fixed-bottom .dropdown {
+  // Reverse the caret
+  .caret {
+    border-top: 0;
+    border-bottom: 4px solid $black;
+    content: "\2191";
+  }
+  // Different positioning for bottom up menu
+  .dropdown-menu {
+    top: auto;
+    bottom: 100%;
+    margin-bottom: 1px;
+  }
+}
+
 // Typeahead
+// ---------
 .typeahead {
   margin-top: 2px; // give it some space to breathe
   @include border-radius(4px);

data/vendor/assets/stylesheets/forms.scss

@@ -48,7 +48,7 @@ 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)
+  font-family: $baseFontFamily; // And only set font-family here for those that need it (note the missing label element)
 }
 
 // Identify controls by their labels
@@ -71,7 +71,7 @@ select,
   font-size: $baseFontSize;
   line-height: $baseLineHeight;
   color: $gray;
-  border: 1px solid #ccc;
+  border: 1px solid $inputBorder;
   @include border-radius(3px);
 }
 .uneditable-textarea {
@@ -110,7 +110,7 @@ input[type="file"] {
   padding: initial;
   line-height: initial;
   border: initial;
-  background-color: $white;
+  background-color: $inputBackground;
   background-color: initial;
   @include box-shadow(none);
 }
@@ -139,7 +139,7 @@ input[type="file"] {
 // Chrome on Linux and Mobile Safari need background-color
 select {
   width: 220px; // default input width + 10px of padding that doesn't get applied
-  background-color: $white;
+  background-color: $inputBackground;
 }
 
 // Make multiple select elements height not fixed
@@ -253,7 +253,7 @@ textarea[class*="span"],
 // GRID SIZING FOR INPUTS
 // ----------------------
 
-@include input-grid-system-generate($gridColumns, $gridColumnWidth, $gridGutterWidth);
+@include grid-input($gridColumnWidth, $gridGutterWidth);
 
 
 
@@ -269,7 +269,7 @@ textarea[disabled],
 input[readonly],
 select[readonly],
 textarea[readonly] {
-  background-color: #f5f5f5;
+  background-color: $inputDisabledBackground;
   border-color: #ddd;
   cursor: not-allowed;
 }
@@ -315,14 +315,15 @@ select:focus:required:invalid {
   padding: ($baseLineHeight - 1) 20px $baseLineHeight;
   margin-top: $baseLineHeight;
   margin-bottom: $baseLineHeight;
-  background-color: #f5f5f5;
+  background-color: $grayLighter;
   border-top: 1px solid #ddd;
+  @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 {
   display: block;
-  background-color: $white;
+  background-color: $inputBackground;
   border-color: #eee;
   @include box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
   cursor: not-allowed;
@@ -336,17 +337,19 @@ select:focus:required:invalid {
 // 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-top: 5px;
-  margin-bottom: 0;
-  color: $grayLight;
+  margin-bottom: $baseLineHeight / 2;
 }
 
 .help-inline {
   display: inline-block;
   @include ie7-inline-block();
-  margin-bottom: 9px;
   vertical-align: middle;
   padding-left: 5px;
 }
@@ -360,9 +363,10 @@ select:focus:required:invalid {
 .input-prepend,
 .input-append {
   margin-bottom: 5px;
-  @include clearfix(); // Clear the float to prevent wrapping
   input,
+  select,
   .uneditable-input {
+    *margin-left: 0;
     @include border-radius(0 3px 3px 0);
     &:focus {
       position: relative;
@@ -373,20 +377,21 @@ select:focus:required:invalid {
     border-left-color: #ccc;
   }
   .add-on {
-    float: left;
-    display: block;
+    display: inline-block;
     width: auto;
     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;
-    background-color: #f5f5f5;
+    vertical-align: middle;
+    background-color: $grayLighter;
     border: 1px solid #ccc;
+  }
+  .add-on,
+  .btn {
     @include border-radius(3px 0 0 3px);
   }
   .active {
@@ -395,33 +400,43 @@ select:focus:required:invalid {
   }
 }
 .input-prepend {
-  .add-on {
-    *margin-top: 1px; /* IE6-7 */
+  .add-on,
+  .btn {
+    margin-right: -1px;
   }
 }
 .input-append {
   input,
+  select
   .uneditable-input {
-    float: left;
     @include border-radius(3px 0 0 3px);
   }
   .uneditable-input {
     border-left-color: #eee;
     border-right-color: #ccc;    
   }
-  .add-on {
-    margin-right: 0;
+  .add-on,
+  .btn {
     margin-left: -1px;
     @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;
+}
+// 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(3px 0 0 3px);
     }
+  .add-on:last-child,
+  .btn:last-child {
+    margin-left: -1px;
+    @include border-radius(0 3px 3px 0);
   }
 }
 
@@ -452,7 +467,9 @@ select:focus:required:invalid {
   textarea,
   select,
   .help-inline,
-  .uneditable-input {
+  .uneditable-input,
+  .input-prepend,
+  .input-append {
     display: inline-block;
     margin-bottom: 0;
   }
@@ -462,28 +479,35 @@ select:focus:required:invalid {
   }
 }
 .form-search label,
-.form-inline label,
+.form-inline label {
+  display: inline-block;
+}
+// Remove margin for input-prepend/-append
 .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 {
-  vertical-align: middle;
+  margin-bottom: 0;
 }
-// Inline checkbox/radio labels
+// Inline checkbox/radio labels (remove padding on left)
 .form-search .radio,
-.form-inline .radio,
 .form-search .checkbox,
+.form-inline .radio,
 .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-left: 0;
+  margin-right: 3px;
+}
+
 
 // Margin to space out fieldsets
 .control-group {
@@ -515,6 +539,15 @@ legend + .control-group {
   // Move over all input controls and content
   .controls {
     margin-left: 160px;
+    /* 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;
+    *margin-left: 0;
+    *padding-left: 20px;
+  }
+  // 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 {

data/vendor/assets/stylesheets/grid.scss

@@ -1,8 +1,5 @@
-// GRID SYSTEM
-// -----------
-
 // Fixed (940px)
-@include grid-system-generate($gridColumns, $gridColumnWidth, $gridGutterWidth);
+@include grid-core($gridColumnWidth, $gridGutterWidth);
 
 // Fluid (940px)
-@include fluid-grid-system-generate($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth);
+@include grid-fluid($fluidGridColumnWidth, $fluidGridGutterWidth);

data/vendor/assets/stylesheets/hero-unit.scss

@@ -4,17 +4,19 @@
 .hero-unit {
   padding: 60px;
   margin-bottom: 30px;
-  background-color: #f5f5f5;
+  background-color: $heroUnitBackground;
   @include border-radius(6px);
   h1 {
     margin-bottom: 0;
     font-size: 60px;
     line-height: 1;
+    color: $heroUnitHeadingColor;
     letter-spacing: -1px;
   }
   p {
     font-size: 18px;
     font-weight: 200;
     line-height: $baseLineHeight * 1.5;
+    color: $heroUnitLeadColor;
   }
 }