From d04eb86715ea5842e9032e5c3bc3b70622b15fcd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 10 Dec 2016 17:03:32 -0800 Subject: clarify that --- docs/layout/overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/layout/overview.md') diff --git a/docs/layout/overview.md b/docs/layout/overview.md index 8ed7671a9..4dcb294dc 100644 --- a/docs/layout/overview.md +++ b/docs/layout/overview.md @@ -15,7 +15,7 @@ Bootstrap includes several components and options for laying out your project, i ## Containers -Containers are the most basic layout element in Bootstrap and are **required when using our grid system**. Choose from a responsive, fixed-width container (meaning its `max-width` changes at each breakpoint) or fluid-width (meaning it's `100%` wide all the time). +Containers are the most basic layout element in Bootstrap and are **required when using our default grid system**. Choose from a responsive, fixed-width container (meaning its `max-width` changes at each breakpoint) or fluid-width (meaning it's `100%` wide all the time). While containers *can* be nested, most layouts do not require a nested container. -- cgit v1.2.3 From eb2e1102be0f4641ee3e5c4e7853360d5a04e3d8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 21 Dec 2016 20:26:17 -0800 Subject: Flexbox all the time (Drop IE9 support and remove $enable-flex option) (#21389) * remove the $enable-flex variable option * remove bootstrap-flex.css dist file and it's grunt task * remove the separate flex css file for docs; it's all the same now * remove flexbox docs (porting some to the main grid docs in next commit) * clean up few grid docs bits to simplify copy, start to mention flexbox * port relevant flexbox-grid.md content to grid.md - clean up mixins - update how it works section - bring over sizing and alignment sections * remove the $enable-flex from the options.md page * update lead paragraph to mention flexbox * update migration to mention loss of ie9 support * remove mention of flexbox dist file * clarify IE support * making a note * remove flexbox variant mentions from component docs - updates docs for media object, navs, list group, and cards to consolidate docs - no more need to callout flexbox variants since it's now the default * remove $enable-flex if/else from sass files * remove flex dist files * update scss lint property order to account for flex properties * linting * change to numberless classes for autosizing, wrap in highlighting div * bump gruntfile and postcss to ie10 * redo intro sections * rearrange * phew, redo hella grid docs - rearrange all the things - consolidate some bits * remove reference to flexbox mode * more border action for demo * Make some changes to the .card's in .card-deck's to ensure footers align to the bottom --- docs/layout/overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/layout/overview.md') diff --git a/docs/layout/overview.md b/docs/layout/overview.md index 4dcb294dc..ee21b70f2 100644 --- a/docs/layout/overview.md +++ b/docs/layout/overview.md @@ -6,7 +6,7 @@ group: layout redirect_from: "/layout/" --- -Bootstrap includes several components and options for laying out your project, including wrapping containers, a powerful grid system, a flexible media object, and responsive utility classes. +Bootstrap includes several components and options for laying out your project, including wrapping containers, a powerful flexbox grid system, a flexible media object, and responsive utility classes. ## Contents -- cgit v1.2.3 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/overview.md') 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/overview.md') 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 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/overview.md') 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 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/overview.md') 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 fa2731b6264ad44c6d2600b7a4efab0ddaca7a06 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 27 May 2017 22:12:00 -0700 Subject: update layout pages --- docs/layout/overview.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'docs/layout/overview.md') diff --git a/docs/layout/overview.md b/docs/layout/overview.md index 04aa2c9ad..b167bbc2e 100644 --- a/docs/layout/overview.md +++ b/docs/layout/overview.md @@ -4,15 +4,9 @@ title: Overview description: Components and options for laying out your Bootstrap project, including wrapping containers, a powerful grid system, a flexible media object, and responsive utility classes. group: layout redirect_from: "/layout/" +toc: true --- -Bootstrap includes several components and options for laying out your project, including wrapping containers, a powerful flexbox grid system, a flexible media object, and responsive utility classes. - -## Contents - -* Will be replaced with the ToC, excluding the "Contents" header -{:toc} - ## Containers Containers are the most basic layout element in Bootstrap and are **required when using our default grid system**. Choose from a responsive, fixed-width container (meaning its `max-width` changes at each breakpoint) or fluid-width (meaning it's `100%` wide all the time). -- cgit v1.2.3 From 3e76d6565603fafa2c85ad81d7b6345c4e279c72 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 28 May 2017 22:50:57 -0700 Subject: Rearrange all the docs to allow for a docs/major.minor/ setup --- docs/layout/overview.md | 175 ------------------------------------------------ 1 file changed, 175 deletions(-) delete mode 100644 docs/layout/overview.md (limited to 'docs/layout/overview.md') diff --git a/docs/layout/overview.md b/docs/layout/overview.md deleted file mode 100644 index b167bbc2e..000000000 --- a/docs/layout/overview.md +++ /dev/null @@ -1,175 +0,0 @@ ---- -layout: docs -title: Overview -description: Components and options for laying out your Bootstrap project, including wrapping containers, a powerful grid system, a flexible media object, and responsive utility classes. -group: layout -redirect_from: "/layout/" -toc: true ---- - -## Containers - -Containers are the most basic layout element in Bootstrap and are **required when using our default grid system**. Choose from a responsive, fixed-width container (meaning its `max-width` changes at each breakpoint) or fluid-width (meaning it's `100%` wide all the time). - -While containers *can* be nested, most layouts do not require a nested container. - -
-
-
-
-
-
-
- -{% highlight html %} -
- -
-{% endhighlight %} - -Use `.container-fluid` for a full width container, spanning the entire width of the viewport. - -
-
-
-
-
-
-
- -{% highlight html %} -
- ... -
-{% endhighlight %} - - -## Responsive breakpoints - -Since Bootstrap is developed to be mobile first, we use a handful of [media queries](https://developer.mozilla.org/en-US/docs/Web/CSS/Media_Queries/Using_media_queries) to create sensible breakpoints for our layouts and interfaces. These breakpoints are mostly based on minimum viewport widths and allow us to scale up elements as the viewport changes. - -Bootstrap primarily uses the following media query ranges—or breakpoints—in our source Sass files for our layout, grid system, and components. - -{% highlight scss %} -// Extra small devices (portrait phones, less than 576px) -// No media query since this is the default in Bootstrap - -// Small devices (landscape phones, 576px and up) -@media (min-width: 576px) { ... } - -// Medium devices (tablets, 768px and up) -@media (min-width: 768px) { ... } - -// Large devices (desktops, 992px and up) -@media (min-width: 992px) { ... } - -// Extra large devices (large desktops, 1200px and up) -@media (min-width: 1200px) { ... } -{% endhighlight %} - -Since we write our source CSS in Sass, all our media queries are available via Sass mixins: - -{% highlight scss %} -@include media-breakpoint-up(xs) { ... } -@include media-breakpoint-up(sm) { ... } -@include media-breakpoint-up(md) { ... } -@include media-breakpoint-up(lg) { ... } -@include media-breakpoint-up(xl) { ... } - -// Example usage: -@include media-breakpoint-up(sm) { - .some-class { - display: block; - } -} -{% endhighlight %} - -We occasionally use media queries that go in the other direction (the given screen size *or smaller*): - -{% highlight scss %} -// Extra small devices (portrait phones, less than 576px) -@media (max-width: 575px) { ... } - -// Small devices (landscape phones, less than 768px) -@media (max-width: 767px) { ... } - -// Medium devices (tablets, less than 992px) -@media (max-width: 991px) { ... } - -// Large devices (desktops, less than 1200px) -@media (max-width: 1199px) { ... } - -// Extra large devices (large desktops) -// No media query since the extra-large breakpoint has no upper bound on its width -{% endhighlight %} - -Once again, these media queries are also available via Sass mixins: - -{% highlight scss %} -@include media-breakpoint-down(xs) { ... } -@include media-breakpoint-down(sm) { ... } -@include media-breakpoint-down(md) { ... } -@include media-breakpoint-down(lg) { ... } -{% endhighlight %} - -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) -@media (max-width: 575px) { ... } - -// Small devices (landscape phones, 576px and up) -@media (min-width: 576px) and (max-width: 767px) { ... } - -// Medium devices (tablets, 768px and up) -@media (min-width: 768px) and (max-width: 991px) { ... } - -// Large devices (desktops, 992px and up) -@media (min-width: 992px) and (max-width: 1199px) { ... } - -// Extra large devices (large desktops, 1200px and up) -@media (min-width: 1200px) { ... } -{% endhighlight %} - -These media queries are also available via Sass mixins: - -{% highlight scss %} -@include media-breakpoint-only(xs) { ... } -@include media-breakpoint-only(sm) { ... } -@include media-breakpoint-only(md) { ... } -@include media-breakpoint-only(lg) { ... } -@include media-breakpoint-only(xl) { ... } -{% endhighlight %} - -Similarly, media queries may span multiple breakpoint widths: - -{% highlight scss %} -// Example -// 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, xl) { ... } -{% endhighlight %} - -## Z-index - -Several Bootstrap components utilize `z-index`, the CSS property that helps control layout by providing a third axis to arrange content. We utilize a default z-index scale in Bootstrap that's been designed to properly layer navigation, tooltips and popovers, modals, and more. - -We don't encourage customization of these values; should you change one, you likely need to change them all. - -```scss -$zindex-dropdown-backdrop: 990 !default; -$zindex-dropdown: 1000 !default; -$zindex-fixed: 1030 !default; -$zindex-sticky: 1030 !default; -$zindex-modal-backdrop: 1040 !default; -$zindex-modal: 1050 !default; -$zindex-popover: 1060 !default; -$zindex-tooltip: 1070 !default; -``` - -Background elements—like the backdrops that allow click-dismissing—tend to reside on a lower `z-index`s, while navigation and popovers utilize higher `z-index`s to ensure they overlay surrounding content. -- cgit v1.2.3