From 2892675f65d0089fc907f664dfee6487e95d95cc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 21 Jul 2019 17:38:36 -0700 Subject: [PATCH] v4/v5: Add responsive containers (#29095) * create responsive containers provide more flexibility and allow the user to determine when containers switch from fluid to fixed width. * fix the base container code this commit fixes the non-media portion of the generated CSS. I learned about the `@extends` directive and was able to put it to good use. I create a new temporary map that contains all the main `$container-max-widths` and join it to our 2 special cases of 'xs' and 'fluid'. Then we loop through that and, with the appropriate infixes, extend our placeholder * formatting for style forgot to run my tests before the last push, i think these are better. * finish incomplete comment * fix the responsive containers using the `@extend` directive I was able to clean up this code * fix responsive containers in the navbar mostly we just look through all of our breakpoints so we can include all of the responsive container classes in the tweaks we have to do for the navbar (redeclaring flex properties, don't double up on padding, etc) * Simplify container extends * Simplify navbar containers * Rearrange, add comments, ensure everything is nested in $enable-grid-classes * Reduce new CSS by using attribute selector We avoid using `@extend` whenever possible, and this is more readable * Update _grid.scss * Update _navbar.scss * Add docs for responsive containers, redesign the container layout page * Add to the Grid example --- scss/_grid.scss | 23 +++++++--- scss/_navbar.scss | 9 ++-- .../4.3/assets/scss/_component-examples.scss | 43 ++++++------------- site/docs/4.3/examples/grid/grid.css | 7 +++ site/docs/4.3/examples/grid/index.html | 10 +++++ site/docs/4.3/layout/overview.md | 39 ++++++++++++----- 6 files changed, 77 insertions(+), 54 deletions(-) diff --git a/scss/_grid.scss b/scss/_grid.scss index 1fa243c0c6..dff2511289 100644 --- a/scss/_grid.scss +++ b/scss/_grid.scss @@ -3,23 +3,32 @@ // Set the container width, and override it for fixed navbars in media queries. @if $enable-grid-classes { + // Single container class with breakpoint max-widths .container { @include make-container(); @include make-container-max-widths(); } -} -// Fluid container -// -// Utilizes the mixin meant for fixed width containers, but with 100% width for -// fluid, full width layouts. - -@if $enable-grid-classes { + // 100% wide container at all breakpoints .container-fluid { @include make-container(); } + + // Responsive containers that are 100% wide until a breakpoint + @each $breakpoint, $container-max-width in $container-max-widths { + .container-#{$breakpoint} { + @include make-container(); + } + + @include media-breakpoint-up($breakpoint, $grid-breakpoints) { + .container-#{$breakpoint} { + max-width: $container-max-width; + } + } + } } + // Row // // Rows contain your columns. diff --git a/scss/_navbar.scss b/scss/_navbar.scss index d678017255..f633c86446 100644 --- a/scss/_navbar.scss +++ b/scss/_navbar.scss @@ -25,8 +25,7 @@ // Because flex properties aren't inherited, we need to redeclare these first // few properties so that content nested within behave properly. - > .container, - > .container-fluid { + > [class^="container"] { display: flex; flex-wrap: wrap; align-items: center; @@ -139,8 +138,7 @@ &#{$infix} { @include media-breakpoint-down($breakpoint) { - > .container, - > .container-fluid { + > [class^=".container"] { padding-right: 0; padding-left: 0; } @@ -164,8 +162,7 @@ } // For nesting containers, have to redeclare for alignment purposes - > .container, - > .container-fluid { + > [class^=".container"] { flex-wrap: nowrap; } diff --git a/site/docs/4.3/assets/scss/_component-examples.scss b/site/docs/4.3/assets/scss/_component-examples.scss index 2524f68b23..c2331f2272 100644 --- a/site/docs/4.3/assets/scss/_component-examples.scss +++ b/site/docs/4.3/assets/scss/_component-examples.scss @@ -37,6 +37,15 @@ border: 1px solid rgba($bd-purple, .15); } +.bd-example-responsive-containers { + [class^="container"] { + padding-top: .75rem; + padding-bottom: .75rem; + background-color: rgba(86, 61, 124, .15); + border: 1px solid rgba(86, 61, 124, .2); + } +} + // Grid mixins .example-container { width: 800px; @@ -76,37 +85,9 @@ // Container illustrations // -.bd-example-container { - min-width: 16rem; - max-width: 25rem; - margin-right: auto; - margin-left: auto; -} - -.bd-example-container-header { - height: 3rem; - margin-bottom: .5rem; - background-color: lighten($blue, 50%); - @include border-radius(); -} - -.bd-example-container-sidebar { - float: right; - width: 4rem; - height: 8rem; - background-color: lighten($blue, 25%); - @include border-radius(); -} - -.bd-example-container-body { - height: 8rem; - margin-right: 4.5rem; - background-color: lighten($bd-purple, 25%); - @include border-radius(); -} - -.bd-example-container-fluid { - max-width: none; +.example-container-element { + background-color: rgba($blue, .25); + border: 1px solid rgba($blue, .25); } diff --git a/site/docs/4.3/examples/grid/grid.css b/site/docs/4.3/examples/grid/grid.css index e726996d31..8032c31c3e 100644 --- a/site/docs/4.3/examples/grid/grid.css +++ b/site/docs/4.3/examples/grid/grid.css @@ -4,3 +4,10 @@ background-color: rgba(86, 61, 124, .15); border: 1px solid rgba(86, 61, 124, .2); } + +.themed-container { + padding: 15px; + margin-bottom: 30px; + background-color: rgba(0, 123, 255, .15); + border: 1px solid rgba(0, 123, 255, .2); +} diff --git a/site/docs/4.3/examples/grid/index.html b/site/docs/4.3/examples/grid/index.html index 9ea83e4460..8d06c52821 100644 --- a/site/docs/4.3/examples/grid/index.html +++ b/site/docs/4.3/examples/grid/index.html @@ -124,3 +124,13 @@ include_js: false + +
+

Responsive containers

+

Additional classes added in Bootstrap v4.4 allow containers that are 100% wide until a particular breakpoint.

+
+ +
.container-sm
+
.container-md
+
.container-lg
+
.container-xl
diff --git a/site/docs/4.3/layout/overview.md b/site/docs/4.3/layout/overview.md index ff21f2cba8..17ffb76dc4 100644 --- a/site/docs/4.3/layout/overview.md +++ b/site/docs/4.3/layout/overview.md @@ -9,15 +9,15 @@ 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). +Containers are the most basic layout element in Bootstrap and are **required when using our default grid system**. While containers *can* be nested, most layouts do not require a nested container. -While containers *can* be nested, most layouts do not require a nested container. +### All-in-one + +Our default `.container` class is a responsive, fixed-width container, meaning its `max-width` changes at each breakpoint.
-
-
-
-
+
+ .container
@@ -27,13 +27,13 @@ While containers *can* be nested, most layouts do not require a nested container
{% endhighlight %} +### Fluid + Use `.container-fluid` for a full width container, spanning the entire width of the viewport.
-
-
-
-
+
+ .container-fluid
@@ -43,6 +43,25 @@ Use `.container-fluid` for a full width container, spanning the entire width of
{% endhighlight %} +### Responsive + +Responsive containers are new in Bootstrap v4.4. They allow you to specify a class that is 100% wide until particular breakpoint is reached and a `max-width` is applied. For example, `.container-sm` is 100% wide to start until the `sm` breakpoint is reached, where it will remain through the higher breakpoints. + +
+
+ .container-sm (100% wide until breakpoint) +
+
+ .container-sm (With max-width at breakpoint) +
+
+ +{% highlight html %} +
100% wide until small breakpoint
+
100% wide until medium breakpoint
+
100% wide until large breakpoint
+
100% wide until extra large breakpoint
+{% endhighlight %} ## Responsive breakpoints