bootstrap-sass 2.0.2 → 2.0.3

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

@@ -0,0 +1,50 @@
+// LABELS & BADGES
+// ---------------
+
+// Base classes
+.label, .badge {
+  font-size: $baseFontSize * .846;
+  font-weight: bold;
+  line-height: 14px; // ensure proper line-height if floated
+  color: $white;
+  vertical-align: baseline;
+  white-space: nowrap;
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+  background-color: $grayLight;
+}
+// Set unique padding and border-radii
+.label {
+  padding: 1px 4px 2px;
+  @include border-radius(3px);
+}
+.badge {
+  padding: 1px 9px 2px;
+  @include border-radius(9px);
+}
+
+// Hover state, but only for links
+a {
+  &.label:hover, &.badge:hover {
+    color: $white;
+    text-decoration: none;
+    cursor: pointer;
+  }
+}
+
+// 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%); }
+// Warnings (orange)
+.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%); }
+// Info (turquoise)
+.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%); }

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

@@ -11,7 +11,7 @@
 
 // Fluid layouts (left aligned, with sidebar, min- & max-width content)
 .container-fluid {
-  padding-left: $gridGutterWidth;
   padding-right: $gridGutterWidth;
+  padding-left: $gridGutterWidth;
   @include clearfix();
 }

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

@@ -71,11 +71,11 @@
 
 // Sizing shortcuts
 // -------------------------
-@mixin size($height: 5px, $width: 5px) {
+@mixin size($height, $width) {
   width: $width;
   height: $height;
 }
-@mixin square($size: 5px) {
+@mixin square($size) {
   @include size($size, $size);
 }
 
@@ -98,26 +98,28 @@
   white-space: nowrap;
 }
 
-// New image replacement
+// CSS image replacement
 // -------------------------
-// Source: http://www.zeldman.com/2012/03/01/replacing-the-9999px-hack-new-image-replacement/
+// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
 @mixin hide-text() {
-  overflow: hidden;
-  text-indent: 100%;
-  white-space: nowrap;
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
 }
 
 
 // FONTS
 // --------------------------------------------------
 @mixin font-family-serif() {
-  font-family: Georgia, "Times New Roman", Times, serif;
+  font-family: $serifFontFamily;
 }
 @mixin font-family-sans-serif() {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: $sansFontFamily;
 }
 @mixin font-family-monospace() {
-  font-family: Menlo, Monaco, "Courier New", monospace;
+  font-family: $monoFontFamily;
 }
 @mixin font-shorthand($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) {
   font-size: $size;
@@ -145,9 +147,8 @@
 @mixin input-block-level() {
   display: block;
   width: 100%;
-  min-height: 28px; /* Make inputs at least the height of their button counterpart */
-  /* Makes inputs behave like true block-level elements */
-  @include box-sizing(border-box);
+  min-height: 28px; // Make inputs at least the height of their button counterpart
+  @include box-sizing(border-box); // Makes inputs behave like true block-level elements
 }
 
 
@@ -179,14 +180,14 @@
 // --------------------------------------------------
 
 // Border Radius
-@mixin border-radius($radius: 5px) {
+@mixin border-radius($radius) {
   -webkit-border-radius: $radius;
      -moz-border-radius: $radius;
           border-radius: $radius;
 }
 
 // Drop shadows
-@mixin box-shadow($shadow: 0 1px 3px rgba(0,0,0,.25)) {
+@mixin box-shadow($shadow) {
   -webkit-box-shadow: $shadow;
      -moz-box-shadow: $shadow;
           box-shadow: $shadow;
@@ -216,7 +217,7 @@
        -o-transform: scale($ratio);
           transform: scale($ratio);
 }
-@mixin translate($x: 0, $y: 0) {
+@mixin translate($x, $y) {
   -webkit-transform: translate($x, $y);
      -moz-transform: translate($x, $y);
       -ms-transform: translate($x, $y);
@@ -224,7 +225,7 @@
           transform: translate($x, $y);
 }
 
-@mixin skew($x: 0, $y: 0) {
+@mixin skew($x, $y) {
   -webkit-transform: skew($x, $y);
      -moz-transform: skew($x, $y);
       -ms-transform: skew($x, $y);
@@ -232,7 +233,7 @@
           transform: skew($x, $y);
 }
 
-@mixin translate3d($x: 0, $y: 0, $z: 0) {
+@mixin translate3d($x, $y, $z) {
   -webkit-transform: translate($x, $y, $z);
      -moz-transform: translate($x, $y, $z);
       -ms-transform: translate($x, $y, $z);
@@ -240,6 +241,17 @@
           transform: translate($x, $y, $z);
 }
 
+// Backface visibility
+// Prevent browsers from flickering when using CSS 3D transforms.
+// Default value is `visible`, but can be changed to `hidden
+// See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples
+@mixin backface-visibility($visibility){
+  -webkit-backface-visibility: $visibility;
+     -moz-backface-visibility: $visibility;
+      -ms-backface-visibility: $visibility;
+          backface-visibility: $visibility;
+}
+
 // Background clipping
 // Heads up: FF 3.6 and under need "padding" instead of "padding-box"
 @mixin background-clip($clip) {
@@ -270,18 +282,19 @@
 @mixin user-select($select) {
   -webkit-user-select: $select;
      -moz-user-select: $select;
+      -ms-user-select: $select;
        -o-user-select: $select;
           user-select: $select;
 }
 
 // Resize anything
-@mixin resizable($direction: both) {
+@mixin resizable($direction) {
   resize: $direction; // Options: horizontal, vertical, both
   overflow: auto; // Safari fix
 }
 
 // CSS3 Content Columns
-@mixin content-columns($columnCount, $columnGap: $gridColumnGutter) {
+@mixin content-columns($columnCount, $columnGap: $gridGutterWidth) {
   -webkit-column-count: $columnCount;
      -moz-column-count: $columnCount;
           column-count: $columnCount;
@@ -293,7 +306,7 @@
 // Opacity
 @mixin opacity($opacity: 1) {
   opacity: $opacity;
-   filter: alpha(opacity=$opacity * 100);
+  filter: alpha(opacity=#{$opacity * 100});
 }
 
 
@@ -391,18 +404,17 @@
 // -------------------
 // Dividers (basically an hr) within dropdowns and nav lists
 @mixin nav-divider() {
-  height: 1px;
-  margin: (($baseLineHeight / 2) - 1) 1px; // 8px 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%;
+  height: 1px;
+  margin: (($baseLineHeight / 2) - 1) 1px; // 8px 1px
   *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid $white;
 }
 
 // Button backgrounds
@@ -410,11 +422,13 @@
 @mixin buttonBackground($startColor, $endColor) {
   // gradientBar will set the background to a pleasing blend of these, to support IE<=9
   @include gradientBar($startColor, $endColor);
+  *background-color: $endColor; // Darken IE7 buttons by default so they stand out more given they won't have borders
   @include reset-filter();
 
   // in these cases the gradient won't cover the background, so we override
   &:hover, &:active, &.active, &.disabled, &[disabled] {
     background-color: $endColor;
+    *background-color: darken($endColor, 5%);
   }
 
   // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
@@ -472,8 +486,8 @@
 
 // Centered container element
 @mixin container-fixed() {
-  margin-left: auto;
   margin-right: auto;
+  margin-left: auto;
   @include clearfix();
 }
 
@@ -490,83 +504,95 @@
   margin-left: $gridGutterWidth * -1;
   @include clearfix();
 }
-@mixin makeColumn($columns: 1) {
+@mixin makeColumn($columns: 1, $offset: 0) {
   float: left;
-  margin-left: $gridGutterWidth;
+  margin-left: ($gridColumnWidth * $offset) + ($gridGutterWidth * ($offset - 1)) + ($gridGutterWidth * 2);
   width: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1));
 }
 
 // The Grid
-@mixin gridCore($gridColumnWidth, $gridGutterWidth) {
-  [class*="span"] {
-    float: left;
-    margin-left: $gridGutterWidth;
-  }
-
-  @for $i from 1 through $gridColumns {
-    .span#{$i} { @include gridCoreSpan($i, $gridColumnWidth, $gridGutterWidth) }
+@mixin gridCore($columnWidth, $gutterWidth) {
+  .row {
+    margin-left: $gutterWidth * -1;
+    @include clearfix();
   }
 
-  @for $i from 1 through $gridColumns {
-    .offset#{$i} { @include gridCoreOffset($i, $gridColumnWidth, $gridGutterWidth) }
+  [class*="span"] {
+    float: left;
+    margin-left: $gutterWidth;
   }
 
-  .row {
-    margin-left: $gridGutterWidth * -1;
-    @include clearfix();
-  }
+  // Set the container width, and override it for fixed navbars in media queries
+  .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { @include gridCoreSpan($gridColumns, $columnWidth, $gutterWidth); }
 
-  .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container {
-    @include gridCoreSpan($gridColumns, $gridColumnWidth, $gridGutterWidth);
+  @include gridCoreSpanX($gridColumns, $columnWidth, $gutterWidth);
+  @include gridCoreOffsetX($gridColumns, $columnWidth, $gutterWidth);
+}
+@mixin gridCoreSpanX($cols, $columnWidth, $gutterWidth) {
+  @for $i from 1 through $cols {
+    .span#{$i} { @include gridCoreSpan($i, $columnWidth, $gutterWidth) };
   }
 }
-
-@mixin gridCoreSpan($columns, $gridColumnWidth, $gridGutterWidth) {
-  width: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1));
+@mixin gridCoreSpan($columns, $columnWidth, $gutterWidth) {
+  width: ($columnWidth * $columns) + ($gutterWidth * ($columns - 1));
 }
-
-@mixin gridCoreOffset($columns, $gridColumnWidth, $gridGutterWidth) {
-  margin-left: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1)) + ($gridGutterWidth * 2);
+@mixin gridCoreOffsetX($cols, $columnWidth, $gutterWidth) {
+  @for $i from 1 through $cols {
+    .offset#{$i} { @include gridCoreOffset($i, $columnWidth, $gutterWidth); };
+  }
+}
+@mixin gridCoreOffset($columns, $columnWidth, $gutterWidth) {
+  margin-left: ($columnWidth * $columns) + ($gutterWidth * ($columns + 1));
 }
 
-@mixin gridFluid($fluidGridColumnWidth, $fluidGridGutterWidth) {
+@mixin gridFluid($columnWidth, $gutterWidth) {
   .row-fluid {
     width: 100%;
     @include clearfix();
-    > [class*="span"] {
+    [class*="span"] {
+      @include input-block-level();
       float: left;
-      margin-left: $fluidGridGutterWidth;
+      margin-left: $gutterWidth;
+      *margin-left: $gutterWidth - (.5 / ($gridRowWidth/1px) * 100 * 1%);
     }
-    > [class*="span"]:first-child {
+    [class*="span"]:first-child {
       margin-left: 0;
     }
-    @for $i from 1 through $gridColumns {
-      > .span#{$i} { @include gridFluidSpan($i, $fluidGridColumnWidth, $fluidGridGutterWidth); }
-    }
-  }
-}
 
-@mixin gridFluidSpan($columns, $fluidGridColumnWidth, $fluidGridGutterWidth) {
-  width: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1));
+    // generate .spanX
+    @include gridFluidSpanX($gridColumns, $columnWidth, $gutterWidth);
+  }
 }
-
-@mixin gridInput($gridColumnWidth, $gridGutterWidth) {
-  @for $i from 1 through $gridColumns {
-    input.span#{$i}, textarea.span#{$i}, .uneditable-input.span#{$i} { @include gridInputSpan($i, $gridColumnWidth, $gridGutterWidth); }
+@mixin gridFluidSpanX($cols, $columnWidth, $gutterWidth) {
+  @for $i from 1 through $cols {
+    .span#{$i} { @include gridFluidSpan($i, $columnWidth, $gutterWidth) };
   }
+}
+@mixin gridFluidSpan($columns, $columnWidth, $gutterWidth) {
+  width: ($columnWidth * $columns) + ($gutterWidth * ($columns - 1));
+  *width: ($columnWidth * $columns) + ($gutterWidth * ($columns - 1)) - (.5 / ($gridRowWidth/1px) * 100 * 1%);
+}
 
+@mixin gridInput($columnWidth, $gutterWidth) {
   input, textarea, .uneditable-input {
     margin-left: 0; // override margin-left from core grid system
   }
-}
 
-@mixin gridInputSpan($columns, $gridColumWidth, $gridGutterWidth) {
-  width: (($gridColumnWidth) * $columns) + ($gridGutterWidth * ($columns - 1)) - 10;
+  // generate .spanX
+  @include gridInputSpanX($gridColumns, $columnWidth, $gutterWidth);
+}
+@mixin gridInputSpanX($cols, $columnWidth, $gutterWidth) {
+  @for $i from 1 through $cols {
+    input.span#{$i}, textarea.span#{$i}, .uneditable-input.span#{$i} { @include gridInputSpan($i, $columnWidth, $gutterWidth); }
+  }
+}
+@mixin gridInputSpan($columns, $columnWidth, $gutterWidth) {
+  width: (($columnWidth) * $columns) + ($gutterWidth * ($columns - 1)) - 10;
 }
 
-@mixin makeFluidColumn($columns) {
+@mixin makeFluidColumn($columns, $columnWidth, $gutterWidth) {
   // This isn't perfect, but it's better than nothing.
   float: left;
-  margin-left: $fluidGridGutterWidth;
-  @include gridFluidSpan($columns, $fluidGridColumnWidth, $fluidGridGutterWidth);
+  margin-left: $gutterWidth;
+  @include gridFluidSpan($columns, $columnWidth, $gutterWidth);
 }

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

@@ -16,12 +16,12 @@
 
 // Gradient is applied to it's own element because overflow visible is not honored by IE when filter is present
 .navbar-inner {
+  min-height: $navbarHeight;
   padding-left: 20px;
   padding-right: 20px;
   @include gradient-vertical($navbarBackgroundHighlight, $navbarBackground);
   @include border-radius(4px);
-  $shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
-  @include box-shadow($shadow);
+  @include box-shadow(#{0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1)});
 }
 
 // Set width to auto for default container
@@ -30,28 +30,6 @@
   width: auto;
 }
 
-// Navbar button for toggling navbar items in responsive layouts
-.btn-navbar {
-  display: none;
-  float: right;
-  padding: 7px 10px;
-  margin-left: 5px;
-  margin-right: 5px;
-  @include buttonBackground($navbarBackgroundHighlight, $navbarBackground);
-  $shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
-  @include box-shadow($shadow);
-}
-.btn-navbar .icon-bar {
-  display: block;
-  width: 18px;
-  height: 2px;
-  background-color: #f5f5f5;
-  @include border-radius(1px);
-  @include box-shadow(0 1px 0 rgba(0,0,0,.25));
-}
-.btn-navbar .icon-bar + .icon-bar {
-  margin-top: 3px;
-}
 // Override the default collapsed state
 .nav-collapse.collapse {
   height: auto;
@@ -69,24 +47,33 @@
   .brand {
     float: left;
     display: block;
-    padding: 8px 20px 12px;
+    // Vertically center the text given $navbarHeight
+    $elementHeight: 20px;
+    padding: (($navbarHeight - $elementHeight) / 2 - 2) 20px (($navbarHeight - $elementHeight) / 2 + 2);
     margin-left: -20px; // negative indent to left-align the text down the page
     font-size: 20px;
     font-weight: 200;
     line-height: 1;
-    color: $white;
+    color: $navbarBrandColor;
   }
   // Plain text in topbar
   .navbar-text {
     margin-bottom: 0;
     line-height: $navbarHeight;
   }
+  // Janky solution for now to account for links outside the .nav
+  .navbar-link {
+    color: $navbarLinkColor;
+    &:hover {
+      color: $navbarLinkColorHover;
+    }
+  }
   // Buttons in navbar
   .btn, .btn-group {
     @include navbarVerticalAlign(30px); // Vertically center in navbar
   }
   .btn-group .btn {
-    margin-top: 0; // then undo the margin here so we don't accidentally double it
+    margin: 0; // then undo the margin here so we don't accidentally double it
   }
 }
 
@@ -125,8 +112,7 @@
     color: $white;
     background-color: $navbarSearchBackground;
     border: 1px solid $navbarSearchBorder;
-    $shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15);
-    @include box-shadow($shadow);
+    @include box-shadow(#{inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15)});
     @include transition(none);
 
     // Placeholder text gets special styles; can't be a grouped selector
@@ -198,12 +184,29 @@
 // Links
 .navbar .nav > li > a {
   float: none;
-  padding: 10px 10px 11px;
+  // Vertically center the text given $navbarHeight
+  $elementHeight: 20px;
+  padding: (($navbarHeight - $elementHeight) / 2 - 1) 10px (($navbarHeight - $elementHeight) / 2 + 1);
   line-height: 19px;
   color: $navbarLinkColor;
   text-decoration: none;
   text-shadow: 0 -1px 0 rgba(0,0,0,.25);
 }
+// Buttons
+.navbar .btn {
+  display: inline-block;
+  padding: 4px 10px 4px;
+  // Vertically center the button given $navbarHeight
+  $elementHeight: 20px;
+  margin: (($navbarHeight - $elementHeight) / 2 - 1) 5px (($navbarHeight - $elementHeight) / 2);
+  line-height: $baseLineHeight;
+}
+.navbar .btn-group {
+  margin: 0;
+  // Vertically center the button given @navbarHeight
+  $elementHeight: 28px;
+  padding: (($navbarHeight - $elementHeight) / 2 - 1) 5px (($navbarHeight - $elementHeight) / 2);
+}
 // Hover
 .navbar .nav > li > a:hover {
   background-color: $navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from :active
@@ -234,22 +237,40 @@
   margin-right: 0;
 }
 
-
+// Navbar button for toggling navbar items in responsive layouts
+// These definitions need to come after '.navbar .btn'
+.navbar .btn-navbar {
+  display: none;
+  float: right;
+  padding: 7px 10px;
+  margin-left: 5px;
+  margin-right: 5px;
+  @include buttonBackground($navbarBackgroundHighlight, $navbarBackground);
+  @include box-shadow(#{inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075)});
+}
+.navbar .btn-navbar .icon-bar {
+  display: block;
+  width: 18px;
+  height: 2px;
+  background-color: #f5f5f5;
+  @include border-radius(1px);
+  @include box-shadow(0 1px 0 rgba(0,0,0,.25));
+}
+.btn-navbar .icon-bar + .icon-bar {
+  margin-top: 3px;
+}
 
 // Dropdown menus
 // --------------
 
 // Menu position and menu carets
 .navbar .dropdown-menu {
-  margin-top: 1px;
-  @include border-radius(4px);
   &:before {
     content: '';
     display: inline-block;
     border-left:   7px solid transparent;
     border-right:  7px solid transparent;
-    border-bottom: 7px solid #ccc;
-    border-bottom-color: $dropdownBackground;
+    border-bottom: 7px solid $dropdownBorder;
     position: absolute;
     top: -7px;
     left: 9px;
@@ -284,27 +305,27 @@
 }
 
 // Dropdown toggle caret
-.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret {
+.navbar .nav li.dropdown .dropdown-toggle .caret, .navbar .nav li.dropdown.open .caret {
   border-top-color: $white;
   border-bottom-color: $white;
 }
-.navbar .nav .active .caret {
+.navbar .nav li.dropdown.active .caret {
   @include opacity(1);
 }
 
 // Remove background color from open dropdown
-.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle {
+.navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.open.active > .dropdown-toggle {
   background-color: transparent;
 }
 
 // Dropdown link on hover
-.navbar .nav .active > .dropdown-toggle:hover {
+.navbar .nav li.dropdown.active > .dropdown-toggle:hover {
   color: $white;
 }
 
 // Right aligned menus need alt position
 // TODO: rejigger this at some point to simplify the selectors
-.navbar .nav.pull-right .dropdown-menu, .navbar .nav .dropdown-menu.pull-right {
+.navbar .pull-right .dropdown-menu, .navbar .dropdown-menu.pull-right {
   left: auto;
   right: 0;
   &:before {