diff --git a/docs/_includes/css/grid.html b/docs/_includes/css/grid.html deleted file mode 100644 index ce5c1082b2..0000000000 --- a/docs/_includes/css/grid.html +++ /dev/null @@ -1,480 +0,0 @@ -
-

Grid system

- -

Bootstrap includes a responsive, mobile first fluid grid system that appropriately scales up to 12 columns as the device or viewport size increases. It includes predefined classes for easy layout options, as well as powerful mixins for generating more semantic layouts.

- -

Introduction

-

Grid systems are used for creating page layouts through a series of rows and columns that house your content. Here's how the Bootstrap grid system works:

- -

Look to the examples for applying these principles to your code.

- -

Media queries

-

We use the following media queries in our Less files to create the key breakpoints in our grid system.

-{% highlight scss %} -/* Extra small devices (phones, less than 768px) */ -/* No media query since this is the default in Bootstrap */ - -/* Small devices (tablets, 768px and up) */ -@media (min-width: @screen-sm-min) { ... } - -/* Medium devices (desktops, 992px and up) */ -@media (min-width: @screen-md-min) { ... } - -/* Large devices (large desktops, 1200px and up) */ -@media (min-width: @screen-lg-min) { ... } -{% endhighlight %} -

We occasionally expand on these media queries to include a max-width to limit CSS to a narrower set of devices.

-{% highlight scss %} -@media (max-width: @screen-xs-max) { ... } -@media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) { ... } -@media (min-width: @screen-md-min) and (max-width: @screen-md-max) { ... } -@media (min-width: @screen-lg-min) { ... } -{% endhighlight %} - -

Grid options

-

See how aspects of the Bootstrap grid system work across multiple devices with a handy table.

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Extra small devices - Phones (<768px) - - Small devices - Tablets (≥768px) - - Medium devices - Desktops (≥992px) - - Large devices - Desktops (≥1200px) -
Grid behaviorHorizontal at all timesCollapsed to start, horizontal above breakpoints
Container widthNone (auto)750px970px1170px
Class prefix.col-xs-.col-sm-.col-md-.col-lg-
# of columns12
Column widthAuto~62px~81px~97px
Gutter width30px (15px on each side of a column)
NestableYes
OffsetsYes
Column orderingYes
-
- -

Example: Stacked-to-horizontal

-

Using a single set of .col-md-* grid classes, you can create a basic grid system that starts out stacked on mobile devices and tablet devices (the extra small to small range) before becoming horizontal on desktop (medium) devices. Place grid columns in any .row.

-
-
-
.col-md-1
-
.col-md-1
-
.col-md-1
-
.col-md-1
-
.col-md-1
-
.col-md-1
-
.col-md-1
-
.col-md-1
-
.col-md-1
-
.col-md-1
-
.col-md-1
-
.col-md-1
-
-
-
.col-md-8
-
.col-md-4
-
-
-
.col-md-4
-
.col-md-4
-
.col-md-4
-
-
-
.col-md-6
-
.col-md-6
-
-
-{% highlight html %} -
-
.col-md-1
-
.col-md-1
-
.col-md-1
-
.col-md-1
-
.col-md-1
-
.col-md-1
-
.col-md-1
-
.col-md-1
-
.col-md-1
-
.col-md-1
-
.col-md-1
-
.col-md-1
-
-
-
.col-md-8
-
.col-md-4
-
-
-
.col-md-4
-
.col-md-4
-
.col-md-4
-
-
-
.col-md-6
-
.col-md-6
-
-{% endhighlight %} - -

Example: Fluid container

-

Turn any fixed-width grid layout into a full-width layout by changing your outermost .container to .container-fluid.

-{% highlight html %} -
-
- ... -
-
-{% endhighlight %} - -

Example: Mobile and desktop

-

Don't want your columns to simply stack in smaller devices? Use the extra small and medium device grid classes by adding .col-xs-* .col-md-* to your columns. See the example below for a better idea of how it all works.

-
-
-
.col-xs-12 .col-md-8
-
.col-xs-6 .col-md-4
-
-
-
.col-xs-6 .col-md-4
-
.col-xs-6 .col-md-4
-
.col-xs-6 .col-md-4
-
-
-
.col-xs-6
-
.col-xs-6
-
-
-{% highlight html %} - -
-
.col-xs-12 .col-md-8
-
.col-xs-6 .col-md-4
-
- - -
-
.col-xs-6 .col-md-4
-
.col-xs-6 .col-md-4
-
.col-xs-6 .col-md-4
-
- - -
-
.col-xs-6
-
.col-xs-6
-
-{% endhighlight %} - -

Example: Mobile, tablet, desktops

-

Build on the previous example by creating even more dynamic and powerful layouts with tablet .col-sm-* classes.

-
-
-
.col-xs-12 .col-sm-6 .col-md-8
-
.col-xs-6 .col-md-4
-
-
-
.col-xs-6 .col-sm-4
-
.col-xs-6 .col-sm-4
- -
-
.col-xs-6 .col-sm-4
-
-
-{% highlight html %} -
-
.col-xs-12 .col-sm-6 .col-md-8
-
.col-xs-6 .col-md-4
-
-
-
.col-xs-6 .col-sm-4
-
.col-xs-6 .col-sm-4
- -
-
.col-xs-6 .col-sm-4
-
-{% endhighlight %} - -

Example: Column wrapping

-

If more than 12 columns are placed within a single row, each group of extra columns will, as one unit, wrap onto a new line.

-
-
-
.col-xs-9
-
.col-xs-4
Since 9 + 4 = 13 > 12, this 4-column-wide div gets wrapped onto a new line as one contiguous unit.
-
.col-xs-6
Subsequent columns continue along the new line.
-
-
-{% highlight html %} -
-
.col-xs-9
-
.col-xs-4
Since 9 + 4 = 13 > 12, this 4-column-wide div gets wrapped onto a new line as one contiguous unit.
-
.col-xs-6
Subsequent columns continue along the new line.
-
-{% endhighlight %} - -

Responsive column resets

-

With the four tiers of grids available you're bound to run into issues where, at certain breakpoints, your columns don't clear quite right as one is taller than the other. To fix that, use a combination of a .clearfix and our responsive utility classes.

-
-
-
- .col-xs-6 .col-sm-3 -
- Resize your viewport or check it out on your phone for an example. -
-
.col-xs-6 .col-sm-3
- - -
- -
.col-xs-6 .col-sm-3
-
.col-xs-6 .col-sm-3
-
-
-{% highlight html %} -
-
.col-xs-6 .col-sm-3
-
.col-xs-6 .col-sm-3
- - -
- -
.col-xs-6 .col-sm-3
-
.col-xs-6 .col-sm-3
-
-{% endhighlight %} -

In addition to column clearing at responsive breakpoints, you may need to reset offsets, pushes, or pulls. See this in action in the grid example.

-{% highlight html %} -
-
.col-sm-5 .col-md-6
-
.col-sm-5 .col-sm-offset-2 .col-md-6 .col-md-offset-0
-
- -
-
.col-sm-6 .col-md-5 .col-lg-6
-
.col-sm-6 .col-md-5 .col-md-offset-2 .col-lg-6 .col-lg-offset-0
-
-{% endhighlight %} - - -

Offsetting columns

-

Move columns to the right using .col-md-offset-* classes. These classes increase the left margin of a column by * columns. For example, .col-md-offset-4 moves .col-md-4 over four columns.

-
-
-
.col-md-4
-
.col-md-4 .col-md-offset-4
-
-
-
.col-md-3 .col-md-offset-3
-
.col-md-3 .col-md-offset-3
-
-
-
.col-md-6 .col-md-offset-3
-
-
-{% highlight html %} -
-
.col-md-4
-
.col-md-4 .col-md-offset-4
-
-
-
.col-md-3 .col-md-offset-3
-
.col-md-3 .col-md-offset-3
-
-
-
.col-md-6 .col-md-offset-3
-
-{% endhighlight %} - - -

Nesting columns

-

To nest your content with the default grid, add a new .row and set of .col-sm-* columns within an existing .col-sm-* column. Nested rows should include a set of columns that add up to 12 or less (it is not required that you use all 12 available columns).

-
-
- Level 1: .col-sm-9 -
-
- Level 2: .col-xs-8 .col-sm-6 -
-
- Level 2: .col-xs-4 .col-sm-6 -
-
-
-
-{% highlight html %} -
-
- Level 1: .col-sm-9 -
-
- Level 2: .col-xs-8 .col-sm-6 -
-
- Level 2: .col-xs-4 .col-sm-6 -
-
-
-
-{% endhighlight %} - -

Column ordering

-

Easily change the order of our built-in grid columns with .col-md-push-* and .col-md-pull-* modifier classes.

-
-
.col-md-9 .col-md-push-3
-
.col-md-3 .col-md-pull-9
-
- -{% highlight html %} -
-
.col-md-9 .col-md-push-3
-
.col-md-3 .col-md-pull-9
-
-{% endhighlight %} - -

Less mixins and variables

-

In addition to prebuilt grid classes for fast layouts, Bootstrap includes Less variables and mixins for quickly generating your own simple, semantic layouts.

- -

Variables

-

Variables determine the number of columns, the gutter width, and the media query point at which to begin floating columns. We use these to generate the predefined grid classes documented above, as well as for the custom mixins listed below.

-{% highlight scss %} -@grid-columns: 12; -@grid-gutter-width: 1.5rem; -{% endhighlight %} - -

Mixins

-

Mixins are used in conjunction with the grid variables to generate semantic CSS for individual grid columns.

-{% highlight scss %} -// Creates a wrapper for a series of columns -.make-row(@gutter: @grid-gutter-width) { - margin-left: (@gutter / -2); - margin-right: (@gutter / -2); - &:extend(.clearfix all); -} - -// Make the element grid-ready (applying everything but the width) -.make-col(@gutter: @grid-gutter-width) { - position: relative; - float: left; - min-height: 1px; - padding-left: (@gutter / 2); - padding-right: (@gutter / 2); -} - -// Set a width (to be used in or out of media queries) -.make-col-span(@columns) { - width: percentage((@columns / @grid-columns)); -} - -// Get fancy by offsetting, or changing the sort order -.make-col-offset(@columns) { - margin-left: percentage((@columns / @grid-columns)); -} -.make-col-push(@columns) { - left: percentage((@columns / @grid-columns)); -} -.make-col-pull(@columns) { - right: percentage((@columns / @grid-columns)); -} -{% endhighlight %} - -

Example usage

-

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 this rendered example.

-{% highlight scss %} -.container { - max-width: 60em; - .make-container(); -} -.row { - .make-row(); -} -.content-main { - .make-col(); - - @media (max-width: 32em) { - .make-col-span(6); - } - @media (min-width: 32.1em) { - .make-col-span(8); - } -} -.content-secondary { - .make-col(); - - @media (max-width: 32em) { - .make-col-span(6); - } - @media (min-width: 32.1em) { - .make-col-span(4); - } -} -{% endhighlight %} -{% highlight html %} -
-
-
...
-
...
-
-
-{% endhighlight %} -
diff --git a/docs/_includes/css/grid.md b/docs/_includes/css/grid.md new file mode 100644 index 0000000000..7942e813e4 --- /dev/null +++ b/docs/_includes/css/grid.md @@ -0,0 +1,455 @@ + + +# Grid system + +Bootstrap includes a responsive, mobile first fluid grid system that appropriately scales up to 12 columns as the device or viewport size increases. It includes [predefined classes](#grid-example-basic) for easy layout options, as well as powerful [mixins for generating more semantic layouts](#grid-semantic). + + + + + +### Introduction + +Grid systems are used for creating page layouts through a series of rows and columns that house your content. Here's how the Bootstrap grid system works: + +- Rows must be placed within a `.container` (fixed-width) or `.container-fluid` (full-width) for proper alignment and padding. +- Use rows to create horizontal groups of columns. +- Content should be placed within columns, and only columns may be immediate children of rows. +- Predefined grid classes like `.row` and `.col-xs-4` are available for quickly making grid layouts. Less mixins can also be used for more semantic layouts. +- Columns create gutters (gaps between column content) via `padding`. That padding is offset in rows for the first and last column via negative margin on `.row`s. +- The negative margin is why the examples below are outdented. It's so that content within grid columns is lined up with non-grid content. +- Grid columns are created by specifying the number of twelve available columns you wish to span. For example, three equal columns would use three `.col-xs-4`. +- If more than 12 columns are placed within a single row, each group of extra columns will, as one unit, wrap onto a new line. +- Grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes, and override grid classes targeted at smaller devices. Therefore, applying any `.col-md-` class to an element will not only affect its styling on medium devices but also on large devices if a `.col-lg-` class is not present. + +Look to the examples for applying these principles to your code. + + + + + +### Media queries + +We use the following media queries in our Less files to create the key breakpoints in our grid system. + +{% highlight scss %} +/* Extra small devices (phones, less than 768px) */ +/* No media query since this is the default in Bootstrap */ + +/* Small devices (tablets, 768px and up) */ +@media (min-width: @screen-sm-min) { ... } + +/* Medium devices (desktops, 992px and up) */ +@media (min-width: @screen-md-min) { ... } + +/* Large devices (large desktops, 1200px and up) */ +@media (min-width: @screen-lg-min) { ... } +{% endhighlight %} + +We occasionally expand on these media queries to include a max-width to limit CSS to a narrower set of devices. + +{% highlight scss %} +@media (max-width: @screen-xs-max) { ... } +@media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) { ... } +@media (min-width: @screen-md-min) and (max-width: @screen-md-max) { ... } +@media (min-width: @screen-lg-min) { ... } +{% endhighlight %} + + + + + +### Grid options + +See how aspects of the Bootstrap grid system work across multiple devices with a handy table. + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Extra small devices + Phones (<768px) + + Small devices + Tablets (≥768px) + + Medium devices + Desktops (≥992px) + + Large devices + Desktops (≥1200px) +
Grid behaviorHorizontal at all timesCollapsed to start, horizontal above breakpoints
Container widthNone (auto)750px970px1170px
Class prefix.col-xs-.col-sm-.col-md-.col-lg-
# of columns12
Column widthAuto~62px~81px~97px
Gutter width30px (15px on each side of a column)
NestableYes
OffsetsYes
Column orderingYes
+
+ + + + + +### Example: Semantic grid mixins + +In addition to [prebuilt grid classes](#grid-example-basic) for fast layouts, Bootstrap includes Less variables and mixins for quickly generating your own simple, semantic layouts. + +#### Variables + +Variables determine the number of columns, the gutter width, and the media query point at which to begin floating columns. We use these to generate the predefined grid classes documented above, as well as for the custom mixins listed below. + +{% highlight scss %} +@grid-columns: 12; +@grid-gutter-width: 1.5rem; +{% endhighlight %} + +#### Mixins + +Mixins are used in conjunction with the grid variables to generate semantic CSS for individual grid columns. + +{% highlight scss %} +// Creates a wrapper for a series of columns +.make-row(@gutter: @grid-gutter-width) { + margin-left: (@gutter / -2); + margin-right: (@gutter / -2); + &:extend(.clearfix all); +} + +// Make the element grid-ready (applying everything but the width) +.make-col(@gutter: @grid-gutter-width) { + position: relative; + float: left; + min-height: 1px; + padding-left: (@gutter / 2); + padding-right: (@gutter / 2); +} + +// Set a width (to be used in or out of media queries) +.make-col-span(@columns) { + width: percentage((@columns / @grid-columns)); +} + +// Get fancy by offsetting, or changing the sort order +.make-col-offset(@columns) { + margin-left: percentage((@columns / @grid-columns)); +} +.make-col-push(@columns) { + left: percentage((@columns / @grid-columns)); +} +.make-col-pull(@columns) { + right: percentage((@columns / @grid-columns)); +} +{% endhighlight %} + +#### Example usage + +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 this rendered example. + +{% highlight scss %} +.container { + max-width: 60em; + .make-container(); +} +.row { + .make-row(); +} +.content-main { + .make-col(); + + @media (max-width: 32em) { + .make-col-span(6); + } + @media (min-width: 32.1em) { + .make-col-span(8); + } +} +.content-secondary { + .make-col(); + + @media (max-width: 32em) { + .make-col-span(6); + } + @media (min-width: 32.1em) { + .make-col-span(4); + } +} +{% endhighlight %} + +{% highlight html %} +
+
+
...
+
...
+
+
+{% endhighlight %} + + + + + +### Example: Stacked-to-horizontal + +Using a single set of `.col-md-*` grid classes, you can create a basic grid system that starts out stacked on mobile devices and tablet devices (the extra small to small range) before becoming horizontal on desktop (medium) devices. Place grid columns in any `.row`. + +{% example html %} +
+
.col-md-1
+
.col-md-1
+
.col-md-1
+
.col-md-1
+
.col-md-1
+
.col-md-1
+
.col-md-1
+
.col-md-1
+
.col-md-1
+
.col-md-1
+
.col-md-1
+
.col-md-1
+
+
+
.col-md-8
+
.col-md-4
+
+
+
.col-md-4
+
.col-md-4
+
.col-md-4
+
+
+
.col-md-6
+
.col-md-6
+
+{% endexample %} + + + + + +### Example: Fluid container + +Turn any fixed-width grid layout into a full-width layout by changing your outermost `.container` to `.container-fluid`. + +{% highlight html %} +
+
+ ... +
+
+{% endhighlight %} + + + + + +### Example: Mobile and desktop + +Don't want your columns to simply stack in smaller devices? Use the extra small and medium device grid classes by adding `.col-xs-*` and `.col-md-*` to your columns. See the example below for a better idea of how it all works. + +{% example html %} + +
+
.col-xs-12 .col-md-8
+
.col-xs-6 .col-md-4
+
+ + +
+
.col-xs-6 .col-md-4
+
.col-xs-6 .col-md-4
+
.col-xs-6 .col-md-4
+
+ + +
+
.col-xs-6
+
.col-xs-6
+
+{% endexample %} + + + + + +### Example: Mobile, tablet, desktops + +Build on the previous example by creating even more dynamic and powerful layouts with tablet `.col-sm-*` classes. + +{% example html %} +
+
.col-xs-12 .col-sm-6 .col-md-8
+
.col-xs-6 .col-md-4
+
+
+
.col-xs-6 .col-sm-4
+
.col-xs-6 .col-sm-4
+ +
+
.col-xs-6 .col-sm-4
+
+{% endexample %} + + + + + +### Example: Column wrapping + +If more than 12 columns are placed within a single row, each group of extra columns will, as one unit, wrap onto a new line. + +{% example html %} +
+
.col-xs-9
+
.col-xs-4
Since 9 + 4 = 13 > 12, this 4-column-wide div gets wrapped onto a new line as one contiguous unit.
+
.col-xs-6
Subsequent columns continue along the new line.
+
+{% endexample %} + + + + + +### Example: Responsive column resets + +With the four tiers of grids available you're bound to run into issues where, at certain breakpoints, your columns don't clear quite right as one is taller than the other. To fix that, use a combination of a `.clearfix` and our [responsive utility classes](#responsive-utilities). + +{% example html %} +
+
.col-xs-6 .col-sm-3
+
.col-xs-6 .col-sm-3
+ + +
+ +
.col-xs-6 .col-sm-3
+
.col-xs-6 .col-sm-3
+
+{% endexample %} + +In addition to column clearing at responsive breakpoints, you may need to **reset offsets, pushes, or pulls**. See this in action in [the grid example](../examples/grid/). + +{% example html %} +
+
.col-sm-5 .col-md-6
+
.col-sm-5 .col-sm-offset-2 .col-md-6 .col-md-offset-0
+
+ +
+
.col-sm-6 .col-md-5 .col-lg-6
+
.col-sm-6 .col-md-5 .col-md-offset-2 .col-lg-6 .col-lg-offset-0
+
+{% endexample %} + + + + + +### Example: Offsetting columns + +Move columns to the right using `.col-md-offset-*` classes. These classes increase the left margin of a column by `*` columns. For example, `.col-md-offset-4` moves `.col-md-4` over four columns. + +{% example html %} +
+
.col-md-4
+
.col-md-4 .col-md-offset-4
+
+
+
.col-md-3 .col-md-offset-3
+
.col-md-3 .col-md-offset-3
+
+
+
.col-md-6 .col-md-offset-3
+
+{% endexample %} + + + + + +### Example: Nesting columns + +To nest your content with the default grid, add a new `.row` and set of `.col-sm-*` columns within an existing `.col-sm-*` column. Nested rows should include a set of columns that add up to 12 or less (it is not required that you use all 12 available columns). + +{% example html %} +
+
+ Level 1: .col-sm-9 +
+
+ Level 2: .col-xs-8 .col-sm-6 +
+
+ Level 2: .col-xs-4 .col-sm-6 +
+
+
+
+{% endexample %} + + + + + +### Example: Column ordering + +Easily change the order of our built-in grid columns with `.col-md-push-*` and `.col-md-pull-*` modifier classes. + +{% example html %} +
+
.col-md-9 .col-md-push-3
+
.col-md-3 .col-md-pull-9
+
+{% endexample %} diff --git a/docs/assets/css/docs.min.css b/docs/assets/css/docs.min.css index 4fbb58d10e..3c45668e1f 100644 --- a/docs/assets/css/docs.min.css +++ b/docs/assets/css/docs.min.css @@ -893,15 +893,13 @@ body { margin-right: 10px; border-radius: 4px; } -.show-grid { - margin-bottom: 15px; +.bs-example > .row { + margin-bottom: 1rem; } -.show-grid [class^="col-"] { - padding-top: 10px; - padding-bottom: 10px; - background-color: #eee; +.bs-example > .row > [class^="col-"] { + padding-top: .75rem; + padding-bottom: .75rem; background-color: rgba(86, 61, 124, 0.15); - border: 1px solid #ddd; border: 1px solid rgba(86, 61, 124, 0.2); } .bs-example { diff --git a/docs/assets/less/docs.less b/docs/assets/less/docs.less index 17bbe6b4d9..5b7712326c 100644 --- a/docs/assets/less/docs.less +++ b/docs/assets/less/docs.less @@ -870,15 +870,13 @@ body { // Grid examples // -.show-grid { - margin-bottom: 15px; +.bs-example > .row { + margin-bottom: 1rem; } -.show-grid [class^="col-"] { - padding-top: 10px; - padding-bottom: 10px; - background-color: #eee; +.bs-example > .row > [class^="col-"] { + padding-top: .75rem; + padding-bottom: .75rem; background-color: rgba(86,61,124,.15); - border: 1px solid #ddd; border: 1px solid rgba(86,61,124,.2); } diff --git a/docs/css.html b/docs/css.html index 38e50585ea..08b33f8ff1 100644 --- a/docs/css.html +++ b/docs/css.html @@ -7,9 +7,9 @@ lead: "Global CSS settings, fundamental HTML elements styled and enhanced with e {% markdown %} {% include css/overview.md %} + {% include css/grid.md %} {% endmarkdown %} -{% include css/grid.html %} {% include css/type.html %} {% include css/code.html %} {% include css/tables.html %}