Merge branch 'marcusds-2.1.0-wip' into 2.1.0-wip

4 files changed, 356 insertions, 0 deletions

diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index c530273438..f51ab59a1d 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -365,6 +365,102 @@
     width: 5.801104972%;
     *width: 5.747913482638298%;
   }
+  .row-fluid .offset12 {
+    margin-left: 105.524861871%;
+    *margin-left: 105.41847889227658%;
+  }
+  .row-fluid .offset12:first-child {
+    margin-left: 102.762430932%;
+    *margin-left: 102.65604795327658%;
+  }
+  .row-fluid .offset11 {
+    margin-left: 96.96132596%;
+    *margin-left: 96.85494298127658%;
+  }
+  .row-fluid .offset11:first-child {
+    margin-left: 94.198895021%;
+    *margin-left: 94.09251204227658%;
+  }
+  .row-fluid .offset10 {
+    margin-left: 88.39779004900001%;
+    *margin-left: 88.29140707027659%;
+  }
+  .row-fluid .offset10:first-child {
+    margin-left: 85.63535911000001%;
+    *margin-left: 85.5289761312766%;
+  }
+  .row-fluid .offset9 {
+    margin-left: 79.83425413799999%;
+    *margin-left: 79.72787115927657%;
+  }
+  .row-fluid .offset9:first-child {
+    margin-left: 77.071823199%;
+    *margin-left: 76.96544022027658%;
+  }
+  .row-fluid .offset8 {
+    margin-left: 71.270718227%;
+    *margin-left: 71.16433524827659%;
+  }
+  .row-fluid .offset8:first-child {
+    margin-left: 68.508287288%;
+    *margin-left: 68.40190430927659%;
+  }
+  .row-fluid .offset7 {
+    margin-left: 62.70718231600001%;
+    *margin-left: 62.600799337276605%;
+  }
+  .row-fluid .offset7:first-child {
+    margin-left: 59.944751377%;
+    *margin-left: 59.8383683982766%;
+  }
+  .row-fluid .offset6 {
+    margin-left: 54.143646405000005%;
+    *margin-left: 54.0372634262766%;
+  }
+  .row-fluid .offset6:first-child {
+    margin-left: 51.381215466%;
+    *margin-left: 51.2748324872766%;
+  }
+  .row-fluid .offset5 {
+    margin-left: 45.580110494%;
+    *margin-left: 45.4737275152766%;
+  }
+  .row-fluid .offset5:first-child {
+    margin-left: 42.817679555%;
+    *margin-left: 42.711296576276595%;
+  }
+  .row-fluid .offset4 {
+    margin-left: 37.016574583%;
+    *margin-left: 36.9101916042766%;
+  }
+  .row-fluid .offset4:first-child {
+    margin-left: 34.254143644%;
+    *margin-left: 34.1477606652766%;
+  }
+  .row-fluid .offset3 {
+    margin-left: 28.453038671999998%;
+    *margin-left: 28.346655693276595%;
+  }
+  .row-fluid .offset3:first-child {
+    margin-left: 25.690607733%;
+    *margin-left: 25.584224754276597%;
+  }
+  .row-fluid .offset2 {
+    margin-left: 19.889502761%;
+    *margin-left: 19.783119782276597%;
+  }
+  .row-fluid .offset2:first-child {
+    margin-left: 17.127071822%;
+    *margin-left: 17.0206888432766%;
+  }
+  .row-fluid .offset1 {
+    margin-left: 11.32596685%;
+    *margin-left: 11.219583871276598%;
+  }
+  .row-fluid .offset1:first-child {
+    margin-left: 8.563535911%;
+    *margin-left: 8.457152932276596%;
+  }
   input,
   textarea,
   .uneditable-input {
@@ -599,6 +695,102 @@
     width: 5.982905983%;
     *width: 5.929714493638298%;
   }
+  .row-fluid .offset12 {
+    margin-left: 105.128205128%;
+    *margin-left: 105.02182214927659%;
+  }
+  .row-fluid .offset12:first-child {
+    margin-left: 102.564102564%;
+    *margin-left: 102.45771958527658%;
+  }
+  .row-fluid .offset11 {
+    margin-left: 96.58119658100001%;
+    *margin-left: 96.4748136022766%;
+  }
+  .row-fluid .offset11:first-child {
+    margin-left: 94.017094017%;
+    *margin-left: 93.91071103827659%;
+  }
+  .row-fluid .offset10 {
+    margin-left: 88.03418803400001%;
+    *margin-left: 87.9278050552766%;
+  }
+  .row-fluid .offset10:first-child {
+    margin-left: 85.47008547%;
+    *margin-left: 85.36370249127658%;
+  }
+  .row-fluid .offset9 {
+    margin-left: 79.487179487%;
+    *margin-left: 79.38079650827659%;
+  }
+  .row-fluid .offset9:first-child {
+    margin-left: 76.923076923%;
+    *margin-left: 76.81669394427658%;
+  }
+  .row-fluid .offset8 {
+    margin-left: 70.94017094000002%;
+    *margin-left: 70.8337879612766%;
+  }
+  .row-fluid .offset8:first-child {
+    margin-left: 68.376068376%;
+    *margin-left: 68.26968539727659%;
+  }
+  .row-fluid .offset7 {
+    margin-left: 62.393162393%;
+    *margin-left: 62.286779414276594%;
+  }
+  .row-fluid .offset7:first-child {
+    margin-left: 59.829059829%;
+    *margin-left: 59.7226768502766%;
+  }
+  .row-fluid .offset6 {
+    margin-left: 53.846153846%;
+    *margin-left: 53.7397708672766%;
+  }
+  .row-fluid .offset6:first-child {
+    margin-left: 51.282051282000005%;
+    *margin-left: 51.1756683032766%;
+  }
+  .row-fluid .offset5 {
+    margin-left: 45.299145299%;
+    *margin-left: 45.1927623202766%;
+  }
+  .row-fluid .offset5:first-child {
+    margin-left: 42.73504273500001%;
+    *margin-left: 42.628659756276605%;
+  }
+  .row-fluid .offset4 {
+    margin-left: 36.752136752%;
+    *margin-left: 36.645753773276596%;
+  }
+  .row-fluid .offset4:first-child {
+    margin-left: 34.188034188%;
+    *margin-left: 34.0816512092766%;
+  }
+  .row-fluid .offset3 {
+    margin-left: 28.205128205%;
+    *margin-left: 28.0987452262766%;
+  }
+  .row-fluid .offset3:first-child {
+    margin-left: 25.641025641%;
+    *margin-left: 25.534642662276596%;
+  }
+  .row-fluid .offset2 {
+    margin-left: 19.658119658%;
+    *margin-left: 19.551736679276598%;
+  }
+  .row-fluid .offset2:first-child {
+    margin-left: 17.094017094%;
+    *margin-left: 16.9876341152766%;
+  }
+  .row-fluid .offset1 {
+    margin-left: 11.111111111%;
+    *margin-left: 11.004728132276597%;
+  }
+  .row-fluid .offset1:first-child {
+    margin-left: 8.547008547%;
+    *margin-left: 8.440625568276596%;
+  }
   input,
   textarea,
   .uneditable-input {
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 177fd693f4..74fe732776 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -386,6 +386,126 @@ a:hover {
   *width: 6.329787233638298%;
 }
 
+.row-fluid .offset12 {
+  margin-left: 104.25531913799999%;
+  *margin-left: 104.14893615927657%;
+}
+
+.row-fluid .offset12:first-child {
+  margin-left: 102.127659564%;
+  *margin-left: 102.02127658527658%;
+}
+
+.row-fluid .offset11 {
+  margin-left: 95.744680841%;
+  *margin-left: 95.63829786227659%;
+}
+
+.row-fluid .offset11:first-child {
+  margin-left: 93.61702126700001%;
+  *margin-left: 93.5106382882766%;
+}
+
+.row-fluid .offset10 {
+  margin-left: 87.23404254399999%;
+  *margin-left: 87.12765956527657%;
+}
+
+.row-fluid .offset10:first-child {
+  margin-left: 85.10638297%;
+  *margin-left: 84.99999999127658%;
+}
+
+.row-fluid .offset9 {
+  margin-left: 78.723404247%;
+  *margin-left: 78.61702126827659%;
+}
+
+.row-fluid .offset9:first-child {
+  margin-left: 76.59574467300001%;
+  *margin-left: 76.4893616942766%;
+}
+
+.row-fluid .offset8 {
+  margin-left: 70.21276594999999%;
+  *margin-left: 70.10638297127657%;
+}
+
+.row-fluid .offset8:first-child {
+  margin-left: 68.085106376%;
+  *margin-left: 67.97872339727658%;
+}
+
+.row-fluid .offset7 {
+  margin-left: 61.702127653%;
+  *margin-left: 61.595744674276595%;
+}
+
+.row-fluid .offset7:first-child {
+  margin-left: 59.574468079%;
+  *margin-left: 59.468085100276596%;
+}
+
+.row-fluid .offset6 {
+  margin-left: 53.19148935599999%;
+  *margin-left: 53.08510637727659%;
+}
+
+.row-fluid .offset6:first-child {
+  margin-left: 51.06382978199999%;
+  *margin-left: 50.95744680327659%;
+}
+
+.row-fluid .offset5 {
+  margin-left: 44.680851059%;
+  *margin-left: 44.574468080276596%;
+}
+
+.row-fluid .offset5:first-child {
+  margin-left: 42.553191485%;
+  *margin-left: 42.4468085062766%;
+}
+
+.row-fluid .offset4 {
+  margin-left: 36.170212762%;
+  *margin-left: 36.063829783276596%;
+}
+
+.row-fluid .offset4:first-child {
+  margin-left: 34.042553188%;
+  *margin-left: 33.9361702092766%;
+}
+
+.row-fluid .offset3 {
+  margin-left: 27.659574465%;
+  *margin-left: 27.553191486276596%;
+}
+
+.row-fluid .offset3:first-child {
+  margin-left: 25.531914891%;
+  *margin-left: 25.425531912276597%;
+}
+
+.row-fluid .offset2 {
+  margin-left: 19.148936168%;
+  *margin-left: 19.042553189276596%;
+}
+
+.row-fluid .offset2:first-child {
+  margin-left: 17.021276594%;
+  *margin-left: 16.914893615276597%;
+}
+
+.row-fluid .offset1 {
+  margin-left: 10.638297870999999%;
+  *margin-left: 10.531914892276596%;
+}
+
+.row-fluid .offset1:first-child {
+  margin-left: 8.510638297%;
+  *margin-left: 8.404255318276597%;
+}
+
 .container {
   margin-right: auto;
   margin-left: auto;
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index b0758a4803..459933a7e2 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -283,6 +283,28 @@
 </div>
 </pre>
 
+  <h2>Fluid offsetting</h2>
+  <p>Operates the same way as the fixed grid system offsetting: add <code>.offset*</code> to any column to offset by that many columns.</p>
+  <div class="bs-docs-grid">
+    <div class="row-fluid show-grid">
+      <div class="span4">4</div>
+      <div class="span4 offset4">4 offset 4</div>
+    </div><!-- /row -->
+    <div class="row-fluid show-grid">
+      <div class="span3 offset3">3 offset 3</div>
+      <div class="span3 offset3">3 offset 3</div>
+    </div><!-- /row -->
+    <div class="row-fluid show-grid">
+      <div class="span6 offset6">6 offset 6</div>
+    </div><!-- /row -->
+  </div>
+<pre class="prettyprint linenums">
+&lt;div class="row-fluid"&gt;
+  &lt;div class="span4"&gt;...&lt;/div&gt;
+  &lt;div class="span4 offset2"&gt;...&lt;/div&gt;
+&lt;/div&gt;
+</pre>
+
   <h2>Fluid nesting</h2>
   <p>Nesting with fluid grids is a bit different: the number of nested columns should not match the parent's number of columns. Instead, each level of nested columns are reset because each row takes up 100% of the parent column.</p>
   <div class="row-fluid show-grid">
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 850654aa3c..ec0bde55ed 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -206,6 +206,28 @@
 &lt;/div&gt;
 </pre>
 
+  <h2>{{_i}}Fluid offsetting{{/i}}</h2>
+  <p>{{_i}}Operates the same way as the fixed grid system offsetting: add <code>.offset*</code> to any column to offset by that many columns.{{/i}}</p>
+  <div class="bs-docs-grid">
+    <div class="row-fluid show-grid">
+      <div class="span4">4</div>
+      <div class="span4 offset4">4 offset 4</div>
+    </div><!-- /row -->
+    <div class="row-fluid show-grid">
+      <div class="span3 offset3">3 offset 3</div>
+      <div class="span3 offset3">3 offset 3</div>
+    </div><!-- /row -->
+    <div class="row-fluid show-grid">
+      <div class="span6 offset6">6 offset 6</div>
+    </div><!-- /row -->
+  </div>
+<pre class="prettyprint linenums">
+&lt;div class="row-fluid"&gt;
+  &lt;div class="span4"&gt;...&lt;/div&gt;
+  &lt;div class="span4 offset2"&gt;...&lt;/div&gt;
+&lt;/div&gt;
+</pre>
+
   <h2>{{_i}}Fluid nesting{{/i}}</h2>
   <p>{{_i}}Nesting with fluid grids is a bit different: the number of nested columns should not match the parent's number of columns. Instead, each level of nested columns are reset because each row takes up 100% of the parent column.{{/i}}</p>
   <div class="row-fluid show-grid">