aboutsummaryrefslogtreecommitdiff
path: root/docs/layout
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-03-25 12:12:02 -0700
committerMark Otto <[email protected]>2017-03-26 13:23:49 -0700
commit1a264be8b373419865f55f1c5f92890fd6bcbd03 (patch)
tree4e75c2305cef062dbfbfd7bf7f463286803ae6df /docs/layout
parent2d243086c93e83192668bff431bf44e2c42b467e (diff)
downloadbootstrap-1a264be8b373419865f55f1c5f92890fd6bcbd03.tar.xz
bootstrap-1a264be8b373419865f55f1c5f92890fd6bcbd03.zip
Redo semantic grid example and make it real in the docs
Diffstat (limited to 'docs/layout')
-rw-r--r--docs/layout/grid.md35
1 files changed, 18 insertions, 17 deletions
diff --git a/docs/layout/grid.md b/docs/layout/grid.md
index ab056a8d3..67a7289f6 100644
--- a/docs/layout/grid.md
+++ b/docs/layout/grid.md
@@ -646,46 +646,47 @@ Mixins are used in conjunction with the grid variables to generate semantic CSS
You can modify the variables to your own custom values, or just use the mixins with their default values. Here's an example of using the default settings to create a two-column layout with a gap between.
-See it in action in <a href="https://jsbin.com/ruxona/edit?html,output">this rendered example</a>.
-
{% highlight scss %}
-.container {
- max-width: 60em;
+.example-container {
+ width: 800px;
@include make-container();
}
-.row {
+
+.example-row {
@include make-row();
}
-.content-main {
+
+.example-content-main {
@include make-col-ready();
- @media (max-width: 32em) {
+ @include media-breakpoint-up(sm) {
@include make-col(6);
}
- @media (min-width: 32.1em) {
+ @include media-breakpoint-up(lg) {
@include make-col(8);
}
}
-.content-secondary {
+
+.example-content-secondary {
@include make-col-ready();
- @media (max-width: 32em) {
+ @include media-breakpoint-up(sm) {
@include make-col(6);
}
- @media (min-width: 32.1em) {
+ @include media-breakpoint-up(lg) {
@include make-col(4);
}
}
{% endhighlight %}
-{% highlight html %}
-<div class="container">
- <div class="row">
- <div class="content-main">...</div>
- <div class="content-secondary">...</div>
+{% example html %}
+<div class="example-container">
+ <div class="example-row">
+ <div class="example-content-main">Main content</div>
+ <div class="example-content-secondary">Secondary content</div>
</div>
</div>
-{% endhighlight %}
+{% endexample %}
## Customizing the grid