bootstrap-sass-rails 3.0.0.3 → 3.0.3.0

data/app/assets/stylesheets/twitter/bootstrap/_navbar.scss

@@ -10,7 +10,6 @@
 
 .navbar {
   position: relative;
-  z-index: $zindex-navbar;
   min-height: $navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)
   margin-bottom: $navbar-margin-bottom;
   border: 1px solid transparent;
@@ -78,15 +77,13 @@
       overflow-y: visible;
     }
 
-    // Account for first and last children spacing
-    .navbar-nav.navbar-left:first-child {
-      margin-left: -$navbar-padding-horizontal;
-    }
-    .navbar-nav.navbar-right:last-child {
-      margin-right: -$navbar-padding-horizontal;
-    }
-    .navbar-text:last-child {
-      margin-right: 0;
+    // Undo the collapse side padding for navbars with containers to ensure
+    // alignment of right-aligned contents.
+    .navbar-fixed-top &,
+    .navbar-static-top &,
+    .navbar-fixed-bottom & {
+      padding-left: 0;
+      padding-right: 0;
     }
   }
 }
@@ -111,12 +108,14 @@
 //
 // Navbar alignment options
 //
-// Display the navbar across the entirity of the page or fixed it to the top or
+// Display the navbar across the entirety of the page or fixed it to the top or
 // bottom of the page.
 
 // Static top (unfixed, but 100% wide) navbar
 .navbar-static-top {
+  z-index: $zindex-navbar;
   border-width: 0 0 1px;
+
   @media (min-width: $grid-float-breakpoint) {
     border-radius: 0;
   }
@@ -128,7 +127,7 @@
   position: fixed;
   right: 0;
   left: 0;
-  border-width: 0 0 1px;
+  z-index: $zindex-navbar-fixed;
 
   // Undo the rounded corners
   @media (min-width: $grid-float-breakpoint) {
@@ -136,12 +135,13 @@
   }
 }
 .navbar-fixed-top {
-  z-index: $zindex-navbar-fixed;
   top: 0;
+  border-width: 0 0 1px;
 }
 .navbar-fixed-bottom {
   bottom: 0;
   margin-bottom: 0; // override .navbar defaults
+  border-width: 1px 0 0;
 }
 
 
@@ -152,6 +152,7 @@
   padding: $navbar-padding-vertical $navbar-padding-horizontal;
   font-size: $font-size-large;
   line-height: $line-height-computed;
+
   &:hover,
   &:focus {
     text-decoration: none;
@@ -177,6 +178,7 @@
   padding: 9px 10px;
   @include navbar-vertical-align(34px);
   background-color: transparent;
+  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
   border: 1px solid transparent;
   border-radius: $border-radius-base;
 
@@ -211,7 +213,7 @@
     line-height: $line-height-computed;
   }
 
-  @media (max-width: $screen-xs-max) {
+  @media (max-width: $grid-float-breakpoint-max) {
     // Dropdowns get custom display when collapsed
     .open .dropdown-menu {
       position: static;
@@ -243,18 +245,21 @@
     > li {
       float: left;
       > a {
-        padding-top: (($navbar-height - $line-height-computed) / 2);
-        padding-bottom: (($navbar-height - $line-height-computed) / 2);
+        padding-top:    $navbar-padding-vertical;
+        padding-bottom: $navbar-padding-vertical;
       }
     }
-  }
 
+    &.navbar-right:last-child {
+      margin-right: -$navbar-padding-horizontal;
+    }
+  }
 }
 
 
 // Component alignment
 //
-// Repurpose the pull utilities as their own navbar utilities to avoid specifity
+// Repurpose the pull utilities as their own navbar utilities to avoid specificity
 // issues with parents and chaining. Only do this when the navbar is uncollapsed
 // though so that navbar contents properly stack and align in mobile.
 
@@ -286,7 +291,7 @@
   @extend .form-inline;
 
   .form-group {
-    @media (max-width: $screen-xs-max) {
+    @media (max-width: $grid-float-breakpoint-max) {
       margin-bottom: 5px;
     }
   }
@@ -303,6 +308,11 @@
     padding-top: 0;
     padding-bottom: 0;
     @include box-shadow(none);
+
+    // Outdent the form if last child to line up with content down the page
+    &.navbar-right:last-child {
+      margin-right: -$navbar-padding-horizontal;
+    }
   }
 }
 
@@ -333,6 +343,13 @@
 
 .navbar-btn {
   @include navbar-vertical-align($input-height-base);
+
+  &.btn-sm {
+    @include navbar-vertical-align($input-height-small);
+  }
+  &.btn-xs {
+    @include navbar-vertical-align(22);
+  }
 }
 
 
@@ -341,12 +358,17 @@
 // Add a class to make any element properly align itself vertically within the navbars.
 
 .navbar-text {
-  float: left;
   @include navbar-vertical-align($line-height-computed);
 
   @media (min-width: $grid-float-breakpoint) {
+    float: left;
     margin-left: $navbar-padding-horizontal;
     margin-right: $navbar-padding-horizontal;
+
+    // Outdent the form if last child to line up with content down the page
+    &.navbar-right:last-child {
+      margin-right: 0;
+    }
   }
 }
 
@@ -412,18 +434,11 @@
 
   .navbar-collapse,
   .navbar-form {
-    border-color: darken($navbar-default-bg, 7%);
+    border-color: $navbar-default-border;
   }
 
-  // Dropdown menu items and carets
+  // Dropdown menu items
   .navbar-nav {
-    // Caret should match text color on hover
-    > .dropdown > a:hover .caret,
-    > .dropdown > a:focus .caret {
-      border-top-color: $navbar-default-link-hover-color;
-      border-bottom-color: $navbar-default-link-hover-color;
-    }
-
     // Remove background color from open dropdown
     > .open > a {
       &,
@@ -431,19 +446,10 @@
       &:focus {
         background-color: $navbar-default-link-active-bg;
         color: $navbar-default-link-active-color;
-        .caret {
-          border-top-color: $navbar-default-link-active-color;
-          border-bottom-color: $navbar-default-link-active-color;
-        }
       }
     }
-    > .dropdown > a .caret {
-      border-top-color: $navbar-default-link-color;
-      border-bottom-color: $navbar-default-link-color;
-    }
-
 
-    @media (max-width: $screen-xs-max) {
+    @media (max-width: $grid-float-breakpoint-max) {
       // Dropdowns get custom display when collapsed
       .open .dropdown-menu {
         > li > a {
@@ -562,31 +568,16 @@
         color: $navbar-inverse-link-active-color;
       }
     }
-    > .dropdown > a:hover .caret {
-      border-top-color: $navbar-inverse-link-hover-color;
-      border-bottom-color: $navbar-inverse-link-hover-color;
-    }
-    > .dropdown > a .caret {
-      border-top-color: $navbar-inverse-link-color;
-      border-bottom-color: $navbar-inverse-link-color;
-    }
-    > .open > a {
-      &,
-      &:hover,
-      &:focus {
-        .caret {
-          border-top-color: $navbar-inverse-link-active-color;
-          border-bottom-color: $navbar-inverse-link-active-color;
-        }
-      }
-    }
 
-    @media (max-width: $screen-xs-max) {
+    @media (max-width: $grid-float-breakpoint-max) {
       // Dropdowns get custom display
       .open .dropdown-menu {
         > .dropdown-header {
           border-color: $navbar-inverse-border;
         }
+        .divider {
+          background-color: $navbar-inverse-border;
+        }
         > li > a {
           color: $navbar-inverse-link-color;
           &:hover,

data/app/assets/stylesheets/twitter/bootstrap/_navs.scss

@@ -51,12 +51,17 @@
     }
   }
 
-  // Dividers (basically an hr) within the dropdown
+  // Nav dividers (deprecated with v3.0.1)
+  //
+  // This should have been removed in v3 with the dropping of `.nav-list`, but
+  // we missed it. We don't currently support this anywhere, but in the interest
+  // of maintaining backward compatibility in case you use it, it's deprecated.
   .nav-divider {
     @include nav-divider();
   }
 
   // Prevent IE8 from misplacing imgs
+  //
   // See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
   > li > a > img {
     max-width: none;
@@ -115,7 +120,7 @@
 
     // Links rendered as pills
     > a {
-      border-radius: 5px;
+      border-radius: $nav-pills-border-radius;
     }
     + li {
       margin-left: 2px;
@@ -159,28 +164,54 @@
     float: none;
      > a {
       text-align: center;
+      margin-bottom: 5px;
     }
   }
 
-  @media (min-width: $screen-sm) {
+  > .dropdown .dropdown-menu {
+    top: auto;
+    left: auto;
+  }
+
+  @media (min-width: $screen-sm-min) {
     > li {
       display: table-cell;
       width: 1%;
+      > a {
+        margin-bottom: 0;
+      }
     }
   }
 }
 
 // Move borders to anchors instead of bottom of list
+//
+// Mixin for adding on top the shared `.nav-justified` styles for our tabs
 .nav-tabs-justified {
   border-bottom: 0;
-  > li > a {
-    border-bottom: 1px solid $nav-tabs-justified-link-border-color;
 
+  > li > a {
     // Override margin from .nav-tabs
     margin-right: 0;
+    border-radius: $border-radius-base;
   }
-  > .active > a {
-    border-bottom-color: $nav-tabs-justified-active-link-border-color;
+
+  > .active > a,
+  > .active > a:hover,
+  > .active > a:focus {
+    border: 1px solid $nav-tabs-justified-link-border-color;
+  }
+
+  @media (min-width: $screen-sm-min) {
+    > li > a {
+      border-bottom: 1px solid $nav-tabs-justified-link-border-color;
+      border-radius: $border-radius-base $border-radius-base 0 0;
+    }
+    > .active > a,
+    > .active > a:hover,
+    > .active > a:focus {
+      border-bottom-color: $nav-tabs-justified-active-link-border-color;
+    }
   }
 }
 
@@ -188,38 +219,20 @@
 // Tabbable tabs
 // -------------------------
 
-// Clear any floats
-.tabbable {
-  @include clearfix();
-}
-
-// Show/hide tabbable areas
-.tab-content > .tab-pane,
-.pill-content > .pill-pane {
-  display: none;
-}
-.tab-content,
-.pill-content {
+// Hide tabbable panes to start, show them when `.active`
+.tab-content {
+  > .tab-pane {
+    display: none;
+  }
   > .active {
     display: block;
   }
 }
 
 
-
 // Dropdowns
 // -------------------------
 
-// Make dropdown carets use link color in navs
-.nav .caret {
-  border-top-color: $link-color;
-  border-bottom-color: $link-color;
-}
-.nav a:hover .caret {
-  border-top-color: $link-hover-color;
-  border-bottom-color: $link-hover-color;
-}
-
 // Specific dropdowns
 .nav-tabs .dropdown-menu {
   // make dropdown border overlap tab border

data/app/assets/stylesheets/twitter/bootstrap/_normalize.scss

@@ -1,4 +1,4 @@
-/*! normalize.css v2.1.0 | MIT License | git.io/normalize */
+/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
 
 // ==========================================================================
 // HTML5 display definitions
@@ -44,10 +44,12 @@ audio:not([controls]) {
 }
 
 //
-// Address styling not present in IE 8/9.
+// Address `[hidden]` styling not present in IE 8/9.
+// Hide the `template` element in IE, Safari, and Firefox < 22.
 //
 
-[hidden] {
+[hidden],
+template {
   display: none;
 }
 
@@ -63,8 +65,8 @@ audio:not([controls]) {
 
 html {
   font-family: sans-serif; // 1
-  -webkit-text-size-adjust: 100%; // 2
   -ms-text-size-adjust: 100%; // 2
+  -webkit-text-size-adjust: 100%; // 2
 }
 
 //
@@ -79,6 +81,14 @@ body {
 // Links
 // ==========================================================================
 
+//
+// Remove the gray background color from active links in IE 10.
+//
+
+a {
+  background: transparent;
+}
+
 //
 // Address `outline` inconsistency between Chrome and other browsers.
 //
@@ -329,8 +339,8 @@ html input[disabled] {
 }
 
 //
-// 1. Address box sizing set to `content-box` in IE 8/9.
-// 2. Remove excess padding in IE 8/9.
+// 1. Address box sizing set to `content-box` in IE 8/9/10.
+// 2. Remove excess padding in IE 8/9/10.
 //
 
 input[type="checkbox"],

data/app/assets/stylesheets/twitter/bootstrap/_pagination.scss

@@ -58,6 +58,8 @@
 
   > .disabled {
     > span,
+    > span:hover,
+    > span:focus,
     > a,
     > a:hover,
     > a:focus {

data/app/assets/stylesheets/twitter/bootstrap/_panels.scss

@@ -56,12 +56,45 @@
 // watch it go full width.
 
 .panel {
-  > .table {
+  > .table,
+  > .table-responsive > .table {
     margin-bottom: 0;
   }
-  > .panel-body + .table {
+  > .panel-body + .table,
+  > .panel-body + .table-responsive {
     border-top: 1px solid $table-border-color;
   }
+  > .table > tbody:first-child th,
+  > .table > tbody:first-child td {
+    border-top: 0;
+  }
+  > .table-bordered,
+  > .table-responsive > .table-bordered {
+    border: 0;
+    > thead,
+    > tbody,
+    > tfoot {
+      > tr {
+        > th:first-child,
+        > td:first-child {
+          border-left: 0;
+        }
+        > th:last-child,
+        > td:last-child {
+          border-right: 0;
+        }
+
+        &:last-child > th,
+        &:last-child > td {
+          border-bottom: 0;
+        }
+      }
+    }
+  }
+  > .table-responsive {
+    border: 0;
+    margin-bottom: 0;
+  }
 }
 
 
@@ -70,6 +103,10 @@
   padding: 10px 15px;
   border-bottom: 1px solid transparent;
   @include border-top-radius($panel-border-radius - 1);
+
+  > .dropdown .dropdown-toggle {
+    color: inherit;
+  }
 }
 
 // Within heading, strip any `h*` tag of it's default margins for spacing.
@@ -77,6 +114,8 @@
   margin-top: 0;
   margin-bottom: 0;
   font-size: ceil(($font-size-base * 1.125));
+  color: inherit;
+
   > a {
     color: inherit;
   }
@@ -119,11 +158,6 @@
       border-bottom: 1px solid $panel-inner-border;
     }
   }
-
-  // New subcomponent for wrapping collapsable content for proper animations
-  .panel-collapse {
-
-  }
 }
 
 

data/app/assets/stylesheets/twitter/bootstrap/_print.scss

@@ -26,7 +26,6 @@
   }
 
   // Don't show links for images, or javascript/internal links
-  .ir a:after,
   a[href^="javascript:"]:after,
   a[href^="#"]:after {
     content: "";
@@ -67,6 +66,12 @@
     page-break-after: avoid;
   }
 
+  // Chrome (OSX) fix for https://github.com/twbs/bootstrap/issues/11245
+  // Once fixed, we can just straight up remove this.
+  select {
+    background: #fff !important;
+  }
+
   // Bootstrap components
   .navbar {
     display: none;

data/app/assets/stylesheets/twitter/bootstrap/_progress-bars.scss

@@ -6,24 +6,12 @@
 // Bar animations
 // -------------------------
 
-// Webkit
+// WebKit
 @-webkit-keyframes progress-bar-stripes {
   from  { background-position: 40px 0; }
   to    { background-position: 0 0; }
 }
 
-// Firefox
-@-moz-keyframes progress-bar-stripes {
-  from  { background-position: 40px 0; }
-  to    { background-position: 0 0; }
-}
-
-// Opera
-@-o-keyframes progress-bar-stripes {
-  from  { background-position: 0 0; }
-  to    { background-position: 40px 0; }
-}
-
 // Spec and IE10+
 @keyframes progress-bar-stripes {
   from  { background-position: 40px 0; }
@@ -51,6 +39,7 @@
   width: 0%;
   height: 100%;
   font-size: $font-size-small;
+  line-height: $line-height-computed;
   color: $progress-bar-color;
   text-align: center;
   background-color: $progress-bar-bg;
@@ -60,17 +49,13 @@
 
 // Striped bars
 .progress-striped .progress-bar {
-  @include gradient-striped($progress-bar-bg);
+  @include gradient-striped();
   background-size: 40px 40px;
 }
 
 // Call animation for the active one
 .progress.active .progress-bar {
-  -webkit-animation: progress-bar-stripes 2s linear infinite;
-     -moz-animation: progress-bar-stripes 2s linear infinite;
-      -ms-animation: progress-bar-stripes 2s linear infinite;
-       -o-animation: progress-bar-stripes 2s linear infinite;
-          animation: progress-bar-stripes 2s linear infinite;
+  @include animation(progress-bar-stripes 2s linear infinite);
 }