bootstrap-sass 2.0.1 → 2.0.2

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

@@ -6,6 +6,10 @@
 // -------------
 
 .navbar {
+  // Fix for IE7's bad indexing so dropdowns don't appear below content that follows the navbar
+  *position: relative;
+  *z-index: 2;
+
   overflow: visible;
   margin-bottom: $baseLineHeight;
 }
@@ -20,6 +24,12 @@
   @include box-shadow($shadow);
 }
 
+// Set width to auto for default container
+// We then reset it for fixed navbars in the #gridSystem mixin
+.navbar .container {
+  width: auto;
+}
+
 // Navbar button for toggling navbar items in responsive layouts
 .btn-navbar {
   display: none;
@@ -50,6 +60,7 @@
 
 // Brand, links, text, and buttons
 .navbar {
+  color: $navbarText;
   // Hover and active states
   .brand:hover {
     text-decoration: none;
@@ -68,16 +79,11 @@
   // Plain text in topbar
   .navbar-text {
     margin-bottom: 0;
-    line-height: 40px;
-    color: $navbarText;
-    a:hover {
-      color: $white;
-      background-color: transparent;
-    }
+    line-height: $navbarHeight;
   }
   // Buttons in navbar
   .btn, .btn-group {
-    margin-top: 5px; // make buttons vertically centered in navbar
+    @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
@@ -88,14 +94,13 @@
 .navbar-form {
   margin-bottom: 0; // remove default bottom margin
   @include clearfix();
+  input, select, .radio, .checkbox {
+    @include navbarVerticalAlign(30px); // Vertically center in navbar
+  }
   input, select {
     display: inline-block;
-    margin-top: 5px;
     margin-bottom: 0;
   }
-  .radio, .checkbox {
-    margin-top: 5px;
-  }
   input[type="image"], input[type="checkbox"], input[type="radio"] {
     margin-top: 3px;
   }
@@ -112,35 +117,32 @@
 .navbar-search {
   position: relative;
   float: left;
-  margin-top: 6px;
+  @include navbarVerticalAlign(28px); // Vertically center in navbar
   margin-bottom: 0;
   .search-query {
     padding: 4px 9px;
     @include font-sans-serif(13px, normal, 1);
     color: $white;
-    color: rgba(255,255,255,.75);
-    background: #666;
-    background: rgba(255,255,255,.3);
-    border: 1px solid #111;
+    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 transition(none);
 
-    // Placeholder text gets special styles; can't be bundled together though for some reason
-    @include placeholder($grayLighter);
-
-    // Hover states
-    &:hover {
-      color: $white;
-      background-color: $grayLight;
-      background-color: rgba(255,255,255,.5);
+    // Placeholder text gets special styles; can't be a grouped selector
+    &:-moz-placeholder {
+      color: $navbarSearchPlaceholderColor;
+    }
+    &::-webkit-input-placeholder {
+      color: $navbarSearchPlaceholderColor;
     }
+
     // Focus states (we use .focused since IE7-8 and down doesn't support :focus)
     &:focus, &.focused {
       padding: 5px 10px;
       color: $grayDark;
       text-shadow: 0 1px 0 $white;
-      background-color: $white;
+      background-color: $navbarSearchBackgroundFocus;
       border: 0;
       @include box-shadow(0 0 3px rgba(0,0,0,.15));
       outline: 0;
@@ -152,19 +154,28 @@
 // FIXED NAVBAR
 // ------------
 
-.navbar-fixed-top {
+// Shared (top/bottom) styles
+.navbar-fixed-top, .navbar-fixed-bottom {
   position: fixed;
-  top: 0;
   right: 0;
   left: 0;
   z-index: $zindexFixedNavbar;
+  margin-bottom: 0; // remove 18px margin for static navbars
 }
-.navbar-fixed-top .navbar-inner {
+.navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner {
   padding-left: 0;
   padding-right: 0;
   @include border-radius(0);
 }
 
+.navbar-fixed-top .container, .navbar-fixed-bottom .container {
+  @include gridCoreSpan($gridColumns, $gridColumnWidth, $gridGutterWidth);
+}
+
+// Fixed to top
+.navbar-fixed-top { top: 0; }
+.navbar-fixed-bottom { bottom: 0; }
+
 
 // NAVIGATION
 // ----------
@@ -202,9 +213,9 @@
 
 // Active nav items
 .navbar .nav .active > a, .navbar .nav .active > a:hover {
-  color: $navbarLinkColorHover;
+  color: $navbarLinkColorActive;
   text-decoration: none;
-  background-color: $navbarBackground;
+  background-color: $navbarLinkBackgroundActive;
 }
 
 // Dividers (basically a vertical hr)
@@ -238,7 +249,7 @@
     border-left:   7px solid transparent;
     border-right:  7px solid transparent;
     border-bottom: 7px solid #ccc;
-    border-bottom-color: rgba(0,0,0,.2);
+    border-bottom-color: $dropdownBackground;
     position: absolute;
     top: -7px;
     left: 9px;
@@ -255,9 +266,27 @@
   }
 }
 
+// Menu position and menu caret support for dropups via extra dropup class
+.navbar-fixed-bottom .dropdown-menu {
+  &:before {
+    border-top: 7px solid #ccc;
+    border-top-color: $dropdownBorder;
+    border-bottom: 0;
+    bottom: -7px;
+    top: auto;
+  }
+  &:after {
+    border-top: 6px solid $dropdownBackground;
+    border-bottom: 0;
+    bottom: -6px;
+    top: auto;
+  }
+}
+
 // Dropdown toggle caret
 .navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret {
   border-top-color: $white;
+  border-bottom-color: $white;
 }
 .navbar .nav .active .caret {
   @include opacity(1);
@@ -274,7 +303,8 @@
 }
 
 // Right aligned menus need alt position
-.navbar .nav.pull-right .dropdown-menu {
+// TODO: rejigger this at some point to simplify the selectors
+.navbar .nav.pull-right .dropdown-menu, .navbar .nav .dropdown-menu.pull-right {
   left: auto;
   right: 0;
   &:before {

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

@@ -42,8 +42,8 @@
 // --------
 
 .nav-list {
-  padding-left: 14px;
-  padding-right: 14px;
+  padding-left: 15px;
+  padding-right: 15px;
   margin-bottom: 0;
 }
 .nav-list > li > a, .nav-list .nav-header {
@@ -54,7 +54,7 @@
 .nav-list > li > a {
   padding: 3px 15px;
 }
-.nav-list .active > a, .nav-list .active > a:hover {
+.nav-list > .active > a, .nav-list > .active > a:hover {
   color: $white;
   text-shadow: 0 -1px 0 rgba(0,0,0,.2);
   background-color: $linkColor;
@@ -62,6 +62,10 @@
 .nav-list [class^="icon-"] {
   margin-right: 2px;
 }
+// Dividers (basically an hr) within the dropdown
+.nav-list .divider {
+  @include nav-divider();
+}
 
 
 
@@ -97,8 +101,9 @@
 
 // Actual tabs (as links)
 .nav-tabs > li > a {
-  padding-top: 9px;
-  padding-bottom: 9px;
+  padding-top: 8px;
+  padding-bottom: 8px;
+  line-height: $baseLineHeight;
   border: 1px solid transparent;
   @include border-radius(4px 4px 0 0);
   &:hover {
@@ -191,16 +196,19 @@
 // Make carets use linkColor to start
 .nav-tabs .dropdown-toggle .caret, .nav-pills .dropdown-toggle .caret {
   border-top-color: $linkColor;
+  border-bottom-color: $linkColor;
   margin-top: 6px;
 }
 .nav-tabs .dropdown-toggle:hover .caret, .nav-pills .dropdown-toggle:hover .caret {
   border-top-color: $linkColorHover;
+  border-bottom-color: $linkColorHover;
 }
 
 // Active dropdown links
 // -------------------------
 .nav-tabs .active .dropdown-toggle .caret, .nav-pills .active .dropdown-toggle .caret {
   border-top-color: $grayDark;
+  border-bottom-color: $grayDark;
 }
 
 // Active:hover dropdown links
@@ -219,6 +227,7 @@
 }
 .nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret {
   border-top-color: $white;
+  border-bottom-color: $white;
   @include opacity(1);
 }
 
@@ -241,7 +250,8 @@
   @include clearfix();
 }
 .tab-content {
-  overflow: hidden; // prevent content from running below tabs
+  display: table; // prevent content from running below tabs
+  width: 100%;
 }
 
 // Remove border on bottom, left, right

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

@@ -27,4 +27,9 @@
 }
 .pager .previous a {
   float: left;
+}
+.pager .disabled a, .pager .disabled a:hover {
+  color: $grayLight;
+  background-color: #fff;
+  cursor: default;
 }

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

@@ -31,7 +31,7 @@
   color: $grayLight;
   cursor: default;
 }
-.pagination .disabled a, .pagination .disabled a:hover {
+.pagination .disabled span, .pagination .disabled a, .pagination .disabled a:hover {
   color: $grayLight;
   background-color: transparent;
   cursor: default;

data/vendor/assets/stylesheets/bootstrap/_progress-bars.scss

@@ -17,6 +17,11 @@
   to    { background-position: 40px 0; }
 }
 
+@-ms-keyframes progress-bar-stripes {
+  from { background-position: 0 0; }
+  to   { background-position: 40px 0; }
+}
+
 // Spec
 @keyframes progress-bar-stripes {
   from  { background-position: 0 0; }
@@ -54,7 +59,7 @@
 
 // Striped bars
 .progress-striped .bar {
-  @include gradient-striped(#62c462);
+  @include gradient-striped(#149bdf);
   @include background-size(40px 40px);
 }
 
@@ -92,4 +97,13 @@
 }
 .progress-info.progress-striped .bar {
   @include gradient-striped(#5bc0de);
+}
+
+// Warning (orange)
+.progress-warning .bar {
+  @include gradient-vertical(lighten($orange, 15%), $orange);
+}
+
+.progress-warning.progress-striped .bar {
+  @include gradient-striped(lighten($orange, 15%));
 }

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

@@ -62,10 +62,10 @@ sub {
 // -------------------------
 
 img {
-  max-width: 100%;
   height: auto;
   border: 0;
   -ms-interpolation-mode: bicubic;
+  vertical-align: middle;
 }
 
 // Forms

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

@@ -3,7 +3,7 @@
 // -------------------------------------------------------------------------------------------
 
 
-// STRUCTURAL LAYOUT
+// Body reset
 // -----------------
 
 body {
@@ -12,11 +12,11 @@ body {
   font-size: $baseFontSize;
   line-height: $baseLineHeight;
   color: $textColor;
-  background-color: $white;
+  background-color: $bodyBackground;
 }
 
 
-// LINKS
+// Links
 // -----
 
 a {

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

@@ -11,7 +11,7 @@
 // and background-position. Your resulting HTML will look like
 // <i class="icon-inbox"></i>.
 
-// For the white version of the  icons, just add the .icon-white class:
+// For the white version of the icons, just add the .icon-white class:
 // <i class="icon-inbox icon-white"></i>
 
 [class^="icon-"], [class*=" icon-"] {
@@ -20,14 +20,14 @@
   height: 14px;
   line-height: 14px;
   vertical-align: text-top;
-  background-image: asset-url("glyphicons-halflings.png", image);
+  background-image: $iconSpritePath;
   background-position: 14px 14px;
   background-repeat: no-repeat;
 
   @include ie7-restore-right-whitespace();
 }
 .icon-white {
-  background-image: asset-url("glyphicons-halflings-white.png", image);
+  background-image: $iconWhiteSpritePath;
 }
 
 .icon-glass              { background-position: 0      0; }

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

@@ -11,6 +11,7 @@ table {
   max-width: 100%;
   border-collapse: collapse;
   border-spacing: 0;
+  background-color: $tableBackground;
 }
 
 // BASELINE STYLES
@@ -25,7 +26,7 @@ table {
     line-height: $baseLineHeight;
     text-align: left;
     vertical-align: top;
-    border-top: 1px solid #ddd;
+    border-top: 1px solid $tableBorder;
   }
   th {
     font-weight: bold;
@@ -35,12 +36,13 @@ table {
     vertical-align: bottom;
   }
   // Remove top border from thead by default
-  thead:first-child tr th, thead:first-child tr td {
+  colgroup + thead tr:first-child th, colgroup + thead tr:first-child td,
+  thead:first-child tr:first-child th, thead:first-child tr:first-child td {
     border-top: 0;
   }
   // Account for multiple tbody instances
   tbody + tbody {
-    border-top: 2px solid #ddd;
+    border-top: 2px solid $tableBorder;
   }
 }
 
@@ -60,12 +62,13 @@ table {
 // ----------------
 
 .table-bordered {
-  border: 1px solid #ddd;
+  border: 1px solid $tableBorder;
+  border-left: 0;
   border-collapse: separate; // Done so we can round those corners!
   *border-collapse: collapsed; // IE7 can't round corners anyway
   @include border-radius(4px);
-  th + th, td + td, th + td, td + th {
-    border-left: 1px solid #ddd;
+  th, td {
+    border-left: 1px solid $tableBorder;
   }
   // Prevent a double border
   thead:first-child tr:first-child th, tbody:first-child tr:first-child th, tbody:first-child tr:first-child td {
@@ -95,7 +98,7 @@ table {
 .table-striped {
   tbody {
     tr:nth-child(odd) td, tr:nth-child(odd) th {
-      background-color: #f9f9f9;
+      background-color: $tableBackgroundAccent;
     }
   }
 }
@@ -106,19 +109,12 @@ table {
 // Placed here since it has to come after the potential zebra striping
 .table {
   tbody tr:hover td, tbody tr:hover th {
-    background-color: #f5f5f5;
+    background-color: $tableBackgroundHover;
   }
 }
 
 // TABLE CELL SIZING
 // -----------------
-
-// Change the columns
-@mixin tableColumns($columnSpan: 1) {
-  float: none;
-  width: (($gridColumnWidth) * $columnSpan) + ($gridGutterWidth * ($columnSpan - 1)) - 16;
-  margin-left: 0;
-}
 table {
   @for $i from 1 through $gridColumns {
     .span#{$i} { @include tableColumns($i); }