Merge branch 'master' into docs_derp

adab81dd · Mark Otto · 84326a3e · a2aaf80c · adab81dd · adab81dd
Commit adab81dd authored 11 years ago by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 2 deletions
+2 -2
--- a/dist/css/bootstrap-theme.css.map
+++ b/dist/css/bootstrap-theme.css.map
--- a/dist/css/bootstrap.css.map
+++ b/dist/css/bootstrap.css.map
--- a/docs-assets/js/raw-files.js
+++ b/docs-assets/js/raw-files.js
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -706,7 +706,7 @@
  }
 }
 .make-md-column-push(@columns) {
-  @media (min-width: @screen-md) {
+  @media (min-width: @screen-md-min) {
    left: percentage((@columns / @grid-columns));
  }
 }