bootstrap-sass 2.0.4.2 → 2.1.0.0

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

@@ -1,5 +1,6 @@
-// PROGRESS BARS
-// -------------
+//
+// Progress bars
+// --------------------------------------------------
 
 
 // ANIMATIONS
@@ -8,7 +9,7 @@
 // Webkit
 @-webkit-keyframes progress-bar-stripes {
   from  { background-position: 40px 0; }
-  to    { background-position: 0 0 }
+  to    { background-position: 0 0; }
 }
 
 // Firefox
@@ -19,14 +20,14 @@
 
 // IE9
 @-ms-keyframes progress-bar-stripes {
-  from { background-position: 40px 0; }
-  to   { background-position: 0 0; }
+  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; }
+  from  { background-position: 0 0; }
+  to    { background-position: 40px 0; }
 }
 
 // Spec
@@ -43,8 +44,8 @@
 // Outer container
 .progress {
   overflow: hidden;
-  height: 18px;
-  margin-bottom: 18px;
+  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);
@@ -53,8 +54,9 @@
 // Bar of progress
 .progress .bar {
   width: 0%;
-  height: 18px;
+  height: 100%;
   color: $white;
+  float: left;
   font-size: 12px;
   text-align: center;
   text-shadow: 0 -1px 0 rgba(0,0,0,.25);
@@ -63,6 +65,9 @@
   @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)});
+}
 
 // Striped bars
 .progress-striped .bar {
@@ -85,34 +90,33 @@
 // ------
 
 // Danger (red)
-.progress-danger .bar {
+.progress-danger .bar, .progress .bar-danger {
   @include gradient-vertical(#ee5f5b, #c43c35);
 }
-.progress-danger.progress-striped .bar {
+.progress-danger.progress-striped .bar, .progress-striped .bar-danger {
   @include gradient-striped(#ee5f5b);
 }
 
 // Success (green)
-.progress-success .bar {
+.progress-success .bar, .progress .bar-success {
   @include gradient-vertical(#62c462, #57a957);
 }
-.progress-success.progress-striped .bar {
+.progress-success.progress-striped .bar, .progress-striped .bar-success {
   @include gradient-striped(#62c462);
 }
 
 // Info (teal)
-.progress-info .bar {
+.progress-info .bar, .progress .bar-info {
   @include gradient-vertical(#5bc0de, #339bb9);
 }
-.progress-info.progress-striped .bar {
+.progress-info.progress-striped .bar, .progress-striped .bar-info {
   @include gradient-striped(#5bc0de);
 }
 
 // Warning (orange)
-.progress-warning .bar {
+.progress-warning .bar, .progress .bar-warning {
   @include gradient-vertical(lighten($orange, 15%), $orange);
 }
-
-.progress-warning.progress-striped .bar {
+.progress-warning.progress-striped .bar, .progress-striped .bar-warning {
   @include gradient-striped(lighten($orange, 15%));
 }

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

@@ -1,18 +1,31 @@
-// Reset.css.scss
-// Adapted from Normalize.css http://github.com/necolas/normalize.css
-// ------------------------------------------------------------------------
+//
+// Reset
+// Adapted from http://github.com/necolas/normalize.css
+// --------------------------------------------------
+
 
 // Display in IE6-9 and FF3
 // -------------------------
 
-article, aside, details, figcaption, figure, footer, header, hgroup, nav, section {
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
   display: block;
 }
 
 // Display block in IE6-9 and FF3
 // -------------------------
 
-audio, canvas, video {
+audio,
+canvas,
+video {
   display: inline-block;
   *display: inline;
   *zoom: 1;
@@ -38,14 +51,16 @@ a:focus {
   @include tab-focus();
 }
 // Hover & Active
-a:hover, a:active {
+a:hover,
+a:active {
   outline: 0;
 }
 
 // Prevents sub and sup affecting line-height in all browsers
 // -------------------------
 
-sub, sup {
+sub,
+sup {
   position: relative;
   font-size: 75%;
   line-height: 0;
@@ -63,6 +78,7 @@ sub {
 
 img {
   max-width: 100%; // Make images inherently responsive
+  height: auto; // Make images inherently responsive
   vertical-align: middle;
   border: 0;
   -ms-interpolation-mode: bicubic;
@@ -77,20 +93,28 @@ img {
 // -------------------------
 
 // Font size in all browsers, margin changes, misc consistency
-button, input, select, textarea {
+button,
+input,
+select,
+textarea {
   margin: 0;
   font-size: 100%;
   vertical-align: middle;
 }
-button, input {
+button,
+input {
   *overflow: visible; // Inner spacing ie IE6/7
   line-height: normal; // FF3/4 have !important on line-height in UA stylesheet
 }
-button::-moz-focus-inner, input::-moz-focus-inner { // Inner padding and border oddities in FF3/4
+button::-moz-focus-inner,
+input::-moz-focus-inner { // Inner padding and border oddities in FF3/4
   padding: 0;
   border: 0;
 }
-button, input[type="button"], input[type="reset"], input[type="submit"] {
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"] {
   cursor: pointer; // Cursors on all buttons applied consistently
   -webkit-appearance: button; // Style clickable inputs in iOS
 }

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

@@ -1,23 +1,25 @@
-// LARGE DESKTOP & UP
-// ------------------
+//
+// Responsive: Large desktop and up
+// --------------------------------------------------
+
 
 @media (min-width: 1200px) {
 
   // Fixed grid
-  @include gridCore($gridColumnWidthLarge, $gridGutterWidthLarge);
+  @include grid-core($gridColumnWidth1200, $gridGutterWidth1200);
 
   // Fluid grid
-  @include gridFluid($fluidGridColumnWidthLarge, $fluidGridGutterWidthLarge);
+  @include grid-fluid($fluidGridColumnWidth1200, $fluidGridGutterWidth1200);
 
   // Input grid
-  @include gridInput($gridColumnWidthLarge, $gridGutterWidthLarge);
+  @include grid-input($gridColumnWidth1200, $gridGutterWidth1200);
 
   // Thumbnails
   .thumbnails {
-    margin-left: -30px;
+    margin-left: -$gridGutterWidth1200;
   }
   .thumbnails > li {
-    margin-left: 30px;
+    margin-left: $gridGutterWidth1200;
   }
   .row-fluid .thumbnails {
     margin-left: 0;

data/vendor/assets/stylesheets/bootstrap/_responsive-767px-max.scss

@@ -1,72 +1,8 @@
-// UP TO LANDSCAPE PHONE
-// ---------------------
-
-@media (max-width: 480px) {
-
-  // Smooth out the collapsing/expanding nav
-  .nav-collapse {
-    -webkit-transform: translate3d(0, 0, 0); // activate the GPU
-  }
-
-  // Block level the page header small tag for readability
-  .page-header h1 small {
-    display: block;
-    line-height: $baseLineHeight;
-  }
-
-  // Update checkboxes for iOS
-  input[type="checkbox"], input[type="radio"] {
-    border: 1px solid #ccc;
-  }
-
-  // Remove the horizontal form styles
-  .form-horizontal .control-group > label {
-    float: none;
-    width: auto;
-    padding-top: 0;
-    text-align: left;
-  }
-  // Move over all input controls and content
-  .form-horizontal .controls {
-    margin-left: 0;
-  }
-  // Move the options list down to align with labels
-  .form-horizontal .control-list {
-    padding-top: 0; // has to be padding because margin collaspes
-  }
-  // Move over buttons in .form-actions to align with .controls
-  .form-horizontal .form-actions {
-    padding-left: 10px;
-    padding-right: 10px;
-  }
-
-  // Modals
-  .modal {
-    position: absolute;
-    top:   10px;
-    left:  10px;
-    right: 10px;
-    width: auto;
-    margin: 0;
-    &.fade.in { top: auto; }
-  }
-  .modal-header .close {
-    padding: 10px;
-    margin: -10px;
-  }
-
-  // Carousel
-  .carousel-caption {
-    position: static;
-  }
-
-}
-
-
-
-// LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
+//
+// Responsive: Landscape phone to desktop/tablet
 // --------------------------------------------------
 
+
 @media (max-width: 767px) {
 
   // Padding to set content in a bit
@@ -75,7 +11,8 @@
     padding-right: 20px;
   }
   // Negative indent the now static "fixed" navbar
-  .navbar-fixed-top, .navbar-fixed-bottom {
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
     margin-left: -20px;
     margin-right: -20px;
   }
@@ -110,27 +47,121 @@
     width: 100%;
   }
   // Undo negative margin on rows and thumbnails
-  .row, .thumbnails {
+  .row,
+  .thumbnails {
     margin-left: 0;
   }
+  .thumbnails > li {
+    float: none;
+    margin-left: 0; // Reset the default margin for all li elements when no .span* classes are present
+  }
   // Make all grid-sized elements block level again
-  [class*="span"], .row-fluid [class*="span"] {
+  [class*="span"],
+  .row-fluid [class*="span"] {
     float: none;
     display: block;
     width: auto;
     margin-left: 0;
   }
+  .span12,
+  .row-fluid .span12 {
+    width: 100%;
+    @include box-sizing(border-box);
+  }
 
   // FORM FIELDS
   // -----------
   // Make span* classes full width
-  .input-large, .input-xlarge, .input-xxlarge, input[class*="span"], select[class*="span"], textarea[class*="span"], .uneditable-input {
+  .input-large,
+  .input-xlarge,
+  .input-xxlarge,
+  input[class*="span"],
+  select[class*="span"],
+  textarea[class*="span"],
+  .uneditable-input {
     @include input-block-level();
   }
   // But don't let it screw up prepend/append inputs
-  .input-prepend input, .input-append input, .input-prepend input[class*="span"], .input-append input[class*="span"] {
+  .input-prepend input,
+  .input-append input,
+  .input-prepend input[class*="span"],
+  .input-append input[class*="span"] {
     display: inline-block; // redeclare so they don't wrap to new lines
     width: auto;
   }
 
+  // Modals
+  .modal {
+    position: fixed;
+    top:   20px;
+    left:  20px;
+    right: 20px;
+    width: auto;
+    margin: 0;
+    &.fade.in { top: auto; }
+  }
+
 }
+
+
+
+// UP TO LANDSCAPE PHONE
+// ---------------------
+
+@media (max-width: 480px) {
+
+  // Smooth out the collapsing/expanding nav
+  .nav-collapse {
+    -webkit-transform: translate3d(0, 0, 0); // activate the GPU
+  }
+
+  // Block level the page header small tag for readability
+  .page-header h1 small {
+    display: block;
+    line-height: $baseLineHeight;
+  }
+
+  // Update checkboxes for iOS
+  input[type="checkbox"],
+  input[type="radio"] {
+    border: 1px solid #ccc;
+  }
+
+  // Remove the horizontal form styles
+  .form-horizontal .control-group > label {
+    float: none;
+    width: auto;
+    padding-top: 0;
+    text-align: left;
+  }
+  // Move over all input controls and content
+  .form-horizontal .controls {
+    margin-left: 0;
+  }
+  // Move the options list down to align with labels
+  .form-horizontal .control-list {
+    padding-top: 0; // has to be padding because margin collaspes
+  }
+  // Move over buttons in .form-actions to align with .controls
+  .form-horizontal .form-actions {
+    padding-left: 10px;
+    padding-right: 10px;
+  }
+
+  // Modals
+  .modal {
+    top:   10px;
+    left:  10px;
+    right: 10px;
+  }
+  .modal-header .close {
+    padding: 10px;
+    margin: -10px;
+  }
+
+  // Carousel
+  .carousel-caption {
+    position: static;
+  }
+
+}

data/vendor/assets/stylesheets/bootstrap/_responsive-768px-979px.scss

@@ -1,16 +1,19 @@
-// PORTRAIT TABLET TO DEFAULT DESKTOP
-// ----------------------------------
+//
+// Responsive: Tablet to desktop
+// --------------------------------------------------
+
 
 @media (min-width: 768px) and (max-width: 979px) {
 
   // Fixed grid
-  @include gridCore($gridColumnWidthTablet, $gridGutterWidthTablet);
+  @include grid-core($gridColumnWidth768, $gridGutterWidth768);
 
   // Fluid grid
-  @include gridFluid($fluidGridColumnWidthTablet, $fluidGridGutterWidthTablet);
+  @include grid-fluid($fluidGridColumnWidth768, $fluidGridGutterWidth768);
 
   // Input grid
-  @include gridInput($gridColumnWidthTablet, $gridGutterWidthTablet);
+  @include grid-input($gridColumnWidth768, $gridGutterWidth768);
 
   // No need to reset .thumbnails here since it's the same $gridGutterWidth
+
 }