anjlab-bootstrap-rails 3.0.0.0.alpha1 → 3.0.0.rc1

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

@@ -0,0 +1,155 @@
+//
+// Grid system
+// --------------------------------------------------
+
+// Set the container width, and override it for fixed navbars in media queries
+.container {
+  @include container-fixed();
+}
+
+// Mobile-first defaults
+.row {
+  @include make-row();
+}
+
+// Common styles for small and large grid columns
+.col-1,
+.col-2,
+.col-3,
+.col-4,
+.col-5,
+.col-6,
+.col-7,
+.col-8,
+.col-9,
+.col-10,
+.col-11,
+.col-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-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);
+}
+
+
+
+//
+// Container and grid column sizing
+//
+
+// Tiny device columns (smartphones)
+.col-1,
+.col-2,
+.col-3,
+.col-4,
+.col-5,
+.col-6,
+.col-7,
+.col-8,
+.col-9,
+.col-10,
+.col-11,
+.col-12 {
+  float: left;
+}
+
+@for $i from 1 through $grid-columns {
+  .col-#{$i}  { width: percentage(($i / $grid-columns)); }
+}
+
+// Small device columns (phones to tablets)
+@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,
+  .col-sm-12 {
+    float: left;
+  }
+
+  @for $i from 1 through $grid-columns {
+    .col-sm-#{$i}  { width: percentage(($i / $grid-columns)); }
+  }
+
+  // Push and pull columns for source order changes
+  @for $i from 1 through $grid-columns - 1 {
+    .col-push-#{$i}  { left: percentage(($i / $grid-columns)); }
+  }
+
+  @for $i from 1 through $grid-columns - 1 {
+    .col-pull-#{$i}  { right: percentage(($i / $grid-columns)); }
+  }
+}
+
+// Medium and large device columns (desktop and up)
+@media (min-width: $screen-desktop) {
+  .container {
+    max-width: $container-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,
+  .col-lg-12 {
+    float: left;
+  }
+  @for $i from 1 through $grid-columns {
+    .col-lg-#{$i}  { width: percentage(($i / $grid-columns)); }
+  }
+
+  // Offsets
+  @for $i from 1 through $grid-columns - 1 {
+    .col-offset-#{$i}  { margin-left: percentage(($i / $grid-columns)); }
+  }
+}
+
+// Large desktops and up
+@media (min-width: $screen-large-desktop) {
+  .container {
+    max-width: $container-large-desktop;
+  }
+}

data/{vendor → app}/assets/stylesheets/twitter/bootstrap/_jumbotron.scss

@@ -18,13 +18,10 @@
   p {
     line-height: 1.4;
   }
-}
 
-@media screen and (min-width: $screen-tablet) {
-  .jumbotron {
+  @media screen and (min-width: $screen-tablet) {
     padding: 50px 60px;
     border-radius: $border-radius-large; // Only round corners at higher resolutions
-
     h1 {
       font-size: ($font-size-base * 4.5);
     }

data/{vendor → app}/assets/stylesheets/twitter/bootstrap/_labels.scss

@@ -8,7 +8,7 @@
   font-size: 75%;
   font-weight: 500;
   line-height: 1;
-  color: #fff;
+  color: $label-color;
   text-align: center;
   white-space: nowrap;
   vertical-align: middle;
@@ -19,7 +19,7 @@
   &[href] {
     &:hover,
     &:focus {
-      color: #fff;
+      color: $label-link-hover-color;
       text-decoration: none;
       cursor: pointer;
       background-color: darken($gray-light, 10%);
@@ -30,41 +30,17 @@
 // Colors
 // Contextual variations (linked labels get darker on :hover)
 .label-danger {
-  background-color: $label-danger-bg;
-  &[href] {
-    &:hover,
-    &:focus {
-      background-color: darken($label-danger-bg, 10%);
-    }
-  }
+  @include label-variant($label-danger-bg);
 }
 
 .label-success {
-  background-color: $label-success-bg;
-  &[href] {
-    &:hover,
-    &:focus {
-      background-color: darken($label-success-bg, 10%);
-    }
-  }
+  @include label-variant($label-success-bg);
 }
 
 .label-warning {
-  background-color: $label-warning-bg;
-  &[href] {
-    &:hover,
-    &:focus {
-      background-color: darken($label-warning-bg, 10%);
-    }
-  }
+  @include label-variant($label-warning-bg);
 }
 
 .label-info {
-  background-color: $label-info-bg;
-  &[href] {
-    &:hover,
-    &:focus {
-      background-color: darken($label-info-bg, 10%);
-    }
-  }
-}
+  @include label-variant($label-info-bg);
+}

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

@@ -0,0 +1,89 @@
+//
+// List groups
+// --------------------------------------------------
+
+// Base class
+//
+// Easily usable on <ul>, <ol>, or <div>.
+.list-group {
+  // No need to set list-style: none; since .list-group-item is block level
+  margin-bottom: 20px;
+  padding-left: 0; // reset padding because ul and ol
+  background-color: $list-group-bg;
+}
+
+// Individual list items
+// -------------------------
+
+.list-group-item {
+  position: relative;
+  display: block;
+  padding: 10px 30px 10px 15px;
+  // Place the border on the list items and negative margin up for better styling
+  margin-bottom: -1px;
+  border: 1px solid $list-group-border;
+
+  // Round the first and last items
+  &:first-child {
+    @include border-top-radius($border-radius-base);
+  }
+  &:last-child {
+    margin-bottom: 0;
+    @include border-bottom-radius($border-radius-base);
+  }
+
+  // Align badges within list items
+  > .badge {
+    float: right;
+    margin-right: -15px;
+  }
+}
+
+// Custom content options
+// -------------------------
+
+.list-group-item-heading {
+  margin-top: 0;
+  margin-bottom: 5px;
+}
+.list-group-item-text {
+  margin-bottom: 0;
+  line-height: 1.3;
+}
+
+// Linked list items
+// -------------------------
+
+// Custom content within linked items
+a.list-group-item {
+  // Colorize content accordingly
+  .list-group-item-heading {
+    color: $list-group-link-heading-color;
+  }
+  .list-group-item-text {
+    color: $list-group-link-color;
+  }
+
+  // Hover state
+  &:hover,
+  &:focus {
+    text-decoration: none;
+    background-color: $list-group-hover-bg;
+  }
+
+  // Active class on item itself, not parent
+  &.active {
+    z-index: 2; // Place active items above their siblings for proper border styling
+    color: $list-group-active-color;
+    background-color: $list-group-active-bg;
+    border-color: $list-group-active-border;
+
+    // Force color to inherit for custom content
+    .list-group-item-heading {
+      color: inherit;
+    }
+    .list-group-item-text {
+      color: lighten($list-group-active-bg, 40%);
+    }
+  }
+}

data/{vendor → app}/assets/stylesheets/twitter/bootstrap/_media.scss

@@ -36,11 +36,13 @@
 // Media image alignment
 // -------------------------
 
-.media > .pull-left {
-  margin-right: 10px;
-}
-.media > .pull-right {
-  margin-left: 10px;
+.media {
+  > .pull-left {
+    margin-right: 10px;
+  }
+  > .pull-right {
+    margin-left: 10px;
+  }
 }
 
 
@@ -49,6 +51,6 @@
 
 // Undo default ul/ol styles
 .media-list {
-  margin-left: 0;
+  padding-left: 0;
   list-style: none;
 }

data/{vendor → app}/assets/stylesheets/twitter/bootstrap/_mixins.scss

@@ -109,62 +109,52 @@
 // Transitions
 @mixin transition($transition) {
   -webkit-transition: $transition;
-     -moz-transition: $transition;
-       -o-transition: $transition;
           transition: $transition;
 }
 @mixin transition-delay($transition-delay) {
   -webkit-transition-delay: $transition-delay;
-     -moz-transition-delay: $transition-delay;
-       -o-transition-delay: $transition-delay;
           transition-delay: $transition-delay;
 }
 @mixin transition-duration($transition-duration) {
   -webkit-transition-duration: $transition-duration;
-     -moz-transition-duration: $transition-duration;
-       -o-transition-duration: $transition-duration;
           transition-duration: $transition-duration;
 }
+@mixin transition-transform($transition) {
+  -webkit-transition: -webkit-transform $transition;
+     -moz-transition: -moz-transform $transition;
+       -o-transition: -o-transform $transition;
+          transition: transform $transition;
+}
 
 // Transformations
 @mixin rotate($degrees) {
   -webkit-transform: rotate($degrees);
-     -moz-transform: rotate($degrees);
       -ms-transform: rotate($degrees);
-       -o-transform: rotate($degrees);
           transform: rotate($degrees);
 }
 @mixin scale($ratio) {
   -webkit-transform: scale($ratio);
-     -moz-transform: scale($ratio);
       -ms-transform: scale($ratio);
-       -o-transform: scale($ratio);
           transform: scale($ratio);
 }
 @mixin translate($x, $y) {
   -webkit-transform: translate($x, $y);
-     -moz-transform: translate($x, $y);
       -ms-transform: translate($x, $y);
-       -o-transform: translate($x, $y);
           transform: translate($x, $y);
 }
 @mixin skew($x, $y) {
   -webkit-transform: skew($x, $y);
-     -moz-transform: skew($x, $y);
-      -ms-transform: skewX($x) skewY($y); // See https://github.com/twitter/bootstrap/issues/4885
-       -o-transform: skew($x, $y);
+      -ms-transform: skewX($x) skewY($y); // See https://github.com/twbs/bootstrap/issues/4885
           transform: skew($x, $y);
 }
 @mixin translate3d($x, $y, $z) {
   -webkit-transform: translate3d($x, $y, $z);
-     -moz-transform: translate3d($x, $y, $z);
-       -o-transform: translate3d($x, $y, $z);
           transform: translate3d($x, $y, $z);
 }
 
 // Backface visibility
 // Prevent browsers from flickering when using CSS 3D transforms.
-// Default value is `visible`, but can be changed to `hidden
+// Default value is `visible`, but can be changed to `hidden`
 // See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples
 @mixin backface-visibility($visibility){
 	-webkit-backface-visibility: $visibility;
@@ -174,16 +164,11 @@
 
 // Background clipping
 @mixin background-clip($clip) {
-  -webkit-background-clip: $clip;
-     -moz-background-clip: $clip;
           background-clip: $clip;
 }
 
 // Background sizing
 @mixin background-size($size) {
-  -webkit-background-size: $size;
-     -moz-background-size: $size;
-       -o-background-size: $size;
           background-size: $size;
 }
 
@@ -235,65 +220,75 @@
   opacity: $opacity;
   // IE8 filter
   $opacity-ie: ($opacity * 100);
-  filter: alpha(opacity=#{opacity-ie})
+  filter: alpha(opacity=#{$opacity-ie})
 }
 
 
 
-// BACKGROUNDS
+// GRADIENTS
 // --------------------------------------------------
 
-// Gradients
-@mixin gradient-horizontal($startColor: #555, $endColor: #333) {
-  background-color: $endColor;
-  background-image: -webkit-gradient(linear, 0 0, 100% 0, from($startColor), to($endColor)); // Safari 4+, Chrome 2+
-  background-image: -webkit-linear-gradient(left, $startColor, $endColor); // Safari 5.1+, Chrome 10+
-  background-image: -moz-linear-gradient(left, $startColor, $endColor); // FF 3.6+
-  background-image: linear-gradient(to right, $startColor, $endColor); // Standard, IE10
+// Horizontal gradient, from left to right
+//
+// Creates two color stops, start and end, by specifying a color and position for each color stop.
+// Color stops are not available in IE9 and below.
+@mixin gradient-horizontal($start-color: #555, $start-percent: 0%, $end-color: #333, $end-percent: 100%) {
+  background-color: $end-color;
+  background-image: -webkit-gradient(linear, $start-percent top, $end-percent top, from($start-color), to($end-color)); // Safari 4+, Chrome 2+
+  background-image: -webkit-linear-gradient(left, color-stop($start-color $start-percent), color-stop($end-color $end-percent)); // Safari 5.1+, Chrome 10+
+  background-image: -moz-linear-gradient(left, $start-color $start-percent, $end-color $end-percent); // FF 3.6+
+  background-image:  linear-gradient(to right, $start-color $start-percent, $end-color $end-percent); // Standard, IE10
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', GradientType=1); // IE9 and down
-}
-@mixin gradient-vertical($startColor: #555, $endColor: #333) {
-  background-color: $endColor;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), to($endColor)); // Safari 4+, Chrome 2+
-  background-image: -webkit-linear-gradient(top, $startColor, $endColor); // Safari 5.1+, Chrome 10+
-  background-image: -moz-linear-gradient(top, $startColor, $endColor); // FF 3.6+
-  background-image: linear-gradient(to bottom, $startColor, $endColor); // Standard, IE10
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down
+}
+
+// Vertical gradient, from top to bottom
+//
+// Creates two color stops, start and end, by specifying a color and position for each color stop.
+// Color stops are not available in IE9 and below.
+@mixin gradient-vertical($start-color: #555, $start-percent: 0%, $end-color: #333, $end-percent: 100%) {
+  background-color: $end-color;
+  background-image: -webkit-gradient(linear, left $start-percent, left $end-percent, from($start-color), to($end-color)); // Safari 4+, Chrome 2+
+  background-image: -webkit-linear-gradient(top, $start-color, $start-percent, $end-color, $end-percent); // Safari 5.1+, Chrome 10+
+  background-image:  -moz-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // FF 3.6+
+  background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); // Standard, IE10
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', GradientType=0); // IE9 and down
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down
 }
-@mixin gradient-directional($startColor: #555, $endColor: #333, $deg: 45deg) {
-  background-color: $endColor;
+
+@mixin gradient-directional($start-color: #555, $end-color: #333, $deg: 45deg) {
+  background-color: $end-color;
   background-repeat: repeat-x;
-  background-image: -webkit-linear-gradient($deg, $startColor, $endColor); // Safari 5.1+, Chrome 10+
-  background-image: -moz-linear-gradient($deg, $startColor, $endColor); // FF 3.6+
-  background-image: linear-gradient($deg, $startColor, $endColor); // Standard, IE10
-}
-@mixin gradient-horizontal-three-colors($startColor: #00b3ee, $midColor: #7a43b6, $colorStop: 50%, $endColor: #c3325f) {
-  background-color: mix($midColor, $endColor, 80%);
-  background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from($startColor), color-stop($colorStop, $midColor), to($endColor));
-  background-image: -webkit-linear-gradient(left, $startColor, $midColor $colorStop, $endColor);
-  background-image: -moz-linear-gradient(left, $startColor, $midColor $colorStop, $endColor);
-  background-image: linear-gradient(to right, $startColor, $midColor $colorStop, $endColor);
+  background-image: -webkit-linear-gradient($deg, $start-color, $end-color); // Safari 5.1+, Chrome 10+
+  background-image: -moz-linear-gradient($deg, $start-color, $end-color); // FF 3.6+
+  background-image: linear-gradient($deg, $start-color, $end-color); // Standard, IE10
+}
+
+@mixin gradient-horizontal-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) {
+  background-color: mix($mid-color, $end-color, 80%);
+  background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from($start-color), color-stop($color-stop, $mid-color), to($end-color));
+  background-image: -webkit-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color);
+  background-image: -moz-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color);
+  background-image: linear-gradient(to right, $start-color, $mid-color $color-stop, $end-color);
   background-repeat: no-repeat;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', GradientType=1); // IE9 and down, gets no color-stop at all for proper fallback
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down, gets no color-stop at all for proper fallback
 }
 
-@mixin gradient-vertical-three-colors($startColor: #00b3ee, $midColor: #7a43b6, $colorStop: 50%, $endColor: #c3325f) {
-  background-color: mix($midColor, $endColor, 80%);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), color-stop($colorStop, $midColor), to($endColor));
-  background-image: -webkit-linear-gradient($startColor, $midColor $colorStop, $endColor);
-  background-image: -moz-linear-gradient(top, $startColor, $midColor $colorStop, $endColor);
-  background-image: linear-gradient($startColor, $midColor $colorStop, $endColor);
+@mixin gradient-vertical-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) {
+  background-color: mix($mid-color, $end-color, 80%);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from($start-color), color-stop($color-stop, $mid-color), to($end-color));
+  background-image: -webkit-linear-gradient($start-color, $mid-color $color-stop, $end-color);
+  background-image: -moz-linear-gradient(top, $start-color, $mid-color $color-stop, $end-color);
+  background-image: linear-gradient($start-color, $mid-color $color-stop, $end-color);
   background-repeat: no-repeat;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback
-}
-@mixin gradient-radial($innerColor: #555, $outerColor: #333) {
-  background-color: $outerColor;
-  background-image: -webkit-gradient(radial, center center, 0, center center, 460, from($innerColor), to($outerColor));
-  background-image: -webkit-radial-gradient(circle, $innerColor, $outerColor);
-  background-image: -moz-radial-gradient(circle, $innerColor, $outerColor);
-  background-image: radial-gradient(circle, $innerColor, $outerColor);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback
+}
+@mixin gradient-radial($inner-color: #555, $outer-color: #333) {
+  background-color: $outer-color;
+  background-image: -webkit-gradient(radial, center center, 0, center center, 460, from($inner-color), to($outer-color));
+  background-image: -webkit-radial-gradient(circle, $inner-color, $outer-color);
+  background-image: -moz-radial-gradient(circle, $inner-color, $outer-color);
+  background-image: radial-gradient(circle, $inner-color, $outer-color);
   background-repeat: no-repeat;
 }
 @mixin gradient-striped($color: #555, $angle: 45deg) {
@@ -305,17 +300,21 @@
 }
 
 // Reset filters for IE
+//
+// When you need to remove a gradient background, don't forget to use this to reset
+// the IE filter for IE9 and below.
 @mixin reset-filter() {
   filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
 }
 
 
+
 // RETINA IMAGE SUPPORT
 // --------------------------------------------------
 
 // Short retina mixin for setting background-image and -size
-@mixin retina-image($file-1x, $file-2x, $width-1x, $height-1x) {
-  background-image: url("#{file-1x}");
+@mixin img-retina($file-1x, $file-2x, $width-1x, $height-1x) {
+  background-image: url("#{$file-1x}");
 
   @media
   only screen and (-webkit-min-device-pixel-ratio: 2),
@@ -324,7 +323,7 @@
   only screen and (        min-device-pixel-ratio: 2),
   only screen and (                min-resolution: 192dpi),
   only screen and (                min-resolution: 2dppx) {
-    background-image: url("#{file-2x}");
+    background-image: url("#{$file-2x}");
     background-size: $width-1x $height-1x;
   }
 }
@@ -336,15 +335,28 @@
 // Horizontal dividers
 // -------------------------
 // Dividers (basically an hr) within dropdowns and nav lists
-@mixin nav-divider($top: #e5e5e5, $bottom: #fff) {
-  height: 2px; // 1px for background, one for border
+@mixin nav-divider($color: #e5e5e5) {
+  height: 1px;
   margin: (($line-height-computed / 2) - 1) 0;
   overflow: hidden;
-  background-color: $top;
-  border-bottom: 1px solid $bottom;
+  background-color: $color;
+}
+
+// Alerts
+// -------------------------
+@mixin alert-variant($background, $border, $text-color) {
+  background-color: $background;
+  border-color: $border;
+  color: $text-color;
+  hr {
+    border-top-color: darken($border, 5%);
+  }
+  .alert-link {
+    color: darken($text-color, 10%);
+  }
 }
 
-// Button psuedo states
+// Button pseudo states
 // -------------------------
 // Easily pump out default styles, as well as :hover, :focus, :active,
 // and disabled options for all buttons
@@ -364,6 +376,7 @@
   &.disabled,
   &[disabled],
   fieldset[disabled] & {
+    &,
     &:hover,
     &:focus,
     &:active,
@@ -374,6 +387,18 @@
   }
 }
 
+// Labels
+// -------------------------
+@mixin label-variant($color) {
+  background-color: $color;
+  &[href] {
+    &:hover,
+    &:focus {
+      background-color: darken($color, 10%);
+    }
+  }
+}
+
 // Navbar vertical align
 // -------------------------
 // Vertically center elements in the navbar.
@@ -383,7 +408,36 @@
   margin-bottom: (($navbar-height - $element-height) / 2);
 }
 
+// Progress bars
+// -------------------------
+@mixin progress-bar-variant($color) {
+  background-color: $color;
+  .progress-striped & {
+    @include gradient-striped($color);
+  }
+}
+
+// Responsive utilities
+// -------------------------
+// More easily include all the states for responsive-utilities.less.
+@mixin responsive-visibility($selector) {
+  #{$selector} {
+    display: block !important;
+  }
+
+  tr#{$selector} { display: table-row !important; }
+  th#{$selector},
+  td#{$selector} { display: table-cell !important; }
+}
 
+@mixin responsive-invisibility($selector) {
+  #{$selector} {
+    display: none !important;
+  }
+  tr#{$selector} { display: none !important; }
+  th#{$selector},
+  td#{$selector} { display: none !important; }
+}
 
 // Grid System
 // -----------
@@ -395,25 +449,26 @@
   @include clearfix();
 }
 
-// Make a grid
-
 // Creates a wrapper for a series of columns
 @mixin make-row() {
   // Then clear the floated columns
   @include clearfix();
 
+  @media (min-width: $screen-small) {
+    margin-left:  ($grid-gutter-width / -2);
+    margin-right: ($grid-gutter-width / -2);
+  }
+
   // Negative margin nested rows out to align the content of columns
   .row {
     margin-left:  ($grid-gutter-width / -2);
     margin-right: ($grid-gutter-width / -2);
   }
 }
+
 // Generate the columns
 @mixin make-column($columns) {
   position: relative;
-  // Float and set width: 100%; for easy stacking on mobile devices
-  float: left;
-  width: 100%;
   // Prevent columns from collapsing when empty
   min-height: 1px;
   // Inner gutter via padding
@@ -422,9 +477,11 @@
 
   // Calculate width based on number of columns available
   @media (min-width: $grid-float-breakpoint) {
+    float: left;
     width: percentage(($columns / $grid-columns));
   }
 }
+
 // Generate the column offsets
 @mixin make-column-offset($columns) {
   @media (min-width: $grid-float-breakpoint) {
@@ -442,62 +499,20 @@
   }
 }
 
-@mixin col-sm($columns, $grid-columns: $grid-columns) {
-  width: percentage(($columns / $grid-columns));
-}
-
-@mixin col-lg($columns, $grid-columns: $grid-columns) {
-  width: percentage(($columns / $grid-columns));
-}
-
-@mixin col-offset($columns, $grid-columns: $grid-columns) {
-  margin-left: percentage(($columns / $grid-columns));
-}
-
-@mixin col-push($columns, $grid-columns: $grid-columns) {
-  left: percentage(($columns / $grid-columns));
-}
-
-@mixin col-pull($columns, $grid-columns: $grid-columns) {
-  right: percentage(($columns / $grid-columns));
-}
-
-// Small grid columns
-@mixin generate-grid-columns($grid-columns) {
-  $columns: $grid-columns;
-
-  @while $columns > 0 {
-    .col-sm-#{$columns} { @include col-sm($columns, $grid-columns) }
-
-    $columns: $columns - 1;
-  }
-}
-
-// Large grid columns
-@mixin generate-large-grid-columns($grid-columns) {
-  $columns: $grid-columns;
-
-  @while $columns > 0 {
-    .col-lg-#{$columns}     { @include col-lg($columns, $grid-columns) }
-    .col-offset-#{$columns} { @include col-offset($columns, $grid-columns) }
-    .col-push-#{$columns}   { @include col-push($columns, $grid-columns) }
-    .col-pull-#{$columns}   { @include col-pull($columns, $grid-columns) }
 
-    $columns: $columns - 1;
-  }
-}
-
-// Framework mixins
-// --------------------------------------------------
+// Form validation states
+//
+// Used in forms.less to generate the form validation CSS for warnings, errors,
+// and successes.
 
-// Generate form validation states
-@mixin form-field-validation($text-color: #555, $border-color: #ccc, $background-color: #f5f5f5) {
-  // Color the label text
+@mixin form-control-validation($text-color: #555, $border-color: #ccc, $background-color: #f5f5f5) {
+  // Color the label and help text
+  .help-block,
   .control-label {
     color: $text-color;
   }
   // Set the border and box shadow on specific inputs to match
-  .input-with-feedback {
+  .form-control {
     padding-right: 32px; // to account for the feedback icon
     border-color: $border-color;
     @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
@@ -507,4 +522,10 @@
       @include box-shadow($shadow);
     }
   }
+  // Set validation states also for addons
+  .input-group-addon {
+    color: $text-color;
+    border-color: $border-color;
+    background-color: $background-color;
+  }
 }