anjlab-bootstrap-rails 3.0.0.3 → 3.0.1.0

data/app/assets/javascripts/twitter/bootstrap/affix.js

@@ -1,8 +1,8 @@
 /* ========================================================================
- * Bootstrap: affix.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#affix
+ * Bootstrap: affix.js v3.0.1
+ * http://getbootstrap.com/javascript/#affix
  * ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

data/app/assets/javascripts/twitter/bootstrap/alert.js

@@ -1,6 +1,6 @@
 /* ========================================================================
- * Bootstrap: alert.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#alerts
+ * Bootstrap: alert.js v3.0.1
+ * http://getbootstrap.com/javascript/#alerts
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
  *

data/app/assets/javascripts/twitter/bootstrap/button.js

@@ -1,6 +1,6 @@
 /* ========================================================================
- * Bootstrap: button.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#buttons
+ * Bootstrap: button.js v3.0.1
+ * http://getbootstrap.com/javascript/#buttons
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
  *

data/app/assets/javascripts/twitter/bootstrap/carousel.js

@@ -1,8 +1,8 @@
 /* ========================================================================
- * Bootstrap: carousel.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#carousel
+ * Bootstrap: carousel.js v3.0.1
+ * http://getbootstrap.com/javascript/#carousel
  * ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

data/app/assets/javascripts/twitter/bootstrap/collapse.js

@@ -1,8 +1,8 @@
 /* ========================================================================
- * Bootstrap: collapse.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#collapse
+ * Bootstrap: collapse.js v3.0.1
+ * http://getbootstrap.com/javascript/#collapse
  * ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

data/app/assets/javascripts/twitter/bootstrap/dropdown.js

@@ -1,8 +1,8 @@
 /* ========================================================================
- * Bootstrap: dropdown.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#dropdowns
+ * Bootstrap: dropdown.js v3.0.1
+ * http://getbootstrap.com/javascript/#dropdowns
  * ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

data/app/assets/javascripts/twitter/bootstrap/modal.js

@@ -1,8 +1,8 @@
 /* ========================================================================
- * Bootstrap: modal.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#modals
+ * Bootstrap: modal.js v3.0.1
+ * http://getbootstrap.com/javascript/#modals
  * ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

data/app/assets/javascripts/twitter/bootstrap/popover.js

@@ -1,8 +1,8 @@
 /* ========================================================================
- * Bootstrap: popover.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#popovers
+ * Bootstrap: popover.js v3.0.1
+ * http://getbootstrap.com/javascript/#popovers
  * ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

data/app/assets/javascripts/twitter/bootstrap/scrollspy.js

@@ -1,8 +1,8 @@
 /* ========================================================================
- * Bootstrap: scrollspy.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#scrollspy
+ * Bootstrap: scrollspy.js v3.0.1
+ * http://getbootstrap.com/javascript/#scrollspy
  * ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

data/app/assets/javascripts/twitter/bootstrap/tab.js

@@ -1,8 +1,8 @@
 /* ========================================================================
- * Bootstrap: tab.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#tabs
+ * Bootstrap: tab.js v3.0.1
+ * http://getbootstrap.com/javascript/#tabs
  * ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
   Tab.prototype.show = function () {
     var $this    = this.element
     var $ul      = $this.closest('ul:not(.dropdown-menu)')
-    var selector = $this.attr('data-target')
+    var selector = $this.data('target')
 
     if (!selector) {
       selector = $this.attr('href')

data/app/assets/javascripts/twitter/bootstrap/tooltip.js

@@ -1,9 +1,9 @@
 /* ========================================================================
- * Bootstrap: tooltip.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#tooltip
+ * Bootstrap: tooltip.js v3.0.1
+ * http://getbootstrap.com/javascript/#tooltip
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

data/app/assets/javascripts/twitter/bootstrap/transition.js

@@ -1,6 +1,6 @@
 /* ========================================================================
- * Bootstrap: transition.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#transitions
+ * Bootstrap: transition.js v3.0.1
+ * http://getbootstrap.com/javascript/#transitions
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
  *

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

@@ -15,7 +15,7 @@
   // Headings for larger alerts
   h4 {
     margin-top: 0;
-    // Specified for the h4 to prevent conflicts of changing @headingsColor
+    // Specified for the h4 to prevent conflicts of changing @headings-color
     color: inherit;
   }
   // Provide class for links that match alerts

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

@@ -11,7 +11,7 @@
   border-radius: $border-radius-base;
   > li {
     display: inline-block;
-    &+li:before {
+    + li:before {
       content: "#{$breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space
       padding: 0 5px;
       color: $breadcrumb-color;

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

@@ -19,7 +19,7 @@
   }
 }
 .dropup {
-  & .btn-default .caret {
+  .btn-default .caret {
     border-bottom-color: $btn-default-color;
   }
   .btn-primary,
@@ -150,6 +150,11 @@
 // Remove the gradient and set the same inset shadow as the :active state
 .btn-group.open .dropdown-toggle {
   @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
+
+  // Show no shadow for `.btn-link` since it has no other button styles.
+  &.btn-link {
+    @include box-shadow(none);
+  }
 }
 
 

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

@@ -9,18 +9,15 @@
 // Core styles
 .btn {
   display: inline-block;
-  padding: $padding-base-vertical $padding-base-horizontal;
   margin-bottom: 0; // For input.btn
-  font-size: $font-size-base;
   font-weight: $btn-font-weight;
-  line-height: $line-height-base;
   text-align: center;
   vertical-align: middle;
   cursor: pointer;
   background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
   border: 1px solid transparent;
-  border-radius: $border-radius-base;
   white-space: nowrap;
+  @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base);
   @include user-select(none);
 
   &:focus {

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

@@ -75,7 +75,7 @@
   color: $carousel-control-color;
   text-align: center;
   text-shadow: $carousel-text-shadow;
-  // We can't have this transition here because webkit cancels the carousel
+  // We can't have this transition here because WebKit cancels the carousel
   // animation if you trip this while in the middle of another animation.
 
   // Set gradients for backgrounds
@@ -160,6 +160,17 @@
     border: 1px solid $carousel-indicator-border-color;
     border-radius: 10px;
     cursor: pointer;
+
+    // IE8-9 hack for event handling
+    //
+    // Internet Explorer 8-9 does not support clicks on elements without a set
+    // `background-color`. We cannot use `filter` since that's not viewed as a
+    // background color by the browser. Thus, a hack is needed.
+    //
+    // For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we
+    // set alpha transparency for the best results possible.
+    background-color: #000 \9; // IE8
+    background-color: rgba(0,0,0,0); // IE9
   }
   .active {
     margin: 0;

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

@@ -1,11 +1,11 @@
 //
-// Code (inline and blocK)
+// Code (inline and block)
 // --------------------------------------------------
 
 
 // Inline and block code styles
 code,
-kdb,
+kbd,
 pre,
 samp {
   font-family: $font-family-monospace;
@@ -42,7 +42,7 @@ pre {
     color: inherit;
     white-space: pre-wrap;
     background-color: transparent;
-    border: 0;
+    border-radius: 0;
   }
 }
 

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

@@ -16,7 +16,6 @@
   // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once fixed,
   // we can just straight up remove this.
   border-bottom: 0 dotted;
-  content: "";
 }
 
 // The dropdown wrapper (div)
@@ -167,7 +166,7 @@
     // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once this
     // gets fixed, restore `border-top: 0;`.
     border-top: 0 dotted;
-    border-bottom: 4px solid $dropdown-caret-color;
+    border-bottom: $caret-width-base solid $dropdown-caret-color;
     content: "";
   }
   // Different positioning for bottom up menu

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

@@ -92,14 +92,6 @@ output {
   vertical-align: middle;
 }
 
-// Placeholder
-//
-// Placeholder text gets special styles because when browsers invalidate entire
-// lines if it doesn't understand a selector/
-.form-control {
-  @include placeholder();
-}
-
 
 // Common form controls
 //
@@ -142,6 +134,12 @@ output {
   // 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,
@@ -262,7 +260,6 @@ input[type="checkbox"],
 
 .form-control-static {
   margin-bottom: 0; // Remove default margin from `p`
-  padding-top: ($padding-base-vertical + 1);
 }
 
 
@@ -351,6 +348,10 @@ input[type="checkbox"],
     @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-sm-min) {
     .control-label {

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

@@ -14,7 +14,7 @@
   src: font-url('#{$icon-font-path}#{$icon-font-name}.eot?#iefix') format('embedded-opentype'),
        font-url('#{$icon-font-path}#{$icon-font-name}.woff') format('woff'),
        font-url('#{$icon-font-path}#{$icon-font-name}.ttf') format('truetype'),
-       font-url('#{$icon-font-path}#{$icon-font-name}.svg#glyphicons-halflingsregular') format('svg');
+       font-url('#{$icon-font-path}#{$icon-font-name}.svg#glyphicons_halflingsregular') format('svg');
 }
 
 // Catchall baseclass
@@ -27,8 +27,9 @@
   font-weight: normal;
   line-height: 1;
   -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
 
-  &:empty{
+  &:empty {
     width: 1em;
   }
 }
@@ -72,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"; } }
@@ -82,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"; } }
@@ -136,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"; } }
@@ -153,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"; } }
@@ -165,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"; } }
@@ -224,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,7 +2,6 @@
 // Grid system
 // --------------------------------------------------
 
-
 // Set the container width, and override it for fixed navbars in media queries
 .container {
   @include container-fixed();
@@ -14,61 +13,7 @@
 }
 
 // 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
@@ -79,31 +24,11 @@
 // Note that `.col-xs-12` doesn't get floated on purpose--there's no need since
 // it's full-width.
 
-.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
@@ -119,69 +44,11 @@
     width: $container-sm;
   }
 
-  .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)); }
+  @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);
 }
 
 
@@ -196,72 +63,12 @@
   .container {
     width: $container-md;
   }
-  .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)); }
+  @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);
 }
 
 
@@ -277,70 +84,10 @@
     width: $container-lg;
   }
 
-  .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)); }
+  @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);
 }
+