From b9f44d0c8b060d44815eabe8d6d64a9cf901a9ff Mon Sep 17 00:00:00 2001 From: Alice Young Date: Sat, 31 Dec 2016 07:25:52 -0500 Subject: minor rephrasing on layout/overview docs --- docs/layout/overview.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/layout') diff --git a/docs/layout/overview.md b/docs/layout/overview.md index ee21b70f2..f0decede3 100644 --- a/docs/layout/overview.md +++ b/docs/layout/overview.md @@ -118,7 +118,7 @@ Once again, these media queries are also available via Sass mixins: @include media-breakpoint-down(lg) { ... } {% endhighlight %} -We also have media between the breakpoint's minimum and maximum widths for only the given screen size: +We can also use media queries to target a single segment of screen sizes, using the minimum and maximum breakpoint widths: {% highlight scss %} // Extra small devices (portrait phones, less than 576px) @@ -147,7 +147,7 @@ These media queries are also available via Sass mixins: @include media-breakpoint-only(xl) { ... } {% endhighlight %} -And finally media that spans multiple breakpoint widths: +Similarly, media queries may span multiple breakpoint widths: {% highlight scss %} // Example @@ -155,7 +155,7 @@ And finally media that spans multiple breakpoint widths: @media (min-width: 768px) and (max-width: 1199px) { ... } {% endhighlight %} -The Sass mixin for the above example look like that shown beneath: +The Sass mixin for targeting the same screen size range would be: {% highlight scss %} @include media-breakpoint-between(md, lg) { ... } -- cgit v1.2.3 From bccb8ce21300f8da0bfefe1fdde9ab9d87994769 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 31 Dec 2016 11:48:55 -0800 Subject: tweak a few more things - adjust some verbiage - change the example to correct some labels and range names --- docs/layout/overview.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/layout') diff --git a/docs/layout/overview.md b/docs/layout/overview.md index f0decede3..0bf0b33a1 100644 --- a/docs/layout/overview.md +++ b/docs/layout/overview.md @@ -118,7 +118,7 @@ Once again, these media queries are also available via Sass mixins: @include media-breakpoint-down(lg) { ... } {% endhighlight %} -We can also use media queries to target a single segment of screen sizes, using the minimum and maximum breakpoint widths: +There are also media queries and mixins for targeting a single segment of screen sizes using the minimum and maximum breakpoint widths. {% highlight scss %} // Extra small devices (portrait phones, less than 576px) @@ -151,14 +151,14 @@ Similarly, media queries may span multiple breakpoint widths: {% highlight scss %} // Example -// Medium devices (tablets, 768px and up) and Large devices (desktops, 992px and up) +// Apply styles starting from medium devices and up to extra large devices @media (min-width: 768px) and (max-width: 1199px) { ... } {% endhighlight %} The Sass mixin for targeting the same screen size range would be: {% highlight scss %} -@include media-breakpoint-between(md, lg) { ... } +@include media-breakpoint-between(md, xl) { ... } {% endhighlight %} ## Z-index -- cgit v1.2.3 From ff8d28cf2501773ff6f7833865c8e2b2ebb76a3f Mon Sep 17 00:00:00 2001 From: Quy Date: Sat, 31 Dec 2016 16:12:28 -0800 Subject: Move .table-responsive from wrapper to .table --- docs/layout/grid.md | 142 +++++++++--------- docs/layout/responsive-utilities.md | 284 ++++++++++++++++++------------------ 2 files changed, 210 insertions(+), 216 deletions(-) (limited to 'docs/layout') diff --git a/docs/layout/grid.md b/docs/layout/grid.md index 056561b27..d0f5b2326 100644 --- a/docs/layout/grid.md +++ b/docs/layout/grid.md @@ -57,78 +57,76 @@ While Bootstrap uses `em`s or `rem`s for defining most sizes, `px`s are used for See how aspects of the Bootstrap grid system work across multiple devices with a handy table. -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Extra small
- <576px - 		- Small
- ≥576px - 		- Medium
- ≥768px - 		- Large
- ≥992px - 		- Extra large
- ≥1200px -
Grid behaviorHorizontal at all timesCollapsed to start, horizontal above breakpoints
Max container widthNone (auto)540px720px960px1140px
Class prefix.col-.col-sm-.col-md-.col-lg-.col-xl-
# of columns12
Gutter width30px (15px on each side of a column)
NestableYes
OffsetsYes
Column orderingYes
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Extra small
+ <576px + 		+ Small
+ ≥576px + 		+ Medium
+ ≥768px + 		+ Large
+ ≥992px + 		+ Extra large
+ ≥1200px +
Grid behaviorHorizontal at all timesCollapsed to start, horizontal above breakpoints
Max container widthNone (auto)540px720px960px1140px
Class prefix.col-.col-sm-.col-md-.col-lg-.col-xl-
# of columns12
Gutter width30px (15px on each side of a column)
NestableYes
OffsetsYes
Column orderingYes
## Auto-layout columns diff --git a/docs/layout/responsive-utilities.md b/docs/layout/responsive-utilities.md index 69f6ae1be..e207737d1 100644 --- a/docs/layout/responsive-utilities.md +++ b/docs/layout/responsive-utilities.md @@ -22,153 +22,149 @@ Try to use these on a limited basis and avoid creating entirely different versio * You can combine one `.hidden-*-up` class with one `.hidden-*-down` class to show an element only on a given interval of screen sizes. For example, `.hidden-sm-down.hidden-xl-up` shows the element only on medium and large viewports. Using multiple `.hidden-*-up` classes or multiple `.hidden-*-down` classes is redundant and pointless. * These classes don't attempt to accommodate less common cases where an element's visibility can't be expressed as a single contiguous range of viewport breakpoint sizes; you will instead need to use custom CSS in such cases. -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Extra small devices - Portrait phones (<544px) - - Small devices - Landscape phones (≥544px - <768px) - - Medium devices - Tablets (≥768px - <992px) - - Large devices - Desktops (≥992px - <1200px) - - Extra large devices - Desktops (≥1200px) -
.hidden-xs-downVisibleVisibleVisibleVisible
.hidden-sm-downVisibleVisibleVisible
.hidden-md-downVisibleVisible
.hidden-lg-downVisible
.hidden-xl-down
.hidden-xs-up
.hidden-sm-upVisible
.hidden-md-upVisibleVisible
.hidden-lg-upVisibleVisibleVisible
.hidden-xl-upVisibleVisibleVisibleVisible
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Extra small devices + Portrait phones (<544px) + + Small devices + Landscape phones (≥544px - <768px) + + Medium devices + Tablets (≥768px - <992px) + + Large devices + Desktops (≥992px - <1200px) + + Extra large devices + Desktops (≥1200px) +
.hidden-xs-downVisibleVisibleVisibleVisible
.hidden-sm-downVisibleVisibleVisible
.hidden-md-downVisibleVisible
.hidden-lg-downVisible
.hidden-xl-down
.hidden-xs-up
.hidden-sm-upVisible
.hidden-md-upVisibleVisible
.hidden-lg-upVisibleVisibleVisible
.hidden-xl-upVisibleVisibleVisibleVisible

Print classes

Similar to the regular responsive classes, use these for toggling content for print.

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ClassBrowserPrint
.visible-print-blockVisible
(as display: block)
.visible-print-inlineVisible
(as display: inline)
.visible-print-inline-blockVisible
(as display: inline-block)
.hidden-printVisible
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ClassBrowserPrint
.visible-print-blockVisible
(as display: block)
.visible-print-inlineVisible
(as display: inline)
.visible-print-inline-blockVisible
(as display: inline-block)
.hidden-printVisible
## Test cases -- cgit v1.2.3 From 20b05e42e33bea09e0632d607e70bcf9552b8d65 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 2 Jan 2017 11:48:51 -0800 Subject: update rest of docs, remove navbar specific modifiers, fix docs example css --- docs/layout/overview.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/layout') diff --git a/docs/layout/overview.md b/docs/layout/overview.md index 0bf0b33a1..736b9ed12 100644 --- a/docs/layout/overview.md +++ b/docs/layout/overview.md @@ -171,8 +171,8 @@ We don't encourage customization of these values; should you change one, you lik $zindex-dropdown-backdrop: 990 !default; $zindex-navbar: 1000 !default; $zindex-dropdown: 1000 !default; -$zindex-navbar-fixed: 1030 !default; -$zindex-navbar-sticky: 1030 !default; +$zindex-fixed: 1030 !default; +$zindex-sticky: 1030 !default; $zindex-modal-backdrop: 1040 !default; $zindex-modal: 1050 !default; $zindex-popover: 1060 !default; -- cgit v1.2.3 From e4c0311626befc89c9462e675059edf9d52b9bb1 Mon Sep 17 00:00:00 2001 From: Bardi Harborow Date: Thu, 5 Jan 2017 11:11:50 +1100 Subject: Update broken links. --- docs/layout/grid.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/layout') diff --git a/docs/layout/grid.md b/docs/layout/grid.md index d0f5b2326..03deb2f55 100644 --- a/docs/layout/grid.md +++ b/docs/layout/grid.md @@ -32,7 +32,7 @@ Bootstrap's grid system uses a series of containers, rows, and columns to layout -The above example creates three equal-width columns on small, medium, large, and extra large devices using our [predefined grid classes](#predefined-classes). Those columns are centered in the page with the parent `.container`. +The above example creates three equal-width columns on small, medium, large, and extra large devices using our predefined grid classes. Those columns are centered in the page with the parent `.container`. Breaking it down, here's how it works: -- cgit v1.2.3 From af05b889a8b128e534b58cd512af701ef2bc26ed Mon Sep 17 00:00:00 2001 From: Bardi Harborow Date: Fri, 6 Jan 2017 16:35:52 +1100 Subject: Fix media object alignment examples. --- docs/layout/media-object.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/layout') diff --git a/docs/layout/media-object.md b/docs/layout/media-object.md index 662f72c25..74229dc3c 100644 --- a/docs/layout/media-object.md +++ b/docs/layout/media-object.md @@ -64,7 +64,7 @@ Media in a media object can be aligned with flexbox utilities to the top (defaul {% example html %}
- Generic placeholder image + Generic placeholder image
Top-aligned media

Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.

@@ -75,7 +75,7 @@ Media in a media object can be aligned with flexbox utilities to the top (defaul {% example html %}
- Generic placeholder image + Generic placeholder image
Center-aligned media

Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.

@@ -86,7 +86,7 @@ Media in a media object can be aligned with flexbox utilities to the top (defaul {% example html %}
- Generic placeholder image + Generic placeholder image
Bottom-aligned media

Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.

-- cgit v1.2.3 From a3bc607c1080df2d0bbca03c613aa9e992acb722 Mon Sep 17 00:00:00 2001 From: Pierre-Denis Vanduynslager Date: Mon, 16 Jan 2017 00:35:18 -0500 Subject: Remove unused scss variables (#21579) * Remove unused scss variables * Remove unnecessary space * Remove $zindex-navbar from docs * Re-add $progress-box-shadow --- docs/layout/overview.md | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/layout') diff --git a/docs/layout/overview.md b/docs/layout/overview.md index 736b9ed12..04aa2c9ad 100644 --- a/docs/layout/overview.md +++ b/docs/layout/overview.md @@ -169,7 +169,6 @@ We don't encourage customization of these values; should you change one, you lik ```scss $zindex-dropdown-backdrop: 990 !default; -$zindex-navbar: 1000 !default; $zindex-dropdown: 1000 !default; $zindex-fixed: 1030 !default; $zindex-sticky: 1030 !default; -- cgit v1.2.3 From 44684a60e55406a1e918ebcadfe49368fe425ad3 Mon Sep 17 00:00:00 2001 From: Amy Gori Date: Mon, 16 Jan 2017 00:37:06 -0500 Subject: Correct xs and sm breakpoint values in responsive utilities docs (#21664) --- docs/layout/responsive-utilities.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/layout') diff --git a/docs/layout/responsive-utilities.md b/docs/layout/responsive-utilities.md index e207737d1..c3f0c0090 100644 --- a/docs/layout/responsive-utilities.md +++ b/docs/layout/responsive-utilities.md @@ -28,11 +28,11 @@ Try to use these on a limited basis and avoid creating entirely different versio Extra small devices - Portrait phones (<544px) + Portrait phones (<576px) Small devices - Landscape phones (≥544px - <768px) + Landscape phones (≥576px - <768px) Medium devices -- cgit v1.2.3 From 3cb252570a0fb2507c7169427569f50a0a1cb031 Mon Sep 17 00:00:00 2001 From: Marcus Molchany Date: Sat, 21 Jan 2017 18:01:13 -0800 Subject: Update grid layout docs (#21806) Update Mix and match section with correct responsive classes for stacking cols. --- docs/layout/grid.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/layout') diff --git a/docs/layout/grid.md b/docs/layout/grid.md index 03deb2f55..58e51946e 100644 --- a/docs/layout/grid.md +++ b/docs/layout/grid.md @@ -293,7 +293,7 @@ Don't want your columns to simply stack in some grid tiers? Use a combination of {% example html %}
-
.col .col-md-8
+
.col-12 .col-md-8
.col-6 .col-md-4
-- cgit v1.2.3 From 091f3b8c246a8e4923f3f156ffbf3e359058d1d5 Mon Sep 17 00:00:00 2001 From: Quy Date: Sun, 22 Jan 2017 11:17:17 -0800 Subject: Change header to use markdown (#21809) Header will now display in the Contents section. --- docs/layout/responsive-utilities.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/layout') diff --git a/docs/layout/responsive-utilities.md b/docs/layout/responsive-utilities.md index c3f0c0090..fdea34bd9 100644 --- a/docs/layout/responsive-utilities.md +++ b/docs/layout/responsive-utilities.md @@ -132,7 +132,8 @@ Try to use these on a limited basis and avoid creating entirely different versio -

Print classes

+## Print classes +

Similar to the regular responsive classes, use these for toggling content for print.

-- cgit v1.2.3 From 563926717cbc1420218796396fac06c1005447bf Mon Sep 17 00:00:00 2001 From: Quy Date: Sun, 22 Jan 2017 20:37:14 -0800 Subject: Change to markdown (#21815) --- docs/layout/responsive-utilities.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/layout') diff --git a/docs/layout/responsive-utilities.md b/docs/layout/responsive-utilities.md index fdea34bd9..d1522e558 100644 --- a/docs/layout/responsive-utilities.md +++ b/docs/layout/responsive-utilities.md @@ -134,7 +134,8 @@ Try to use these on a limited basis and avoid creating entirely different versio ## Print classes -

Similar to the regular responsive classes, use these for toggling content for print.

+Similar to the regular responsive classes, use these for toggling content for print. +
-- cgit v1.2.3 From 519ecc1c69ddf1f8ba69c021c4450ee131cee391 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Jan 2017 00:01:44 -0800 Subject: Rename order utilities to intended class names (#21739) * rename order utilities to intended class names * Documentation fixes. --- docs/layout/grid.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/layout') diff --git a/docs/layout/grid.md b/docs/layout/grid.md index 58e51946e..4d0d3e6e8 100644 --- a/docs/layout/grid.md +++ b/docs/layout/grid.md @@ -514,13 +514,13 @@ Use flexbox utilities for controlling the **visual order** of your content. {% example html %}
-
+
First, but unordered
-
+
Second, but last
-
+
Third, but first
-- cgit v1.2.3 From e8015e3f16e87c5ebaf6b10d9f627a1dc7f8fe65 Mon Sep 17 00:00:00 2001 From: Bardi Harborow Date: Mon, 27 Feb 2017 21:42:26 +1100 Subject: Fix broken links. --- docs/layout/grid.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/layout') diff --git a/docs/layout/grid.md b/docs/layout/grid.md index 4d0d3e6e8..31d1f9a81 100644 --- a/docs/layout/grid.md +++ b/docs/layout/grid.md @@ -585,7 +585,7 @@ To nest your content with the default grid, add a new `.row` and set of `.col-sm ## Sass mixins -When using Bootstrap's source Sass files, you have the option of using Sass variables and mixins to create custom, semantic, and responsive page layouts. Our [predefined grid classes](#predefined-classes) use these same variables and mixins to provide a whole suite of ready-to-use classes for fast responsive layouts. +When using Bootstrap's source Sass files, you have the option of using Sass variables and mixins to create custom, semantic, and responsive page layouts. Our predefined grid classes use these same variables and mixins to provide a whole suite of ready-to-use classes for fast responsive layouts. ### Variables -- cgit v1.2.3 From ebe405a01b721b667a37ae5c249077f4cdb3b8bd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 3 Mar 2017 12:57:16 -0800 Subject: Start rearranging the docs for a utilities update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit — Rename display docs page — Move print display utils to display utils page — Drop remaining of responsive utils page as it's being replaced with display utils — Update nav to reflect changes --- docs/layout/responsive-utilities.md | 243 ------------------------------------ docs/layout/utilities-for-layout.md | 21 ++++ 2 files changed, 21 insertions(+), 243 deletions(-) delete mode 100644 docs/layout/responsive-utilities.md create mode 100644 docs/layout/utilities-for-layout.md (limited to 'docs/layout') diff --git a/docs/layout/responsive-utilities.md b/docs/layout/responsive-utilities.md deleted file mode 100644 index d1522e558..000000000 --- a/docs/layout/responsive-utilities.md +++ /dev/null @@ -1,243 +0,0 @@ ---- -layout: docs -title: Responsive utilities -description: Use responsive display utility classes for showing and hiding content by device, via media query. -group: layout ---- - -For faster mobile-friendly development, use these utility classes for showing and hiding content by device via media query. Also included are utility classes for toggling content when printed. - -Try to use these on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation. - -## Contents - -* Will be replaced with the ToC, excluding the "Contents" header -{:toc} - -## Available classes - -* The `.hidden-*-up` classes hide the element when the viewport is at the given breakpoint or wider. For example, `.hidden-md-up` hides an element on medium, large, and extra-large viewports. -* The `.hidden-*-down` classes hide the element when the viewport is at the given breakpoint or smaller. For example, `.hidden-md-down` hides an element on extra-small, small, and medium viewports. -* There are no explicit "visible"/"show" responsive utility classes; you make an element visible by simply not hiding it at that breakpoint size. -* You can combine one `.hidden-*-up` class with one `.hidden-*-down` class to show an element only on a given interval of screen sizes. For example, `.hidden-sm-down.hidden-xl-up` shows the element only on medium and large viewports. Using multiple `.hidden-*-up` classes or multiple `.hidden-*-down` classes is redundant and pointless. -* These classes don't attempt to accommodate less common cases where an element's visibility can't be expressed as a single contiguous range of viewport breakpoint sizes; you will instead need to use custom CSS in such cases. - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Extra small devices - Portrait phones (<576px) - - Small devices - Landscape phones (≥576px - <768px) - - Medium devices - Tablets (≥768px - <992px) - - Large devices - Desktops (≥992px - <1200px) - - Extra large devices - Desktops (≥1200px) -
.hidden-xs-downVisibleVisibleVisibleVisible
.hidden-sm-downVisibleVisibleVisible
.hidden-md-downVisibleVisible
.hidden-lg-downVisible
.hidden-xl-down
.hidden-xs-up
.hidden-sm-upVisible
.hidden-md-upVisibleVisible
.hidden-lg-upVisibleVisibleVisible
.hidden-xl-upVisibleVisibleVisibleVisible
- -## Print classes - -Similar to the regular responsive classes, use these for toggling content for print. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ClassBrowserPrint
.visible-print-blockVisible
(as display: block)
.visible-print-inlineVisible
(as display: inline)
.visible-print-inline-blockVisible
(as display: inline-block)
.hidden-printVisible
- -## Test cases - -Resize your browser or load on different devices to test the responsive utility classes. - -Green checkmarks indicate the element **is visible** in your current viewport. - -
-
- ✔ Visible on extra small - Extra small -
-
- ✔ Visible on small or narrower - Small or narrower -
-
- ✔ Visible on medium or narrower - Medium or narrower -
-
- ✔ Visible on large or narrower - Large or narrower -
-
- -
- -
-
- ✔ Visible on small or wider - Small or wider -
-
- ✔ Visible on medium or wider - Medium or wider -
-
- ✔ Visible on large or wider - Large or wider -
-
- ✔ Visible on extra large - Extra large -
-
- -
- -
-
- ✔ Your viewport is exactly extra small - Your viewport is NOT exactly extra small -
-
- ✔ Your viewport is exactly small - Your viewport is NOT exactly small -
-
- ✔ Your viewport is exactly medium - Your viewport is NOT exactly medium -
-
- -
-
- ✔ Your viewport is exactly large - Your viewport is NOT exactly large -
-
- ✔ Your viewport is exactly extra large - Your viewport is NOT exactly extra large -
-
diff --git a/docs/layout/utilities-for-layout.md b/docs/layout/utilities-for-layout.md new file mode 100644 index 000000000..50f4ce395 --- /dev/null +++ b/docs/layout/utilities-for-layout.md @@ -0,0 +1,21 @@ +--- +layout: docs +title: Utilities for layout +description: Use any of our dozens of responsive utility classes for showing, hiding, aligning, and spacing content. +group: layout +--- + +For faster mobile-friendly and responsive development, Bootstrap includes dozens of utility classes for showing, hiding, aligning, and spacing content. Below is a primer on what's included in Bootstrap and how these utilities can help you with layout. + +## Contents + +* Will be replaced with the ToC, excluding the "Contents" header +{:toc} + +## Changing `display` + +## Flexbox options + +## Margin and padding + +## Toggle `visibility` -- cgit v1.2.3 From c6fdac94154c4493d422e1441a5e52219b976219 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 3 Mar 2017 12:59:14 -0800 Subject: update instances of old classes in the docs --- docs/layout/grid.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/layout') diff --git a/docs/layout/grid.md b/docs/layout/grid.md index 31d1f9a81..738eafe62 100644 --- a/docs/layout/grid.md +++ b/docs/layout/grid.md @@ -471,7 +471,7 @@ If more than 12 columns are placed within a single row, each group of extra colu ### Column resets -With the handful of grid tiers 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]({{ site.baseurl }}/layout/responsive-utilities/). +With the handful of grid tiers 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 display utilities]({{ site.baseurl }}/utilities/display/).
{% example html %} @@ -480,7 +480,7 @@ With the handful of grid tiers available, you're bound to run into issues where,
.col-6 .col-sm-3
-
+
.col-6 .col-sm-3
.col-6 .col-sm-3
-- cgit v1.2.3 From a607ead34c62007842f8825068367ab95812e04c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Mar 2017 13:03:35 -0600 Subject: fill in docs for layout utils page --- docs/layout/utilities-for-layout.md | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'docs/layout') diff --git a/docs/layout/utilities-for-layout.md b/docs/layout/utilities-for-layout.md index 50f4ce395..881f3326d 100644 --- a/docs/layout/utilities-for-layout.md +++ b/docs/layout/utilities-for-layout.md @@ -14,8 +14,18 @@ For faster mobile-friendly and responsive development, Bootstrap includes dozens ## Changing `display` +Use our `display` utilities for responsively toggling common values of the `display` property. Mix it with our grid system, content, or components to show or hide them across specific viewports. + ## Flexbox options +Bootstrap 4 is built with flexbox, but not every element's `display` has been changed to `display: flex` as this would add many unnecessary overrides and unexpectedly change key browser behaviors. Most of [our components](/components/) are built with flexbox enabled. + +Should you need to add `display: flex` to an element, do so with `.d-flex` or one of the responsive variants (e.g., `.d-sm-flex`). You'll need this class or `display` value to allow the use of our extra [flexbox utilities](/utilities/flexbox/) for sizing, alignment, spacing, and more. + ## Margin and padding +Use the `margin` and `padding` [spacing utilities](/utilities/spacing/) to control how elements and components are spaced and sized. Bootstrap 4 includes a five-level scale for spacing utilities, based on a `1rem` value default `$spacer` variable. Choose values for all viewports (e.g., `.mr-3` for `margin-right: 1rem`), or pick responsive variants to target specific viewports (e.g., `.mr-md-3` for `margin-right: 1rem` starting at the `md` breakpoint). + ## Toggle `visibility` + +When toggling `display` isn't needed, you can toggle the `visibility` of an element with our [visibility utilities](/utilities/visibility/). -- cgit v1.2.3 From ac3a2fe9bf5bbfb2d0948da260d5353a03cc5b03 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Mar 2017 13:04:48 -0600 Subject: add more --- docs/layout/utilities-for-layout.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/layout') diff --git a/docs/layout/utilities-for-layout.md b/docs/layout/utilities-for-layout.md index 881f3326d..12ba7006c 100644 --- a/docs/layout/utilities-for-layout.md +++ b/docs/layout/utilities-for-layout.md @@ -28,4 +28,4 @@ Use the `margin` and `padding` [spacing utilities](/utilities/spacing/) to contr ## Toggle `visibility` -When toggling `display` isn't needed, you can toggle the `visibility` of an element with our [visibility utilities](/utilities/visibility/). +When toggling `display` isn't needed, you can toggle the `visibility` of an element with our [visibility utilities](/utilities/visibility/). Invisible elements will still affect the layout of the page, but are visually hidden from visitors. -- cgit v1.2.3 From 2d243086c93e83192668bff431bf44e2c42b467e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 25 Mar 2017 12:00:34 -0700 Subject: clean up mixin docs --- docs/layout/grid.md | 54 ++++++----------------------------------------------- 1 file changed, 6 insertions(+), 48 deletions(-) (limited to 'docs/layout') diff --git a/docs/layout/grid.md b/docs/layout/grid.md index 738eafe62..ab056a8d3 100644 --- a/docs/layout/grid.md +++ b/docs/layout/grid.md @@ -630,58 +630,16 @@ Mixins are used in conjunction with the grid variables to generate semantic CSS {% highlight scss %} // Creates a wrapper for a series of columns -@mixin make-row($gutters: $grid-gutter-widths) { - display: flex; - flex-wrap: wrap; - - @each $breakpoint in map-keys($gutters) { - @include media-breakpoint-up($breakpoint) { - $gutter: map-get($gutters, $breakpoint); - margin-right: ($gutter / -2); - margin-left: ($gutter / -2); - } - } -} +@include make-row($gutters: $grid-gutter-widths); // Make the element grid-ready (applying everything but the width) -@mixin make-col-ready($gutters: $grid-gutter-widths) { - position: relative; - // Prevent columns from becoming too narrow when at smaller grid tiers by - // always setting `width: 100%;`. This works because we use `flex` values - // later on to override this initial width. - width: 100%; - min-height: 1px; // Prevent collapsing - - @each $breakpoint in map-keys($gutters) { - @include media-breakpoint-up($breakpoint) { - $gutter: map-get($gutters, $breakpoint); - padding-right: ($gutter / 2); - padding-left: ($gutter / 2); - } - } -} - -@mixin make-col($size, $columns: $grid-columns) { - flex: 0 0 percentage($size / $columns); - width: percentage($size / $columns); - // Add a `max-width` to ensure content within each column does not blow out - // the width of the column. Applies to IE10+ and Firefox. Chrome and Safari - // do not appear to require this. - max-width: percentage($size / $columns); -} +@include make-col-ready($gutters: $grid-gutter-widths); +@include make-col($size, $columns: $grid-columns); // Get fancy by offsetting, or changing the sort order -@mixin make-col-offset($size, $columns: $grid-columns) { - margin-left: percentage($size / $columns); -} - -@mixin make-col-push($size, $columns: $grid-columns) { - left: if($size > 0, percentage($size / $columns), auto); -} - -@mixin make-col-pull($size, $columns: $grid-columns) { - right: if($size > 0, percentage($size / $columns), auto); -} +@include make-col-offset($size, $columns: $grid-columns); +@include make-col-push($size, $columns: $grid-columns); +@include make-col-pull($size, $columns: $grid-columns); {% endhighlight %} ### Example usage -- cgit v1.2.3 From 1a264be8b373419865f55f1c5f92890fd6bcbd03 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 25 Mar 2017 12:12:02 -0700 Subject: Redo semantic grid example and make it real in the docs --- docs/layout/grid.md | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'docs/layout') 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 this rendered example. - {% 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 %} -
-
-
...
-
...
+{% example html %} +
+
+
Main content
+
Secondary content
-{% endhighlight %} +{% endexample %} ## Customizing the grid -- cgit v1.2.3 From 9596cb5087d591094cdbd9c4936059e99562e8d3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 25 Mar 2017 16:00:51 -0700 Subject: clarify docs a bit more and remove some words; closes #21683 --- docs/layout/grid.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/layout') diff --git a/docs/layout/grid.md b/docs/layout/grid.md index 67a7289f6..73c84f8ce 100644 --- a/docs/layout/grid.md +++ b/docs/layout/grid.md @@ -130,11 +130,11 @@ See how aspects of the Bootstrap grid system work across multiple devices with a ## Auto-layout columns -Utilize breakpoint-specific column classes for equal-width columns. Add any number of unit-less classes for each breakpoint you need and every column will be the same width. +Utilize breakpoint-specific column classes for easy column sizing without an explicit numbered class like `.col-sm-6`. ### Equal-width -For example, here are two grid layouts that apply to every device and viewport, from `xs` to `xl`. +For example, here are two grid layouts that apply to every device and viewport, from `xs` to `xl`. Add any number of unit-less classes for each breakpoint you need and every column will be the same width.
{% example html %} @@ -164,7 +164,7 @@ For example, here are two grid layouts that apply to every device and viewport, ### Setting one column width -Auto-layout for flexbox grid columns also means you can set the width of one column and the others will automatically resize around it. You may use predefined grid classes (as shown below), grid mixins, or inline widths. Note that the other columns will resize no matter the width of the center column. +Auto-layout for flexbox grid columns also means you can set the width of one column and have the sibling columns automatically resize around it. You may use predefined grid classes (as shown below), grid mixins, or inline widths. Note that the other columns will resize no matter the width of the center column.
{% example html %} @@ -197,7 +197,7 @@ Auto-layout for flexbox grid columns also means you can set the width of one col ### Variable width content -Using the `col-{breakpoint}-auto` classes, columns can size itself based on the natural width of its content. This is super handy with single line content like inputs, numbers, etc. This, in conjunction with [horizontal alignment](#horizontal-alignment) classes, is very useful for centering layouts with uneven column sizes as viewport width changes. +Use `col-{breakpoint}-auto` classes to size columns based on the natural width of their content. Use these classes in conjunction with [horizontal alignment](#horizontal-alignment) classes for centering layouts with uneven column sizes as viewport width changes.
{% example html %} -- cgit v1.2.3 From 2b3a2b65a97eff40608538946aeba3b4ad3d8aea Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 25 Mar 2017 16:01:56 -0700 Subject: doh forgot to save --- docs/layout/grid.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/layout') diff --git a/docs/layout/grid.md b/docs/layout/grid.md index 73c84f8ce..95fd999f3 100644 --- a/docs/layout/grid.md +++ b/docs/layout/grid.md @@ -197,7 +197,7 @@ Auto-layout for flexbox grid columns also means you can set the width of one col ### Variable width content -Use `col-{breakpoint}-auto` classes to size columns based on the natural width of their content. Use these classes in conjunction with [horizontal alignment](#horizontal-alignment) classes for centering layouts with uneven column sizes as viewport width changes. +Use `col-{breakpoint}-auto` classes to size columns based on the natural width of their content.
{% example html %} -- cgit v1.2.3 From 1e6902d21f7e3fc226a96351539160433edf3ebf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 25 Mar 2017 22:27:24 -0700 Subject: fixes #22133 --- docs/layout/grid.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/layout') diff --git a/docs/layout/grid.md b/docs/layout/grid.md index 95fd999f3..ca3537e84 100644 --- a/docs/layout/grid.md +++ b/docs/layout/grid.md @@ -710,10 +710,11 @@ $grid-gutter-widths: ( ### Grid tiers -Moving beyond the columns themselves, you may also customize the number of grid tiers. If you wanted just three grid tiers, you'd update the `$grid-breakpoints` and `$container-max-widths` to something like this: +Moving beyond the columns themselves, you may also customize the number of grid tiers. If you wanted just four grid tiers, you'd update the `$grid-breakpoints` and `$container-max-widths` to something like this: {% highlight scss %} $grid-breakpoints: ( + xs: 0, sm: 480px, md: 768px, lg: 1024px -- cgit v1.2.3 From 9010978c1a1b397a9622e9e9aafeab8de8951a04 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 26 Mar 2017 12:37:28 -0700 Subject: add example and document bug behavior to fix #21967 --- docs/layout/grid.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'docs/layout') diff --git a/docs/layout/grid.md b/docs/layout/grid.md index ca3537e84..2eb704550 100644 --- a/docs/layout/grid.md +++ b/docs/layout/grid.md @@ -162,6 +162,22 @@ For example, here are two grid layouts that apply to every device and viewport, {% endexample %}
+Equal-width columns can be broken into multiple lines, but there is a [Safari flexbox bug](https://github.com/philipwalton/flexbugs#11-min-and-max-size-declarations-are-ignored-when-wrapping-flex-items) that prevents this from working without an explicit `flex-basis` or `border`. Our example works thanks to the `border` being set; you can do the same with `.col { border: 1px solid transparent; }`. Alternatively, you can set the flex-basis to the width of the column (e.g., `.col { flex: 1 0 50%; }`). + +
+{% example html %} +
+
+
Column
+
Column
+
+
Column
+
Column
+
+
+{% endexample %} +
+ ### Setting one column width Auto-layout for flexbox grid columns also means you can set the width of one column and have the sibling columns automatically resize around it. You may use predefined grid classes (as shown below), grid mixins, or inline widths. Note that the other columns will resize no matter the width of the center column. -- cgit v1.2.3 From 1d481519750d3ad5018206408bd583d94a11b54d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 26 Mar 2017 12:38:13 -0700 Subject: git that a link too for now --- docs/layout/grid.md | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs/layout') diff --git a/docs/layout/grid.md b/docs/layout/grid.md index 2eb704550..01fbfe493 100644 --- a/docs/layout/grid.md +++ b/docs/layout/grid.md @@ -164,6 +164,8 @@ For example, here are two grid layouts that apply to every device and viewport, Equal-width columns can be broken into multiple lines, but there is a [Safari flexbox bug](https://github.com/philipwalton/flexbugs#11-min-and-max-size-declarations-are-ignored-when-wrapping-flex-items) that prevents this from working without an explicit `flex-basis` or `border`. Our example works thanks to the `border` being set; you can do the same with `.col { border: 1px solid transparent; }`. Alternatively, you can set the flex-basis to the width of the column (e.g., `.col { flex: 1 0 50%; }`). +Both these fixes have been documented in a [reduced test case outside Bootstrap](https://output.jsbin.com/micohor). +
{% example html %}
-- cgit v1.2.3 From 7ca078da815320c75862b6cf25f46ce706570279 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 26 Mar 2017 12:53:50 -0700 Subject: fixes #22111 - add .col-*-auto to the extend in our grid framework mixins so it gets padding - this means we can avoid the col-12 classes in our docs for the responsive variants --- docs/layout/grid.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/layout') diff --git a/docs/layout/grid.md b/docs/layout/grid.md index 01fbfe493..7a16c52a7 100644 --- a/docs/layout/grid.md +++ b/docs/layout/grid.md @@ -224,7 +224,7 @@ Use `col-{breakpoint}-auto` classes to size columns based on the natural width o
1 of 3
-
+
Variable width content
@@ -235,7 +235,7 @@ Use `col-{breakpoint}-auto` classes to size columns based on the natural width o
1 of 3
-
+
Variable width content
-- cgit v1.2.3 From c8c51186f58886b114fbcc4e0b01dd2df3d74d36 Mon Sep 17 00:00:00 2001 From: Mike Cooper Date: Sat, 27 May 2017 04:06:25 +1000 Subject: update equal-width numbering in docs (#22697) --- docs/layout/grid.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/layout') diff --git a/docs/layout/grid.md b/docs/layout/grid.md index 7a16c52a7..97ffd3161 100644 --- a/docs/layout/grid.md +++ b/docs/layout/grid.md @@ -144,7 +144,7 @@ For example, here are two grid layouts that apply to every device and viewport, 1 of 2
- 1 of 2 + 2 of 2
@@ -152,10 +152,10 @@ For example, here are two grid layouts that apply to every device and viewport, 1 of 3
- 1 of 3 + 2 of 3
- 1 of 3 + 3 of 3
-- cgit v1.2.3