Merge branch 'new_grid' into 2.0.2-wip

Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	less/mixins.less

1 files changed, 184 insertions, 232 deletions

diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 2e2bd33173..47d25b0e8e 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -191,77 +191,77 @@
   .navbar-fixed-bottom .container {
     width: 724px;
   }
-  .span1 {
-    width: 42px;
-  }
-  .span2 {
-    width: 104px;
+  .span12 {
+    width: 724px;
   }
-  .span3 {
-    width: 166px;
+  .span11 {
+    width: 662px;
   }
-  .span4 {
-    width: 228px;
+  .span10 {
+    width: 600px;
   }
-  .span5 {
-    width: 290px;
+  .span9 {
+    width: 538px;
   }
-  .span6 {
-    width: 352px;
+  .span8 {
+    width: 476px;
   }
   .span7 {
     width: 414px;
   }
-  .span8 {
-    width: 476px;
+  .span6 {
+    width: 352px;
   }
-  .span9 {
-    width: 538px;
+  .span5 {
+    width: 290px;
   }
-  .span10 {
-    width: 600px;
+  .span4 {
+    width: 228px;
   }
-  .span11 {
-    width: 662px;
+  .span3 {
+    width: 166px;
   }
-  .span12 {
-    width: 724px;
+  .span2 {
+    width: 104px;
   }
-  .offset1 {
-    margin-left: 82px;
+  .span1 {
+    width: 42px;
   }
-  .offset2 {
-    margin-left: 144px;
+  .offset12 {
+    margin-left: 764px;
   }
-  .offset3 {
-    margin-left: 206px;
+  .offset11 {
+    margin-left: 702px;
   }
-  .offset4 {
-    margin-left: 268px;
+  .offset10 {
+    margin-left: 640px;
   }
-  .offset5 {
-    margin-left: 330px;
+  .offset9 {
+    margin-left: 578px;
   }
-  .offset6 {
-    margin-left: 392px;
+  .offset8 {
+    margin-left: 516px;
   }
   .offset7 {
     margin-left: 454px;
   }
-  .offset8 {
-    margin-left: 516px;
+  .offset6 {
+    margin-left: 392px;
   }
-  .offset9 {
-    margin-left: 578px;
+  .offset5 {
+    margin-left: 330px;
   }
-  .offset10 {
-    margin-left: 640px;
+  .offset4 {
+    margin-left: 268px;
   }
-  .offset11 {
-    margin-left: 702px;
+  .offset3 {
+    margin-left: 206px;
   }
-  .offset12 {
-    margin-left: 764px;
+  .offset2 {
+    margin-left: 144px;
+  }
+  .offset1 {
+    margin-left: 82px;
   }
   .row-fluid {
     width: 100%;
@@ -282,106 +282,82 @@
   .row-fluid > [class*="span"]:first-child {
     margin-left: 0;
   }
-  .row-fluid > .span1 {
-    width: 5.801104972%;
-  }
-  .row-fluid > .span2 {
-    width: 14.364640883%;
+  .row-fluid > .span12 {
+    width: 99.999999993%;
   }
-  .row-fluid > .span3 {
-    width: 22.928176794%;
+  .row-fluid > .span11 {
+    width: 91.436464082%;
   }
-  .row-fluid > .span4 {
-    width: 31.491712705%;
+  .row-fluid > .span10 {
+    width: 82.87292817100001%;
   }
-  .row-fluid > .span5 {
-    width: 40.055248616%;
+  .row-fluid > .span9 {
+    width: 74.30939226%;
   }
-  .row-fluid > .span6 {
-    width: 48.618784527%;
+  .row-fluid > .span8 {
+    width: 65.74585634900001%;
   }
   .row-fluid > .span7 {
     width: 57.182320438000005%;
   }
-  .row-fluid > .span8 {
-    width: 65.74585634900001%;
+  .row-fluid > .span6 {
+    width: 48.618784527%;
   }
-  .row-fluid > .span9 {
-    width: 74.30939226%;
+  .row-fluid > .span5 {
+    width: 40.055248616%;
   }
-  .row-fluid > .span10 {
-    width: 82.87292817100001%;
+  .row-fluid > .span4 {
+    width: 31.491712705%;
   }
-  .row-fluid > .span11 {
-    width: 91.436464082%;
+  .row-fluid > .span3 {
+    width: 22.928176794%;
   }
-  .row-fluid > .span12 {
-    width: 99.999999993%;
+  .row-fluid > .span2 {
+    width: 14.364640883%;
+  }
+  .row-fluid > .span1 {
+    width: 5.801104972%;
   }
   input,
   textarea,
   .uneditable-input {
     margin-left: 0;
   }
-  input.span1,
-  textarea.span1,
-  .uneditable-input.span1 {
-    width: 32px;
-  }
-  input.span2,
-  textarea.span2,
-  .uneditable-input.span2 {
-    width: 94px;
+  input.span12, textarea.span12, .uneditable-input.span12 {
+    width: 714px;
   }
-  input.span3,
-  textarea.span3,
-  .uneditable-input.span3 {
-    width: 156px;
+  input.span11, textarea.span11, .uneditable-input.span11 {
+    width: 652px;
   }
-  input.span4,
-  textarea.span4,
-  .uneditable-input.span4 {
-    width: 218px;
+  input.span10, textarea.span10, .uneditable-input.span10 {
+    width: 590px;
   }
-  input.span5,
-  textarea.span5,
-  .uneditable-input.span5 {
-    width: 280px;
+  input.span9, textarea.span9, .uneditable-input.span9 {
+    width: 528px;
   }
-  input.span6,
-  textarea.span6,
-  .uneditable-input.span6 {
-    width: 342px;
+  input.span8, textarea.span8, .uneditable-input.span8 {
+    width: 466px;
   }
-  input.span7,
-  textarea.span7,
-  .uneditable-input.span7 {
+  input.span7, textarea.span7, .uneditable-input.span7 {
     width: 404px;
   }
-  input.span8,
-  textarea.span8,
-  .uneditable-input.span8 {
-    width: 466px;
+  input.span6, textarea.span6, .uneditable-input.span6 {
+    width: 342px;
   }
-  input.span9,
-  textarea.span9,
-  .uneditable-input.span9 {
-    width: 528px;
+  input.span5, textarea.span5, .uneditable-input.span5 {
+    width: 280px;
   }
-  input.span10,
-  textarea.span10,
-  .uneditable-input.span10 {
-    width: 590px;
+  input.span4, textarea.span4, .uneditable-input.span4 {
+    width: 218px;
   }
-  input.span11,
-  textarea.span11,
-  .uneditable-input.span11 {
-    width: 652px;
+  input.span3, textarea.span3, .uneditable-input.span3 {
+    width: 156px;
   }
-  input.span12,
-  textarea.span12,
-  .uneditable-input.span12 {
-    width: 714px;
+  input.span2, textarea.span2, .uneditable-input.span2 {
+    width: 94px;
+  }
+  input.span1, textarea.span1, .uneditable-input.span1 {
+    width: 32px;
   }
 }
 @media (max-width: 979px) {
@@ -520,77 +496,77 @@
   .navbar-fixed-bottom .container {
     width: 1170px;
   }
-  .span1 {
-    width: 70px;
-  }
-  .span2 {
-    width: 170px;
+  .span12 {
+    width: 1170px;
   }
-  .span3 {
-    width: 270px;
+  .span11 {
+    width: 1070px;
   }
-  .span4 {
-    width: 370px;
+  .span10 {
+    width: 970px;
   }
-  .span5 {
-    width: 470px;
+  .span9 {
+    width: 870px;
   }
-  .span6 {
-    width: 570px;
+  .span8 {
+    width: 770px;
   }
   .span7 {
     width: 670px;
   }
-  .span8 {
-    width: 770px;
+  .span6 {
+    width: 570px;
   }
-  .span9 {
-    width: 870px;
+  .span5 {
+    width: 470px;
   }
-  .span10 {
-    width: 970px;
+  .span4 {
+    width: 370px;
   }
-  .span11 {
-    width: 1070px;
+  .span3 {
+    width: 270px;
   }
-  .span12 {
-    width: 1170px;
+  .span2 {
+    width: 170px;
   }
-  .offset1 {
-    margin-left: 130px;
+  .span1 {
+    width: 70px;
   }
-  .offset2 {
-    margin-left: 230px;
+  .offset12 {
+    margin-left: 1230px;
   }
-  .offset3 {
-    margin-left: 330px;
+  .offset11 {
+    margin-left: 1130px;
   }
-  .offset4 {
-    margin-left: 430px;
+  .offset10 {
+    margin-left: 1030px;
   }
-  .offset5 {
-    margin-left: 530px;
+  .offset9 {
+    margin-left: 930px;
   }
-  .offset6 {
-    margin-left: 630px;
+  .offset8 {
+    margin-left: 830px;
   }
   .offset7 {
     margin-left: 730px;
   }
-  .offset8 {
-    margin-left: 830px;
+  .offset6 {
+    margin-left: 630px;
   }
-  .offset9 {
-    margin-left: 930px;
+  .offset5 {
+    margin-left: 530px;
   }
-  .offset10 {
-    margin-left: 1030px;
+  .offset4 {
+    margin-left: 430px;
   }
-  .offset11 {
-    margin-left: 1130px;
+  .offset3 {
+    margin-left: 330px;
   }
-  .offset12 {
-    margin-left: 1230px;
+  .offset2 {
+    margin-left: 230px;
+  }
+  .offset1 {
+    margin-left: 130px;
   }
   .row-fluid {
     width: 100%;
@@ -611,106 +587,82 @@
   .row-fluid > [class*="span"]:first-child {
     margin-left: 0;
   }
-  .row-fluid > .span1 {
-    width: 5.982905983%;
-  }
-  .row-fluid > .span2 {
-    width: 14.529914530000001%;
+  .row-fluid > .span12 {
+    width: 100%;
   }
-  .row-fluid > .span3 {
-    width: 23.076923077%;
+  .row-fluid > .span11 {
+    width: 91.45299145300001%;
   }
-  .row-fluid > .span4 {
-    width: 31.623931624%;
+  .row-fluid > .span10 {
+    width: 82.905982906%;
   }
-  .row-fluid > .span5 {
-    width: 40.170940171000005%;
+  .row-fluid > .span9 {
+    width: 74.358974359%;
   }
-  .row-fluid > .span6 {
-    width: 48.717948718%;
+  .row-fluid > .span8 {
+    width: 65.81196581200001%;
   }
   .row-fluid > .span7 {
     width: 57.264957265%;
   }
-  .row-fluid > .span8 {
-    width: 65.81196581200001%;
+  .row-fluid > .span6 {
+    width: 48.717948718%;
   }
-  .row-fluid > .span9 {
-    width: 74.358974359%;
+  .row-fluid > .span5 {
+    width: 40.170940171000005%;
   }
-  .row-fluid > .span10 {
-    width: 82.905982906%;
+  .row-fluid > .span4 {
+    width: 31.623931624%;
   }
-  .row-fluid > .span11 {
-    width: 91.45299145300001%;
+  .row-fluid > .span3 {
+    width: 23.076923077%;
   }
-  .row-fluid > .span12 {
-    width: 100%;
+  .row-fluid > .span2 {
+    width: 14.529914530000001%;
+  }
+  .row-fluid > .span1 {
+    width: 5.982905983%;
   }
   input,
   textarea,
   .uneditable-input {
     margin-left: 0;
   }
-  input.span1,
-  textarea.span1,
-  .uneditable-input.span1 {
-    width: 60px;
-  }
-  input.span2,
-  textarea.span2,
-  .uneditable-input.span2 {
-    width: 160px;
+  input.span12, textarea.span12, .uneditable-input.span12 {
+    width: 1160px;
   }
-  input.span3,
-  textarea.span3,
-  .uneditable-input.span3 {
-    width: 260px;
+  input.span11, textarea.span11, .uneditable-input.span11 {
+    width: 1060px;
   }
-  input.span4,
-  textarea.span4,
-  .uneditable-input.span4 {
-    width: 360px;
+  input.span10, textarea.span10, .uneditable-input.span10 {
+    width: 960px;
   }
-  input.span5,
-  textarea.span5,
-  .uneditable-input.span5 {
-    width: 460px;
+  input.span9, textarea.span9, .uneditable-input.span9 {
+    width: 860px;
   }
-  input.span6,
-  textarea.span6,
-  .uneditable-input.span6 {
-    width: 560px;
+  input.span8, textarea.span8, .uneditable-input.span8 {
+    width: 760px;
   }
-  input.span7,
-  textarea.span7,
-  .uneditable-input.span7 {
+  input.span7, textarea.span7, .uneditable-input.span7 {
     width: 660px;
   }
-  input.span8,
-  textarea.span8,
-  .uneditable-input.span8 {
-    width: 760px;
+  input.span6, textarea.span6, .uneditable-input.span6 {
+    width: 560px;
   }
-  input.span9,
-  textarea.span9,
-  .uneditable-input.span9 {
-    width: 860px;
+  input.span5, textarea.span5, .uneditable-input.span5 {
+    width: 460px;
   }
-  input.span10,
-  textarea.span10,
-  .uneditable-input.span10 {
-    width: 960px;
+  input.span4, textarea.span4, .uneditable-input.span4 {
+    width: 360px;
   }
-  input.span11,
-  textarea.span11,
-  .uneditable-input.span11 {
-    width: 1060px;
+  input.span3, textarea.span3, .uneditable-input.span3 {
+    width: 260px;
   }
-  input.span12,
-  textarea.span12,
-  .uneditable-input.span12 {
-    width: 1160px;
+  input.span2, textarea.span2, .uneditable-input.span2 {
+    width: 160px;
+  }
+  input.span1, textarea.span1, .uneditable-input.span1 {
+    width: 60px;
   }
   .thumbnails {
     margin-left: -30px;