honor @grid-columns by un-hardcoding grid classes; fixes #9436

twbs · Aug 21, 2013 · 8c067c2 · 8c067c2
1 parent 924e9e7
commit 8c067c2
Show file tree

Hide file tree

Showing 3 changed files with 195 additions and 310 deletions.
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
@@ -798,52 +798,52 @@ pre code {
 }
 
 .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-xs-2,
+.col-sm-2,
+.col-md-2,
 .col-lg-2,
+.col-xs-3,
+.col-sm-3,
+.col-md-3,
 .col-lg-3,
+.col-xs-4,
+.col-sm-4,
+.col-md-4,
 .col-lg-4,
+.col-xs-5,
+.col-sm-5,
+.col-md-5,
 .col-lg-5,
+.col-xs-6,
+.col-sm-6,
+.col-md-6,
 .col-lg-6,
+.col-xs-7,
+.col-sm-7,
+.col-md-7,
 .col-lg-7,
+.col-xs-8,
+.col-sm-8,
+.col-md-8,
 .col-lg-8,
+.col-xs-9,
+.col-sm-9,
+.col-md-9,
 .col-lg-9,
+.col-xs-10,
+.col-sm-10,
+.col-md-10,
 .col-lg-10,
+.col-xs-11,
+.col-sm-11,
+.col-md-11,
 .col-lg-11,
+.col-xs-12,
+.col-sm-12,
+.col-md-12,
 .col-lg-12 {
   position: relative;
   min-height: 1px;
@@ -966,6 +966,9 @@ pre code {
   .col-sm-12 {
     width: 100%;
   }
+  .col-sm-push-0 {
+    left: auto;
+  }
   .col-sm-push-1 {
     left: 8.333333333333332%;
   }
@@ -999,6 +1002,9 @@ pre code {
   .col-sm-push-11 {
     left: 91.66666666666666%;
   }
+  .col-sm-pull-0 {
+    right: auto;
+  }
   .col-sm-pull-1 {
     right: 8.333333333333332%;
   }
@@ -1032,6 +1038,9 @@ pre code {
   .col-sm-pull-11 {
     right: 91.66666666666666%;
   }
+  .col-sm-offset-0 {
+    margin-left: 0;
+  }
   .col-sm-offset-1 {
     margin-left: 8.333333333333332%;
   }

diff --git a/dist/css/bootstrap.min.css b/dist/css/bootstrap.min.css