bootstrap-sass 3.2.0.4 → 3.3.0.0

data/assets/stylesheets/bootstrap/_jumbotron.scss

@@ -4,7 +4,7 @@
 
 
 .jumbotron {
-  padding: $jumbotron-padding;
+  padding: $jumbotron-padding ($jumbotron-padding / 2);
   margin-bottom: $jumbotron-padding;
   color: $jumbotron-color;
   background-color: $jumbotron-bg;
@@ -23,7 +23,8 @@
     border-top-color: darken($jumbotron-bg, 10%);
   }
 
-  .container & {
+  .container &,
+  .container-fluid & {
     border-radius: $border-radius-large; // Only round corners at higher resolutions if contained in a container
   }
 
@@ -32,8 +33,7 @@
   }
 
   @media screen and (min-width: $screen-sm-min) {
-    padding-top:    ($jumbotron-padding * 1.6);
-    padding-bottom: ($jumbotron-padding * 1.6);
+    padding: ($jumbotron-padding * 1.6) 0;
 
     .container & {
       padding-left:  ($jumbotron-padding * 2);

data/assets/stylesheets/bootstrap/_list-group.scss

@@ -74,6 +74,7 @@ a.list-group-item {
   &.disabled:focus {
     background-color: $list-group-disabled-bg;
     color: $list-group-disabled-color;
+    cursor: $cursor-disabled;
 
     // Force color to inherit for custom content
     .list-group-item-heading {

data/assets/stylesheets/bootstrap/_media.scss

@@ -1,54 +1,45 @@
-// Media objects
-// Source: http://stubbornella.org/content/?p=497
-// --------------------------------------------------
+.media {
+  // Proper spacing between instances of .media
+  margin-top: 15px;
+
+  &:first-child {
+    margin-top: 0;
+  }
+}
 
+.media-right,
+.media > .pull-right {
+  padding-left: 10px;
+}
 
-// Common styles
-// -------------------------
+.media-left,
+.media > .pull-left {
+  padding-right: 10px;
+}
 
-// Clear the floats
-.media,
+.media-left,
+.media-right,
 .media-body {
-  overflow: hidden;
-  zoom: 1;
+  display: table-cell;
+  vertical-align: top;
 }
 
-// Proper spacing between instances of .media
-.media,
-.media .media {
-  margin-top: 15px;
-}
-.media:first-child {
-  margin-top: 0;
+.media-middle {
+  vertical-align: middle;
 }
 
-// For images and videos, set to block
-.media-object {
-  display: block;
+.media-bottom {
+  vertical-align: bottom;
 }
 
 // Reset margins on headings for tighter default spacing
 .media-heading {
-  margin: 0 0 5px;
-}
-
-
-// Media image alignment
-// -------------------------
-
-.media {
-  > .pull-left {
-    margin-right: 10px;
-  }
-  > .pull-right {
-    margin-left: 10px;
-  }
+  margin-top: 0;
+  margin-bottom: 5px;
 }
 
-
 // Media list variation
-// -------------------------
-
+//
 // Undo default ul/ol styles
 .media-list {
   padding-left: 0;

data/assets/stylesheets/bootstrap/_modals.scss

@@ -30,10 +30,10 @@
 
   // When fading in the modal, animate it to slide down
   &.fade .modal-dialog {
-    @include translate3d(0, -25%, 0);
+    @include translate(0, -25%);
     @include transition-transform(0.3s ease-out);
   }
-  &.in .modal-dialog { @include translate3d(0, 0, 0) }
+  &.in .modal-dialog { @include translate(0, 0) }
 }
 .modal-open .modal {
   overflow-x: hidden;
@@ -67,7 +67,6 @@
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: $zindex-modal-background;
   background-color: $modal-backdrop-bg;
   // Fade for backdrop
   &.fade { @include opacity(0); }
@@ -104,7 +103,7 @@
   padding: $modal-inner-padding;
   text-align: right; // right align buttons
   border-top: 1px solid $modal-footer-border-color;
-  @include clearfix(); // clear it in case folks use .pull-* classes on buttons
+  @include clearfix; // clear it in case folks use .pull-* classes on buttons
 
   // Properly space out buttons
   .btn + .btn {

data/assets/stylesheets/bootstrap/_navbar.scss

@@ -15,7 +15,7 @@
   border: 1px solid transparent;
 
   // Prevent floats from breaking the navbar
-  @include clearfix();
+  @include clearfix;
 
   @media (min-width: $grid-float-breakpoint) {
     border-radius: $navbar-border-radius;
@@ -29,7 +29,7 @@
 // styling of responsive aspects.
 
 .navbar-header {
-  @include clearfix();
+  @include clearfix;
 
   @media (min-width: $grid-float-breakpoint) {
     float: left;
@@ -53,7 +53,7 @@
   padding-left:  $navbar-padding-horizontal;
   border-top: 1px solid transparent;
   box-shadow: inset 0 1px 0 rgba(255,255,255,.1);
-  @include clearfix();
+  @include clearfix;
   -webkit-overflow-scrolling: touch;
 
   &.in {
@@ -67,6 +67,7 @@
 
     &.collapse {
       display: block !important;
+      visibility: visible !important;
       height: auto !important;
       padding-bottom: 0; // Override default setting
       overflow: visible !important;
@@ -92,7 +93,7 @@
   .navbar-collapse {
     max-height: $navbar-collapse-max-height;
 
-    @media (max-width: $screen-xs-min) and (orientation: landscape) {
+    @media (max-device-width: $screen-xs-min) and (orientation: landscape) {
       max-height: 200px;
     }
   }
@@ -141,7 +142,6 @@
   right: 0;
   left: 0;
   z-index: $zindex-navbar-fixed;
-  @include translate3d(0, 0, 0);
 
   // Undo the rounded corners
   @media (min-width: $grid-float-breakpoint) {
@@ -173,6 +173,10 @@
     text-decoration: none;
   }
 
+  > img {
+    display: block;
+  }
+
   @media (min-width: $grid-float-breakpoint) {
     .navbar > .container &,
     .navbar > .container-fluid & {
@@ -271,26 +275,6 @@
         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 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.
-
-@media (min-width: $grid-float-breakpoint) {
-  .navbar-left {
-    float: left !important;
-  }
-  .navbar-right {
-    float: right !important;
   }
 }
 
@@ -310,11 +294,15 @@
   @include box-shadow($shadow);
 
   // Mixin behavior for optimum display
-  @extend .form-inline;
+  @include form-inline;
 
   .form-group {
     @media (max-width: $grid-float-breakpoint-max) {
       margin-bottom: 5px;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
     }
   }
 
@@ -330,11 +318,6 @@
     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;
-    }
   }
 }
 
@@ -379,14 +362,33 @@
     float: left;
     margin-left: $navbar-padding-horizontal;
     margin-right: $navbar-padding-horizontal;
+  }
+}
+
+
+// Component alignment
+//
+// 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.
+//
+// Declared after the navbar components to ensure more specificity on the margins.
 
-    // Outdent the form if last child to line up with content down the page
-    &.navbar-right:last-child {
+@media (min-width: $grid-float-breakpoint) {
+  .navbar-left {
+    float: left !important;
+  }
+  .navbar-right {
+    float: right !important;
+  margin-right: -$navbar-padding-horizontal;
+
+    ~ .navbar-right {
       margin-right: 0;
     }
   }
 }
 
+
 // Alternate navbars
 // --------------------------------------------------
 

data/assets/stylesheets/bootstrap/_navs.scss

@@ -10,7 +10,7 @@
   margin-bottom: 0;
   padding-left: 0; // Override default ul/ol
   list-style: none;
-  @include clearfix();
+  @include clearfix;
 
   > li {
     position: relative;
@@ -36,7 +36,7 @@
         color: $nav-disabled-link-hover-color;
         text-decoration: none;
         background-color: transparent;
-        cursor: not-allowed;
+        cursor: $cursor-disabled;
       }
     }
   }
@@ -57,7 +57,7 @@
   // 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();
+    @include nav-divider;
   }
 
   // Prevent IE8 from misplacing imgs
@@ -223,9 +223,11 @@
 .tab-content {
   > .tab-pane {
     display: none;
+    visibility: hidden;
   }
   > .active {
     display: block;
+    visibility: visible;
   }
 }
 

data/assets/stylesheets/bootstrap/_normalize.scss

@@ -1,4 +1,4 @@
-/*! normalize.css v3.0.1 | MIT License | git.io/normalize */
+/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
 
 //
 // 1. Set default font family to sans-serif.
@@ -25,7 +25,8 @@ body {
 
 //
 // Correct `block` display not defined for any HTML5 element in IE 8/9.
-// Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox.
+// Correct `block` display not defined for `details` or `summary` in IE 10/11
+// and Firefox.
 // Correct `block` display not defined for `main` in IE 11.
 //
 
@@ -38,6 +39,7 @@ footer,
 header,
 hgroup,
 main,
+menu,
 nav,
 section,
 summary {
@@ -85,7 +87,7 @@ template {
 //
 
 a {
-  background: transparent;
+  background-color: transparent;
 }
 
 //

data/assets/stylesheets/bootstrap/_pager.scss

@@ -8,7 +8,7 @@
   margin: $line-height-computed 0;
   list-style: none;
   text-align: center;
-  @include clearfix();
+  @include clearfix;
   li {
     display: inline;
     > a,
@@ -48,8 +48,7 @@
     > span {
       color: $pager-disabled-color;
       background-color: $pager-bg;
-      cursor: not-allowed;
+      cursor: $cursor-disabled;
     }
   }
-
 }

data/assets/stylesheets/bootstrap/_pagination.scss

@@ -69,7 +69,7 @@
       color: $pagination-disabled-color;
       background-color: $pagination-disabled-bg;
       border-color: $pagination-disabled-border;
-      cursor: not-allowed;
+      cursor: $cursor-disabled;
     }
   }
 }

data/assets/stylesheets/bootstrap/_panels.scss

@@ -15,7 +15,7 @@
 // Panel contents
 .panel-body {
   padding: $panel-body-padding;
-  @include clearfix();
+  @include clearfix;
 }
 
 // Optional heading
@@ -56,7 +56,8 @@
 // any kind of custom content between the two.
 
 .panel {
-  > .list-group {
+  > .list-group,
+  > .panel-collapse > .list-group {
     margin-bottom: 0;
 
     .list-group-item {
@@ -100,6 +101,11 @@
   > .table-responsive > .table,
   > .panel-collapse > .table {
     margin-bottom: 0;
+
+    caption {
+      padding-left: $panel-body-padding;
+      padding-right: $panel-body-padding;
+    }
   }
   // Add border top radius for first one
   > .table:first-child,
@@ -109,6 +115,9 @@
     > thead:first-child,
     > tbody:first-child {
       > tr:first-child {
+        border-top-left-radius: ($panel-border-radius - 1);
+        border-top-right-radius: ($panel-border-radius - 1);
+
         td:first-child,
         th:first-child {
           border-top-left-radius: ($panel-border-radius - 1);
@@ -128,6 +137,9 @@
     > tbody:last-child,
     > tfoot:last-child {
       > tr:last-child {
+        border-bottom-left-radius: ($panel-border-radius - 1);
+        border-bottom-right-radius: ($panel-border-radius - 1);
+
         td:first-child,
         th:first-child {
           border-bottom-left-radius: ($panel-border-radius - 1);
@@ -140,7 +152,9 @@
     }
   }
   > .panel-body + .table,
-  > .panel-body + .table-responsive {
+  > .panel-body + .table-responsive,
+  > .table + .panel-body,
+  > .table-responsive + .panel-body {
     border-top: 1px solid $table-border-color;
   }
   > .table > tbody:first-child > tr:first-child th,
@@ -202,6 +216,7 @@
   .panel {
     margin-bottom: 0;
     border-radius: $panel-border-radius;
+
     + .panel {
       margin-top: 5px;
     }
@@ -209,10 +224,13 @@
 
   .panel-heading {
     border-bottom: 0;
-    + .panel-collapse > .panel-body {
+
+    + .panel-collapse > .panel-body,
+    + .panel-collapse > .list-group {
       border-top: 1px solid $panel-inner-border;
     }
   }
+
   .panel-footer {
     border-top: 0;
     + .panel-collapse .panel-body {