bootstrap-sass 2.1.1.0 → 2.2.1.0

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

@@ -2,16 +2,6 @@
 // Modals
 // --------------------------------------------------
 
-
-// Recalculate z-index where appropriate,
-// but only apply to elements within modal
-.modal-open modal {
-  .dropdown-menu {  z-index: $zindexDropdown + $zindexModal; }
-  .dropdown.open { *z-index: $zindexDropdown + $zindexModal; }
-  .popover       {  z-index: $zindexPopover  + $zindexModal; }
-  .tooltip       {  z-index: $zindexTooltip  + $zindexModal; }
-}
-
 // Background
 .modal-backdrop {
   position: fixed;
@@ -27,7 +17,7 @@
 
 .modal-backdrop,
 .modal-backdrop.fade.in {
-  @include opacity(0.8);
+  @include opacity(80);
 }
 
 // Base modal
@@ -44,10 +34,13 @@
   border: 1px solid rgba(0,0,0,.3);
   *border: 1px solid #999; /* IE6-7 */
   @include border-radius(6px);
-  @include box-shadow(#{0 3px 7px rgba(0,0,0,0.3)});
+  @include box-shadow(0 3px 7px rgba(0,0,0,0.3));
   @include background-clip(padding-box);
+  // Remove focus outline from opened modal
+  outline: none;
+
   &.fade {
-    @include transition(#{opacity .3s linear, top .3s ease-out});
+    @include transition(opacity .3s linear, top .3s ease-out);
     top: -25%;
   }
   &.fade.in { top: 50%; }
@@ -83,7 +76,7 @@
   background-color: #f5f5f5;
   border-top: 1px solid #ddd;
   @include border-radius(0 0 6px 6px);
-  @include box-shadow(#{inset 0 1px 0 $white});
+  @include box-shadow(inset 0 1px 0 $white);
   @include clearfix(); // clear it in case folks use .pull-* classes on buttons
 
   // Properly space out buttons
@@ -95,4 +88,8 @@
   .btn-group .btn + .btn {
     margin-left: -1px;
   }
-}
+  // and override it for block buttons as well
+  .btn-block + .btn-block {
+    margin-left: 0;
+  }
+}

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

@@ -25,8 +25,8 @@
   padding-right: 20px;
   @include gradient-vertical($navbarBackgroundHighlight, $navbarBackground);
   border: 1px solid $navbarBorder;
-  @include border-radius(4px);
-  @include box-shadow(#{0 1px 4px rgba(0,0,0,.065)});
+  @include border-radius($baseBorderRadius);
+  @include box-shadow(0 1px 4px rgba(0,0,0,.065));
 
   // Prevent floats from breaking the navbar
   @include clearfix();
@@ -41,6 +41,7 @@
 // Override the default collapsed state
 .nav-collapse.collapse {
   height: auto;
+  overflow: visible;
 }
 
 
@@ -152,7 +153,6 @@
 
 .navbar-static-top {
   position: static;
-  width: 100%;
   margin-bottom: 0; // remove 18px margin for default navbar
   .navbar-inner {
     @include border-radius(0);
@@ -202,7 +202,7 @@
 .navbar-fixed-top,
 .navbar-static-top {
   .navbar-inner {
-    @include box-shadow(#{inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1)});
+    @include box-shadow(0 1px 10px rgba(0,0,0,.1));
   }
 }
 
@@ -210,7 +210,7 @@
 .navbar-fixed-bottom {
   bottom: 0;
   .navbar-inner {
-    @include box-shadow(#{inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1)});
+    @include box-shadow(0 -1px 10px rgba(0,0,0,.1));
   }
 }
 
@@ -262,7 +262,7 @@
   color: $navbarLinkColorActive;
   text-decoration: none;
   background-color: $navbarLinkBackgroundActive;
-  @include box-shadow(#{inset 0 3px 8px rgba(0,0,0,.125)});
+  @include box-shadow(inset 0 3px 8px rgba(0,0,0,.125));
 }
 
 // Navbar button for toggling navbar items in responsive layouts
@@ -273,8 +273,8 @@
   padding: 7px 10px;
   margin-left: 5px;
   margin-right: 5px;
-  @include buttonBackground(darken($navbarBackgroundHighlight, 5%), darken($navbarBackground, 5%));
-  @include box-shadow(#{inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075)});
+  @include buttonBackground(darken($navbarBackgroundHighlight, 5%), darken($navbarBackground, 5.25%));
+  @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;
@@ -282,7 +282,7 @@
   height: 2px;
   background-color: #f5f5f5;
   @include border-radius(1px);
-  @include box-shadow(#{0 1px 0 rgba(0,0,0,.25)});
+  @include box-shadow(0 1px 0 rgba(0,0,0,.25));
 }
 .btn-navbar .icon-bar + .icon-bar {
   margin-top: 3px;
@@ -446,7 +446,7 @@
       color: $white;
       background-color: $navbarInverseSearchBackground;
       border-color: $navbarInverseSearchBorder;
-      @include box-shadow(#{inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)});
+      @include box-shadow(inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15));
       @include transition(none);
       @include placeholder($navbarInverseSearchPlaceholderColor);
 
@@ -458,7 +458,7 @@
         text-shadow: 0 1px 0 $white;
         background-color: $navbarInverseSearchBackgroundFocus;
         border: 0;
-        @include box-shadow(#{0 0 3px rgba(0,0,0,.15)});
+        @include box-shadow(0 0 3px rgba(0,0,0,.15));
         outline: 0;
       }
     }

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

@@ -67,7 +67,8 @@
   text-shadow: 0 -1px 0 rgba(0,0,0,.2);
   background-color: $linkColor;
 }
-.nav-list [class^="icon-"] {
+.nav-list [class^="icon-"],
+.nav-list [class*=" icon-"] {
   margin-right: 2px;
 }
 // Dividers (basically an hr) within the dropdown
@@ -123,7 +124,7 @@
 .nav-tabs > .active > a,
 .nav-tabs > .active > a:hover {
   color: $gray;
-  background-color: $white;
+  background-color: $bodyBackground;
   border: 1px solid #ddd;
   border-bottom-color: transparent;
   cursor: default;
@@ -249,7 +250,7 @@
 .nav li.dropdown.open a:hover .caret {
   border-top-color: $white;
   border-bottom-color: $white;
-  @include opacity(1);
+  @include opacity(100);
 }
 
 // Dropdowns in stacked tabs
@@ -381,4 +382,4 @@
   text-decoration: none;
   background-color: transparent;
   cursor: default;
-}
+}

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

@@ -12,29 +12,30 @@
 .pager li {
   display: inline;
 }
-.pager a,
-.pager span {
+.pager li > a,
+.pager li > span {
   display: inline-block;
   padding: 5px 14px;
   background-color: #fff;
   border: 1px solid #ddd;
   @include border-radius(15px);
 }
-.pager a:hover {
+.pager li > a:hover {
   text-decoration: none;
   background-color: #f5f5f5;
 }
-.pager .next a,
-.pager .next span {
+.pager .next > a,
+.pager .next > span {
   float: right;
 }
-.pager .previous a {
+.pager .previous > a,
+.pager .previous > span {
   float: left;
 }
-.pager .disabled a,
-.pager .disabled a:hover,
-.pager .disabled span {
+.pager .disabled > a,
+.pager .disabled > a:hover,
+.pager .disabled > span {
   color: $grayLight;
   background-color: #fff;
   cursor: default;
-}
+}

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

@@ -2,27 +2,30 @@
 // Pagination (multiple pages)
 // --------------------------------------------------
 
-
+// Space out pagination from surrounding content
 .pagination {
-  height: $baseLineHeight * 2;
   margin: $baseLineHeight 0;
- }
+}
+
 .pagination ul {
+  // Allow for text-based alignment
   display: inline-block;
   @include ie7-inline-block();
+  // Reset default ul styles
   margin-left: 0;
   margin-bottom: 0;
-  @include border-radius(3px);
-  @include box-shadow(#{0 1px 2px rgba(0,0,0,.05)});
+  // Visuals
+  @include border-radius($baseBorderRadius);
+  @include box-shadow(0 1px 2px rgba(0,0,0,.05));
 }
 .pagination ul > li {
-  display: inline;
+  display: inline; // Remove list-style and block-level defaults
 }
 .pagination ul > li > a,
 .pagination ul > li > span {
-  float: left;
-  padding: 0 14px;
-  line-height: ($baseLineHeight * 2) - 2;
+  float: left; // Collapse white-space
+  padding: 4px 12px;
+  line-height: $baseLineHeight;
   text-decoration: none;
   background-color: $paginationBackground;
   border: 1px solid $paginationBorder;
@@ -31,7 +34,7 @@
 .pagination ul > li > a:hover,
 .pagination ul > .active > a,
 .pagination ul > .active > span {
-  background-color: #f5f5f5;
+  background-color: $paginationActiveBackground;
 }
 .pagination ul > .active > a,
 .pagination ul > .active > span {
@@ -48,17 +51,71 @@
 .pagination ul > li:first-child > a,
 .pagination ul > li:first-child > span {
   border-left-width: 1px;
-  @include border-radius(3px 0 0 3px);
+  @include border-left-radius($baseBorderRadius);
 }
 .pagination ul > li:last-child > a,
 .pagination ul > li:last-child > span {
-  @include border-radius(0 3px 3px 0);
+  @include border-right-radius($baseBorderRadius);
 }
 
-// Centered
+
+// Alignment
+// --------------------------------------------------
+
 .pagination-centered {
   text-align: center;
 }
 .pagination-right {
   text-align: right;
 }
+
+
+// Sizing
+// --------------------------------------------------
+
+// Large
+.pagination-large {
+  ul > li > a,
+  ul > li > span {
+    padding: $paddingLarge;
+    font-size: $fontSizeLarge;
+  }
+  ul > li:first-child > a,
+  ul > li:first-child > span {
+    @include border-left-radius($borderRadiusLarge);
+  }
+  ul > li:last-child > a,
+  ul > li:last-child > span {
+    @include border-right-radius($borderRadiusLarge);
+  }
+}
+
+// Small and mini
+.pagination-mini,
+.pagination-small {
+  ul > li:first-child > a,
+  ul > li:first-child > span {
+    @include border-left-radius($borderRadiusSmall);
+  }
+  ul > li:last-child > a,
+  ul > li:last-child > span {
+    @include border-right-radius($borderRadiusSmall);
+  }
+}
+
+// Small
+.pagination-small {
+  ul > li > a,
+  ul > li > span {
+    padding: $paddingSmall;
+    font-size: $fontSizeSmall;
+  }
+}
+// Mini
+.pagination-mini {
+  ul > li > a,
+  ul > li > span {
+    padding: $paddingMini;
+    font-size: $fontSizeMini;
+  }
+}

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

@@ -18,13 +18,13 @@
   border: 1px solid #ccc;
   border: 1px solid rgba(0,0,0,.2);
   @include border-radius(6px);
-  @include box-shadow(#{0 5px 10px rgba(0,0,0,.2)});
+  @include box-shadow(0 5px 10px rgba(0,0,0,.2));
 
   // Offset the popover to account for the popover arrow
-  &.top     { margin-bottom: 10px; }
+  &.top     { margin-top: -10px; }
   &.right   { margin-left: 10px; }
   &.bottom  { margin-top: 10px; }
-  &.left    { margin-right: 10px; }
+  &.left    { margin-left: -10px; }
 
 }
 
@@ -114,4 +114,4 @@
       right: -1px;
     }
   }
-}
+}

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

@@ -47,8 +47,8 @@
   height: $baseLineHeight;
   margin-bottom: $baseLineHeight;
   @include gradient-vertical(#f5f5f5, #f9f9f9);
-  @include box-shadow(#{inset 0 1px 2px rgba(0,0,0,.1)});
-  @include border-radius(4px);
+  @include box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
+  @include border-radius($baseBorderRadius);
 }
 
 // Bar of progress
@@ -61,12 +61,12 @@
   text-align: center;
   text-shadow: 0 -1px 0 rgba(0,0,0,.25);
   @include gradient-vertical(#149bdf, #0480be);
-  @include box-shadow(#{inset 0 -1px 0 rgba(0,0,0,.15)});
+  @include box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
   @include box-sizing(border-box);
   @include transition(width .6s ease);
 }
 .progress .bar + .bar {
-  @include box-shadow(#{inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15)});
+  @include box-shadow(inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15));
 }
 
 // Striped bars
@@ -119,4 +119,4 @@
 }
 .progress-warning.progress-striped .bar, .progress-striped .bar-warning {
   @include gradient-striped(lighten($orange, 15%));
-}
+}

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

@@ -1,5 +1,5 @@
 //
-// Modals
+// Reset
 // Adapted from http://github.com/necolas/normalize.css
 // --------------------------------------------------
 
@@ -81,13 +81,15 @@ img {
   max-width: 100%; /* Part 1: Set a maxium relative to the parent */
   width: auto\9; /* IE7-8 need help adjusting responsive images */
   height: auto; /* Part 2: Scale the height according to the width, otherwise you get stretching */
+
   vertical-align: middle;
   border: 0;
   -ms-interpolation-mode: bicubic;
 }
 
 // Prevent max-width from affecting Google Maps
-#map_canvas img {
+#map_canvas img,
+.google-maps img {
   max-width: none;
 }
 
@@ -114,11 +116,11 @@ input::-moz-focus-inner { // Inner padding and border oddities in FF3/4
   border: 0;
 }
 button,
-input[type="button"],
+html input[type="button"], // Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls.
 input[type="reset"],
 input[type="submit"] {
-  cursor: pointer; // Cursors on all buttons applied consistently
-  -webkit-appearance: button; // Style clickable inputs in iOS
+    -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS.
+    cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others.
 }
 input[type="search"] { // Appearance in Safari/Chrome
   -webkit-box-sizing: content-box;
@@ -133,4 +135,4 @@ input[type="search"]::-webkit-search-cancel-button {
 textarea {
   overflow: auto; // Remove vertical scrollbar in IE6-9
   vertical-align: top; // Readability and alignment cross-browser
-}
+}

data/vendor/assets/stylesheets/bootstrap/_responsive-1200px-min.scss

@@ -25,4 +25,4 @@
     margin-left: 0;
   }
 
-}
+}