bootstrap-sass-rails 3.0.0.3 → 3.0.3.0

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

@@ -82,13 +82,14 @@ input[type="number"] {
   }
 }
 
-
-// Placeholder
-//
-// Placeholder text gets special styles because when browsers invalidate entire
-// lines if it doesn't understand a selector/
-.form-control {
-  @include placeholder();
+// Adjust output element
+output {
+  display: block;
+  padding-top: ($padding-base-vertical + 1);
+  font-size: $font-size-base;
+  line-height: $line-height-base;
+  color: $input-color;
+  vertical-align: middle;
 }
 
 
@@ -124,6 +125,7 @@ input[type="number"] {
   color: $input-color;
   vertical-align: middle;
   background-color: $input-bg;
+  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
   border: 1px solid $input-border;
   border-radius: $input-border-radius;
   @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
@@ -132,6 +134,12 @@ input[type="number"] {
   // Customize the `:focus` state to imitate native WebKit styles.
   @include form-control-focus();
 
+  // Placeholder
+  //
+  // Placeholder text gets special styles because when browsers invalidate entire
+  // lines if it doesn't understand a selector/
+  @include placeholder();
+
   // Disabled and read-only inputs
   // Note: HTML5 says that controls under a fieldset > legend:first-child won't
   // be disabled if the fieldset is disabled. Due to implementation difficulty,
@@ -144,6 +152,7 @@ input[type="number"] {
   }
 }
 
+
 // Reset height for `textarea`s
 textarea.form-control {
   height: auto;
@@ -254,7 +263,6 @@ input[type="checkbox"],
 
 .form-control-static {
   margin-bottom: 0; // Remove default margin from `p`
-  padding-top: ($padding-base-vertical + 1);
 }
 
 
@@ -286,7 +294,7 @@ input[type="checkbox"],
 .form-inline {
 
   // Kick in the inline
-  @media (min-width: $screen-tablet) {
+  @media (min-width: $screen-sm) {
     // Inline-block all the things for "inline"
     .form-group  {
       display: inline-block;
@@ -299,6 +307,11 @@ input[type="checkbox"],
       display: inline-block;
     }
 
+    // Override `width: 100%;` when not within a `.form-group`
+    select.form-control {
+      width: auto;
+    }
+
     // Remove default margin on radios/checkboxes that were used for stacking, and
     // then undo the floating of radios and checkboxes to match (which also avoids
     // a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969).
@@ -335,14 +348,24 @@ input[type="checkbox"],
     margin-bottom: 0;
     padding-top: ($padding-base-vertical + 1); // Default padding plus a border
   }
+  // Account for padding we're adding to ensure the alignment and of help text
+  // and other content below items
+  .radio,
+  .checkbox {
+    min-height: $line-height-computed + ($padding-base-vertical + 1);
+  }
 
   // Make form groups behave like rows
   .form-group {
     @include make-row();
   }
 
+  .form-control-static {
+    padding-top: ($padding-base-vertical + 1);
+  }
+
   // Only right align form labels here when the columns stop stacking
-  @media (min-width: $screen-tablet) {
+  @media (min-width: $screen-sm-min) {
     .control-label {
       text-align: right;
     }

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

@@ -27,6 +27,11 @@
   font-weight: normal;
   line-height: 1;
   -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+
+  &:empty {
+    width: 1em;
+  }
 }
 
 // Individual icons
@@ -68,6 +73,7 @@
 .glyphicon-repeat                 { &:before { content: "\e030"; } }
 .glyphicon-refresh                { &:before { content: "\e031"; } }
 .glyphicon-list-alt               { &:before { content: "\e032"; } }
+.glyphicon-lock                   { &:before { content: "\e033"; } }
 .glyphicon-flag                   { &:before { content: "\e034"; } }
 .glyphicon-headphones             { &:before { content: "\e035"; } }
 .glyphicon-volume-off             { &:before { content: "\e036"; } }
@@ -78,7 +84,9 @@
 .glyphicon-tag                    { &:before { content: "\e041"; } }
 .glyphicon-tags                   { &:before { content: "\e042"; } }
 .glyphicon-book                   { &:before { content: "\e043"; } }
+.glyphicon-bookmark               { &:before { content: "\e044"; } }
 .glyphicon-print                  { &:before { content: "\e045"; } }
+.glyphicon-camera                 { &:before { content: "\e046"; } }
 .glyphicon-font                   { &:before { content: "\e047"; } }
 .glyphicon-bold                   { &:before { content: "\e048"; } }
 .glyphicon-italic                 { &:before { content: "\e049"; } }
@@ -132,10 +140,12 @@
 .glyphicon-exclamation-sign       { &:before { content: "\e101"; } }
 .glyphicon-gift                   { &:before { content: "\e102"; } }
 .glyphicon-leaf                   { &:before { content: "\e103"; } }
+.glyphicon-fire                   { &:before { content: "\e104"; } }
 .glyphicon-eye-open               { &:before { content: "\e105"; } }
 .glyphicon-eye-close              { &:before { content: "\e106"; } }
 .glyphicon-warning-sign           { &:before { content: "\e107"; } }
 .glyphicon-plane                  { &:before { content: "\e108"; } }
+.glyphicon-calendar               { &:before { content: "\e109"; } }
 .glyphicon-random                 { &:before { content: "\e110"; } }
 .glyphicon-comment                { &:before { content: "\e111"; } }
 .glyphicon-magnet                 { &:before { content: "\e112"; } }
@@ -149,6 +159,7 @@
 .glyphicon-resize-horizontal      { &:before { content: "\e120"; } }
 .glyphicon-hdd                    { &:before { content: "\e121"; } }
 .glyphicon-bullhorn               { &:before { content: "\e122"; } }
+.glyphicon-bell                   { &:before { content: "\e123"; } }
 .glyphicon-certificate            { &:before { content: "\e124"; } }
 .glyphicon-thumbs-up              { &:before { content: "\e125"; } }
 .glyphicon-thumbs-down            { &:before { content: "\e126"; } }
@@ -161,13 +172,17 @@
 .glyphicon-circle-arrow-up        { &:before { content: "\e133"; } }
 .glyphicon-circle-arrow-down      { &:before { content: "\e134"; } }
 .glyphicon-globe                  { &:before { content: "\e135"; } }
+.glyphicon-wrench                 { &:before { content: "\e136"; } }
 .glyphicon-tasks                  { &:before { content: "\e137"; } }
 .glyphicon-filter                 { &:before { content: "\e138"; } }
+.glyphicon-briefcase              { &:before { content: "\e139"; } }
 .glyphicon-fullscreen             { &:before { content: "\e140"; } }
 .glyphicon-dashboard              { &:before { content: "\e141"; } }
+.glyphicon-paperclip              { &:before { content: "\e142"; } }
 .glyphicon-heart-empty            { &:before { content: "\e143"; } }
 .glyphicon-link                   { &:before { content: "\e144"; } }
 .glyphicon-phone                  { &:before { content: "\e145"; } }
+.glyphicon-pushpin                { &:before { content: "\e146"; } }
 .glyphicon-usd                    { &:before { content: "\e148"; } }
 .glyphicon-gbp                    { &:before { content: "\e149"; } }
 .glyphicon-sort                   { &:before { content: "\e150"; } }
@@ -220,13 +235,3 @@
 .glyphicon-cloud-upload           { &:before { content: "\e198"; } }
 .glyphicon-tree-conifer           { &:before { content: "\e199"; } }
 .glyphicon-tree-deciduous         { &:before { content: "\e200"; } }
-.glyphicon-briefcase              { &:before { content: "\1f4bc"; } }
-.glyphicon-calendar               { &:before { content: "\1f4c5"; } }
-.glyphicon-pushpin                { &:before { content: "\1f4cc"; } }
-.glyphicon-paperclip              { &:before { content: "\1f4ce"; } }
-.glyphicon-camera                 { &:before { content: "\1f4f7"; } }
-.glyphicon-lock                   { &:before { content: "\1f512"; } }
-.glyphicon-bell                   { &:before { content: "\1f514"; } }
-.glyphicon-bookmark               { &:before { content: "\1f516"; } }
-.glyphicon-fire                   { &:before { content: "\1f525"; } }
-.glyphicon-wrench                 { &:before { content: "\1f527"; } }

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

@@ -2,10 +2,19 @@
 // Grid system
 // --------------------------------------------------
 
-
 // Set the container width, and override it for fixed navbars in media queries
 .container {
   @include container-fixed();
+
+  @media (min-width: $screen-sm) {
+    width: $container-sm;
+  }
+  @media (min-width: $screen-md) {
+    width: $container-md;
+  }
+  @media (min-width: $screen-lg-min) {
+    width: $container-lg;
+  }
 }
 
 // mobile first defaults
@@ -14,333 +23,56 @@
 }
 
 // Common styles for small and large grid columns
-.col-xs-1,
-.col-xs-2,
-.col-xs-3,
-.col-xs-4,
-.col-xs-5,
-.col-xs-6,
-.col-xs-7,
-.col-xs-8,
-.col-xs-9,
-.col-xs-10,
-.col-xs-11,
-.col-xs-12,
-.col-sm-1,
-.col-sm-2,
-.col-sm-3,
-.col-sm-4,
-.col-sm-5,
-.col-sm-6,
-.col-sm-7,
-.col-sm-8,
-.col-sm-9,
-.col-sm-10,
-.col-sm-11,
-.col-sm-12,
-.col-md-1,
-.col-md-2,
-.col-md-3,
-.col-md-4,
-.col-md-5,
-.col-md-6,
-.col-md-7,
-.col-md-8,
-.col-md-9,
-.col-md-10,
-.col-md-11,
-.col-md-12,
-.col-lg-1,
-.col-lg-2,
-.col-lg-3,
-.col-lg-4,
-.col-lg-5,
-.col-lg-6,
-.col-lg-7,
-.col-lg-8,
-.col-lg-9,
-.col-lg-10,
-.col-lg-11,
-.col-lg-12 {
-  position: relative;
-  // Prevent columns from collapsing when empty
-  min-height: 1px;
-  // Inner gutter via padding
-  padding-left:  ($grid-gutter-width / 2);
-  padding-right: ($grid-gutter-width / 2);
-}
+@include make-grid-columns();
 
 
 // Extra small grid
 //
-// Grid classes for extra small devices like smartphones. No offset, push, or
-// pull classes are present here due to the size of the target.
-//
-// Note that `.col-xs-12` doesn't get floated on purpose—there's no need since
-// it's full-width.
+// Columns, offsets, pushes, and pulls for extra small devices like
+// smartphones.
 
-.col-xs-1,
-.col-xs-2,
-.col-xs-3,
-.col-xs-4,
-.col-xs-5,
-.col-xs-6,
-.col-xs-7,
-.col-xs-8,
-.col-xs-9,
-.col-xs-10,
-.col-xs-11 {
-  float: left;
-}
-.col-xs-1  { width: percentage((1 / $grid-columns)); }
-.col-xs-2  { width: percentage((2 / $grid-columns)); }
-.col-xs-3  { width: percentage((3 / $grid-columns)); }
-.col-xs-4  { width: percentage((4 / $grid-columns)); }
-.col-xs-5  { width: percentage((5 / $grid-columns)); }
-.col-xs-6  { width: percentage((6 / $grid-columns)); }
-.col-xs-7  { width: percentage((7 / $grid-columns)); }
-.col-xs-8  { width: percentage((8 / $grid-columns)); }
-.col-xs-9  { width: percentage((9 / $grid-columns)); }
-.col-xs-10 { width: percentage((10/ $grid-columns)); }
-.col-xs-11 { width: percentage((11/ $grid-columns)); }
-.col-xs-12 { width: 100%; }
+@include make-grid-columns-float(xs);
+@include make-grid($grid-columns, xs, width);
+@include make-grid($grid-columns, xs, pull);
+@include make-grid($grid-columns, xs, push);
+@include make-grid($grid-columns, xs, offset);
 
 
 // Small grid
 //
 // Columns, offsets, pushes, and pulls for the small device range, from phones
 // to tablets.
-//
-// Note that `.col-sm-12` doesn't get floated on purpose—there's no need since
-// it's full-width.
-
-@media (min-width: $screen-tablet) {
-  .container {
-    max-width: $container-tablet;
-  }
-
-  .col-sm-1,
-  .col-sm-2,
-  .col-sm-3,
-  .col-sm-4,
-  .col-sm-5,
-  .col-sm-6,
-  .col-sm-7,
-  .col-sm-8,
-  .col-sm-9,
-  .col-sm-10,
-  .col-sm-11 {
-    float: left;
-  }
-  .col-sm-1  { width: percentage((1 / $grid-columns)); }
-  .col-sm-2  { width: percentage((2 / $grid-columns)); }
-  .col-sm-3  { width: percentage((3 / $grid-columns)); }
-  .col-sm-4  { width: percentage((4 / $grid-columns)); }
-  .col-sm-5  { width: percentage((5 / $grid-columns)); }
-  .col-sm-6  { width: percentage((6 / $grid-columns)); }
-  .col-sm-7  { width: percentage((7 / $grid-columns)); }
-  .col-sm-8  { width: percentage((8 / $grid-columns)); }
-  .col-sm-9  { width: percentage((9 / $grid-columns)); }
-  .col-sm-10 { width: percentage((10/ $grid-columns)); }
-  .col-sm-11 { width: percentage((11/ $grid-columns)); }
-  .col-sm-12 { width: 100%; }
-
-  // Push and pull columns for source order changes
-  .col-sm-push-1  { left: percentage((1 / $grid-columns)); }
-  .col-sm-push-2  { left: percentage((2 / $grid-columns)); }
-  .col-sm-push-3  { left: percentage((3 / $grid-columns)); }
-  .col-sm-push-4  { left: percentage((4 / $grid-columns)); }
-  .col-sm-push-5  { left: percentage((5 / $grid-columns)); }
-  .col-sm-push-6  { left: percentage((6 / $grid-columns)); }
-  .col-sm-push-7  { left: percentage((7 / $grid-columns)); }
-  .col-sm-push-8  { left: percentage((8 / $grid-columns)); }
-  .col-sm-push-9  { left: percentage((9 / $grid-columns)); }
-  .col-sm-push-10 { left: percentage((10/ $grid-columns)); }
-  .col-sm-push-11 { left: percentage((11/ $grid-columns)); }
 
-  .col-sm-pull-1  { right: percentage((1 / $grid-columns)); }
-  .col-sm-pull-2  { right: percentage((2 / $grid-columns)); }
-  .col-sm-pull-3  { right: percentage((3 / $grid-columns)); }
-  .col-sm-pull-4  { right: percentage((4 / $grid-columns)); }
-  .col-sm-pull-5  { right: percentage((5 / $grid-columns)); }
-  .col-sm-pull-6  { right: percentage((6 / $grid-columns)); }
-  .col-sm-pull-7  { right: percentage((7 / $grid-columns)); }
-  .col-sm-pull-8  { right: percentage((8 / $grid-columns)); }
-  .col-sm-pull-9  { right: percentage((9 / $grid-columns)); }
-  .col-sm-pull-10 { right: percentage((10/ $grid-columns)); }
-  .col-sm-pull-11 { right: percentage((11/ $grid-columns)); }
-
-  // Offsets
-  .col-sm-offset-1  { margin-left: percentage((1 / $grid-columns)); }
-  .col-sm-offset-2  { margin-left: percentage((2 / $grid-columns)); }
-  .col-sm-offset-3  { margin-left: percentage((3 / $grid-columns)); }
-  .col-sm-offset-4  { margin-left: percentage((4 / $grid-columns)); }
-  .col-sm-offset-5  { margin-left: percentage((5 / $grid-columns)); }
-  .col-sm-offset-6  { margin-left: percentage((6 / $grid-columns)); }
-  .col-sm-offset-7  { margin-left: percentage((7 / $grid-columns)); }
-  .col-sm-offset-8  { margin-left: percentage((8 / $grid-columns)); }
-  .col-sm-offset-9  { margin-left: percentage((9 / $grid-columns)); }
-  .col-sm-offset-10 { margin-left: percentage((10/ $grid-columns)); }
-  .col-sm-offset-11 { margin-left: percentage((11/ $grid-columns)); }
+@media (min-width: $screen-sm-min) {
+  @include make-grid-columns-float(sm);
+  @include make-grid($grid-columns, sm, width);
+  @include make-grid($grid-columns, sm, pull);
+  @include make-grid($grid-columns, sm, push);
+  @include make-grid($grid-columns, sm, offset);
 }
 
 
 // Medium grid
 //
 // Columns, offsets, pushes, and pulls for the desktop device range.
-//
-// Note that `.col-md-12` doesn't get floated on purpose—there's no need since
-// it's full-width.
-
-@media (min-width: $screen-desktop) {
-  .container {
-    max-width: $container-desktop;
-  }
-  .col-md-1,
-  .col-md-2,
-  .col-md-3,
-  .col-md-4,
-  .col-md-5,
-  .col-md-6,
-  .col-md-7,
-  .col-md-8,
-  .col-md-9,
-  .col-md-10,
-  .col-md-11 {
-    float: left;
-  }
-  .col-md-1  { width: percentage((1 / $grid-columns)); }
-  .col-md-2  { width: percentage((2 / $grid-columns)); }
-  .col-md-3  { width: percentage((3 / $grid-columns)); }
-  .col-md-4  { width: percentage((4 / $grid-columns)); }
-  .col-md-5  { width: percentage((5 / $grid-columns)); }
-  .col-md-6  { width: percentage((6 / $grid-columns)); }
-  .col-md-7  { width: percentage((7 / $grid-columns)); }
-  .col-md-8  { width: percentage((8 / $grid-columns)); }
-  .col-md-9  { width: percentage((9 / $grid-columns)); }
-  .col-md-10 { width: percentage((10/ $grid-columns)); }
-  .col-md-11 { width: percentage((11/ $grid-columns)); }
-  .col-md-12 { width: 100%; }
-
-  // Push and pull columns for source order changes
-  .col-md-push-0  { left: auto; }
-  .col-md-push-1  { left: percentage((1 / $grid-columns)); }
-  .col-md-push-2  { left: percentage((2 / $grid-columns)); }
-  .col-md-push-3  { left: percentage((3 / $grid-columns)); }
-  .col-md-push-4  { left: percentage((4 / $grid-columns)); }
-  .col-md-push-5  { left: percentage((5 / $grid-columns)); }
-  .col-md-push-6  { left: percentage((6 / $grid-columns)); }
-  .col-md-push-7  { left: percentage((7 / $grid-columns)); }
-  .col-md-push-8  { left: percentage((8 / $grid-columns)); }
-  .col-md-push-9  { left: percentage((9 / $grid-columns)); }
-  .col-md-push-10 { left: percentage((10/ $grid-columns)); }
-  .col-md-push-11 { left: percentage((11/ $grid-columns)); }
-
-  .col-md-pull-0  { right: auto; }
-  .col-md-pull-1  { right: percentage((1 / $grid-columns)); }
-  .col-md-pull-2  { right: percentage((2 / $grid-columns)); }
-  .col-md-pull-3  { right: percentage((3 / $grid-columns)); }
-  .col-md-pull-4  { right: percentage((4 / $grid-columns)); }
-  .col-md-pull-5  { right: percentage((5 / $grid-columns)); }
-  .col-md-pull-6  { right: percentage((6 / $grid-columns)); }
-  .col-md-pull-7  { right: percentage((7 / $grid-columns)); }
-  .col-md-pull-8  { right: percentage((8 / $grid-columns)); }
-  .col-md-pull-9  { right: percentage((9 / $grid-columns)); }
-  .col-md-pull-10 { right: percentage((10/ $grid-columns)); }
-  .col-md-pull-11 { right: percentage((11/ $grid-columns)); }
 
-  // Offsets
-  .col-md-offset-0  { margin-left: 0; }
-  .col-md-offset-1  { margin-left: percentage((1 / $grid-columns)); }
-  .col-md-offset-2  { margin-left: percentage((2 / $grid-columns)); }
-  .col-md-offset-3  { margin-left: percentage((3 / $grid-columns)); }
-  .col-md-offset-4  { margin-left: percentage((4 / $grid-columns)); }
-  .col-md-offset-5  { margin-left: percentage((5 / $grid-columns)); }
-  .col-md-offset-6  { margin-left: percentage((6 / $grid-columns)); }
-  .col-md-offset-7  { margin-left: percentage((7 / $grid-columns)); }
-  .col-md-offset-8  { margin-left: percentage((8 / $grid-columns)); }
-  .col-md-offset-9  { margin-left: percentage((9 / $grid-columns)); }
-  .col-md-offset-10 { margin-left: percentage((10/ $grid-columns)); }
-  .col-md-offset-11 { margin-left: percentage((11/ $grid-columns)); }
+@media (min-width: $screen-md-min) {
+  @include make-grid-columns-float(md);
+  @include make-grid($grid-columns, md, width);
+  @include make-grid($grid-columns, md, pull);
+  @include make-grid($grid-columns, md, push);
+  @include make-grid($grid-columns, md, offset);
 }
 
 
 // Large grid
 //
 // Columns, offsets, pushes, and pulls for the large desktop device range.
-//
-// Note that `.col-lg-12` doesn't get floated on purpose—there's no need since
-// it's full-width.
-
-@media (min-width: $screen-lg-desktop) {
-  .container {
-    max-width: $container-lg-desktop;
-  }
-
-  .col-lg-1,
-  .col-lg-2,
-  .col-lg-3,
-  .col-lg-4,
-  .col-lg-5,
-  .col-lg-6,
-  .col-lg-7,
-  .col-lg-8,
-  .col-lg-9,
-  .col-lg-10,
-  .col-lg-11 {
-    float: left;
-  }
-  .col-lg-1  { width: percentage((1 / $grid-columns)); }
-  .col-lg-2  { width: percentage((2 / $grid-columns)); }
-  .col-lg-3  { width: percentage((3 / $grid-columns)); }
-  .col-lg-4  { width: percentage((4 / $grid-columns)); }
-  .col-lg-5  { width: percentage((5 / $grid-columns)); }
-  .col-lg-6  { width: percentage((6 / $grid-columns)); }
-  .col-lg-7  { width: percentage((7 / $grid-columns)); }
-  .col-lg-8  { width: percentage((8 / $grid-columns)); }
-  .col-lg-9  { width: percentage((9 / $grid-columns)); }
-  .col-lg-10 { width: percentage((10/ $grid-columns)); }
-  .col-lg-11 { width: percentage((11/ $grid-columns)); }
-  .col-lg-12 { width: 100%; }
-
-  // Push and pull columns for source order changes
-  .col-lg-push-0  { left: auto; }
-  .col-lg-push-1  { left: percentage((1 / $grid-columns)); }
-  .col-lg-push-2  { left: percentage((2 / $grid-columns)); }
-  .col-lg-push-3  { left: percentage((3 / $grid-columns)); }
-  .col-lg-push-4  { left: percentage((4 / $grid-columns)); }
-  .col-lg-push-5  { left: percentage((5 / $grid-columns)); }
-  .col-lg-push-6  { left: percentage((6 / $grid-columns)); }
-  .col-lg-push-7  { left: percentage((7 / $grid-columns)); }
-  .col-lg-push-8  { left: percentage((8 / $grid-columns)); }
-  .col-lg-push-9  { left: percentage((9 / $grid-columns)); }
-  .col-lg-push-10 { left: percentage((10/ $grid-columns)); }
-  .col-lg-push-11 { left: percentage((11/ $grid-columns)); }
-
-  .col-lg-pull-0  { right: auto; }
-  .col-lg-pull-1  { right: percentage((1 / $grid-columns)); }
-  .col-lg-pull-2  { right: percentage((2 / $grid-columns)); }
-  .col-lg-pull-3  { right: percentage((3 / $grid-columns)); }
-  .col-lg-pull-4  { right: percentage((4 / $grid-columns)); }
-  .col-lg-pull-5  { right: percentage((5 / $grid-columns)); }
-  .col-lg-pull-6  { right: percentage((6 / $grid-columns)); }
-  .col-lg-pull-7  { right: percentage((7 / $grid-columns)); }
-  .col-lg-pull-8  { right: percentage((8 / $grid-columns)); }
-  .col-lg-pull-9  { right: percentage((9 / $grid-columns)); }
-  .col-lg-pull-10 { right: percentage((10/ $grid-columns)); }
-  .col-lg-pull-11 { right: percentage((11/ $grid-columns)); }
 
-  // Offsets
-  .col-lg-offset-0  { margin-left: 0; }
-  .col-lg-offset-1  { margin-left: percentage((1 / $grid-columns)); }
-  .col-lg-offset-2  { margin-left: percentage((2 / $grid-columns)); }
-  .col-lg-offset-3  { margin-left: percentage((3 / $grid-columns)); }
-  .col-lg-offset-4  { margin-left: percentage((4 / $grid-columns)); }
-  .col-lg-offset-5  { margin-left: percentage((5 / $grid-columns)); }
-  .col-lg-offset-6  { margin-left: percentage((6 / $grid-columns)); }
-  .col-lg-offset-7  { margin-left: percentage((7 / $grid-columns)); }
-  .col-lg-offset-8  { margin-left: percentage((8 / $grid-columns)); }
-  .col-lg-offset-9  { margin-left: percentage((9 / $grid-columns)); }
-  .col-lg-offset-10 { margin-left: percentage((10/ $grid-columns)); }
-  .col-lg-offset-11 { margin-left: percentage((11/ $grid-columns)); }
+@media (min-width: $screen-lg-min) {
+  @include make-grid-columns-float(lg);
+  @include make-grid($grid-columns, lg, width);
+  @include make-grid($grid-columns, lg, pull);
+  @include make-grid($grid-columns, lg, push);
+  @include make-grid($grid-columns, lg, offset);
 }

data/app/assets/stylesheets/twitter/bootstrap/_input-groups.scss

@@ -10,7 +10,7 @@
   border-collapse: separate; // prevent input groups from inheriting border styles from table cells when placed within a table
 
   // Undo padding and float of grid classes
-  &.col {
+  &[class*="col-"] {
     float: none;
     padding-left: 0;
     padding-right: 0;
@@ -61,6 +61,7 @@
   font-size: $font-size-base;
   font-weight: normal;
   line-height: 1;
+  color: $input-color;
   text-align: center;
   background-color: $input-group-addon-bg;
   border: 1px solid $input-group-addon-border-color;
@@ -112,6 +113,14 @@
 .input-group-btn {
   position: relative;
   white-space: nowrap;
+
+  // Negative margin to only have a 1px border between the two
+  &:first-child > .btn {
+    margin-right: -1px;
+  }
+  &:last-child > .btn {
+    margin-left: -1px;
+  }
 }
 .input-group-btn > .btn {
   position: relative;

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

@@ -6,13 +6,14 @@
 .jumbotron {
   padding: $jumbotron-padding;
   margin-bottom: $jumbotron-padding;
-  font-size: ($font-size-base * 1.5);
+  font-size: $jumbotron-font-size;
   font-weight: 200;
   line-height: ($line-height-base * 1.5);
   color: $jumbotron-color;
   background-color: $jumbotron-bg;
 
-  h1 {
+  h1,
+  .h1 {
     line-height: 1;
     color: $jumbotron-heading-color;
   }
@@ -24,7 +25,11 @@
     border-radius: $border-radius-large; // Only round corners at higher resolutions if contained in a container
   }
 
-  @media screen and (min-width: $screen-tablet) {
+  .container {
+    max-width: 100%;
+  }
+
+  @media screen and (min-width: $screen-sm-min) {
     padding-top:    ($jumbotron-padding * 1.6);
     padding-bottom: ($jumbotron-padding * 1.6);
 
@@ -33,7 +38,8 @@
       padding-right: ($jumbotron-padding * 2);
     }
 
-    h1 {
+    h1,
+    .h1 {
       font-size: ($font-size-base * 4.5);
     }
   }

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

@@ -28,6 +28,12 @@
   &:empty {
     display: none;
   }
+
+  // Quick fix for labels in buttons
+  .btn & {
+    position: relative;
+    top: -1px;
+  }
 }
 
 // Colors