From 14d73b9c136b5352d7f8c1a04be17c1fe2f13397 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Sat, 14 Nov 2015 19:39:28 -0800
Subject: [PATCH 1/2] fixes #17003
---
docs/_includes/css/grid.html | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/docs/_includes/css/grid.html b/docs/_includes/css/grid.html
index 5b14dd7d12..ad8b676157 100644
--- a/docs/_includes/css/grid.html
+++ b/docs/_includes/css/grid.html
@@ -333,6 +333,17 @@
</div>
{% endhighlight %}
+ <p>You can also override offsets from lower grid tiers with <code>-offset-0</code> classes.</p>
+{% highlight html %}
+<div class="row">
+ <div class="col-xs-6 col-sm-4">
+ </div>
+ <div class="col-xs-6 col-sm-4">
+ </div>
+ <div class="col-xs-6 col-xs-offset-3 col-sm-4 col-sm-offset-0">
+ </div>
+</div>
+{% endhighlight %}
<h2 id="grid-nesting">Nesting columns</h2>
<p>To nest your content with the default grid, add a new <code>.row</code> and set of <code>.col-sm-*</code> columns within an existing <code>.col-sm-*</code> column. Nested rows should include a set of columns that add up to 12 or fewer (it is not required that you use all 12 available columns).</p>
--
GitLab
From 087d16d21a75bedafbf84fce3ba264b4dc82b1d7 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Sat, 14 Nov 2015 19:47:49 -0800
Subject: [PATCH 2/2] that @cvrebert lifestyle
---
docs/_includes/css/grid.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/_includes/css/grid.html b/docs/_includes/css/grid.html
index ad8b676157..46ed466275 100644
--- a/docs/_includes/css/grid.html
+++ b/docs/_includes/css/grid.html
@@ -333,7 +333,7 @@
</div>
{% endhighlight %}
- <p>You can also override offsets from lower grid tiers with <code>-offset-0</code> classes.</p>
+ <p>You can also override offsets from lower grid tiers with <code>.col-*-offset-0</code> classes.</p>
{% highlight html %}
<div class="row">
<div class="col-xs-6 col-sm-4">
--
GitLab