diff options
| author | Starsam80 <[email protected]> | 2016-11-27 16:19:27 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-11-27 15:19:27 -0800 |
| commit | 8d031090d0f2a42b392b3452416539334562e3a7 (patch) | |
| tree | 0950a48e0d9d95195a8f905256d3a204f5ceba49 /docs | |
| parent | 94be2d2254a9cf807725d391347b24d5a290a41f (diff) | |
| download | bootstrap-8d031090d0f2a42b392b3452416539334562e3a7.tar.xz bootstrap-8d031090d0f2a42b392b3452416539334562e3a7.zip | |
Rename `.flex-xs-*` and `.flex-items-xs-*` to `.flex-*` and `.flex-items-*` (#21218)
* Clean up _flex.scss a little
This commit just cleans up the formating of _flex.scss by changing
it so that it uses a single `@include media-breakpoint-up` instead
of multiple. It also aligns all of the CSS properties so it looks
a bit nicer.
* Remove `-xs` from flex classes
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/scss/_component-examples.scss | 6 | ||||
| -rw-r--r-- | docs/components/list-group.md | 8 | ||||
| -rw-r--r-- | docs/components/navs.md | 2 | ||||
| -rw-r--r-- | docs/layout/flexbox-grid.md | 28 |
4 files changed, 22 insertions, 22 deletions
diff --git a/docs/assets/scss/_component-examples.scss b/docs/assets/scss/_component-examples.scss index dea8eb5f3..01cd01871 100644 --- a/docs/assets/scss/_component-examples.scss +++ b/docs/assets/scss/_component-examples.scss @@ -19,9 +19,9 @@ } } - .flex-items-xs-top, - .flex-items-xs-middle, - .flex-items-xs-bottom { + .flex-items-top, + .flex-items-middle, + .flex-items-bottom { min-height: 6rem; background-color: rgba(255,0,0,.1); } diff --git a/docs/components/list-group.md b/docs/components/list-group.md index 49a6ced63..820470bbb 100644 --- a/docs/components/list-group.md +++ b/docs/components/list-group.md @@ -46,19 +46,19 @@ Add badges to any list group item to show unread counts, activity, etc. </ul> {% endexample %} -When in flexbox mode, you'll need to rearrange the contents of your list group items. To replicate the right-aligned badges as shown above, use the following example's code. Note the [`flex-items-xs-between` utility class]({{ site.baseurl }}/layout/flexbox-grid/#horizontal-alignment), the badge's placement, and the lack of a float utility on the badges. +When in flexbox mode, you'll need to rearrange the contents of your list group items. To replicate the right-aligned badges as shown above, use the following example's code. Note the [`flex-items-between` utility class]({{ site.baseurl }}/layout/flexbox-grid/#horizontal-alignment), the badge's placement, and the lack of a float utility on the badges. {% highlight html %} <ul class="list-group"> - <li class="list-group-item flex-items-xs-between"> + <li class="list-group-item flex-items-between"> Cras justo odio <span class="badge badge-default badge-pill">14</span> </li> - <li class="list-group-item flex-items-xs-between"> + <li class="list-group-item flex-items-between"> Dapibus ac facilisis in <span class="badge badge-default badge-pill">2</span> </li> - <li class="list-group-item flex-items-xs-between"> + <li class="list-group-item flex-items-between"> Morbi leo risus <span class="badge badge-default badge-pill">1</span> </li> diff --git a/docs/components/navs.md b/docs/components/navs.md index 86fd0463f..7ac1b5232 100644 --- a/docs/components/navs.md +++ b/docs/components/navs.md @@ -282,7 +282,7 @@ And pills, too: Using our [flexbox utilities]({{ site.baseurl }}/layout/flexbox-grid/#horizontal-alignment), you can also customize your navigation components to change the alignment of nav items. For example, here are center aligned links on the inline nav component. {% example html %} -<ul class="nav nav-inline d-flex flex-items-xs-center"> +<ul class="nav nav-inline d-flex flex-items-center"> <li class="nav-item"> <a class="nav-link active" href="#">Active</a> </li> diff --git a/docs/layout/flexbox-grid.md b/docs/layout/flexbox-grid.md index eafe7b59c..482392504 100644 --- a/docs/layout/flexbox-grid.md +++ b/docs/layout/flexbox-grid.md @@ -157,7 +157,7 @@ Use the flexbox alignment utilities to vertically align columns. <div class="bd-example-row"> {% example html %} <div class="container"> - <div class="row flex-items-xs-top"> + <div class="row flex-items-top"> <div class="col-xs"> One of three columns </div> @@ -168,7 +168,7 @@ Use the flexbox alignment utilities to vertically align columns. One of three columns </div> </div> - <div class="row flex-items-xs-middle"> + <div class="row flex-items-middle"> <div class="col-xs"> One of three columns </div> @@ -179,7 +179,7 @@ Use the flexbox alignment utilities to vertically align columns. One of three columns </div> </div> - <div class="row flex-items-xs-bottom"> + <div class="row flex-items-bottom"> <div class="col-xs"> One of three columns </div> @@ -198,13 +198,13 @@ Use the flexbox alignment utilities to vertically align columns. {% example html %} <div class="container"> <div class="row"> - <div class="col-xs flex-xs-top"> + <div class="col-xs flex-top"> One of three columns </div> - <div class="col-xs flex-xs-middle"> + <div class="col-xs flex-middle"> One of three columns </div> - <div class="col-xs flex-xs-bottom"> + <div class="col-xs flex-bottom"> One of three columns </div> </div> @@ -219,7 +219,7 @@ Flexbox utilities for horizontal alignment also exist for a number of layout opt <div class="bd-example-row"> {% example html %} <div class="container"> - <div class="row flex-items-xs-left"> + <div class="row flex-items-left"> <div class="col-4"> One of two columns </div> @@ -227,7 +227,7 @@ Flexbox utilities for horizontal alignment also exist for a number of layout opt One of two columns </div> </div> - <div class="row flex-items-xs-center"> + <div class="row flex-items-center"> <div class="col-4"> One of two columns </div> @@ -235,7 +235,7 @@ Flexbox utilities for horizontal alignment also exist for a number of layout opt One of two columns </div> </div> - <div class="row flex-items-xs-right"> + <div class="row flex-items-right"> <div class="col-4"> One of two columns </div> @@ -243,7 +243,7 @@ Flexbox utilities for horizontal alignment also exist for a number of layout opt One of two columns </div> </div> - <div class="row flex-items-xs-around"> + <div class="row flex-items-around"> <div class="col-4"> One of two columns </div> @@ -251,7 +251,7 @@ Flexbox utilities for horizontal alignment also exist for a number of layout opt One of two columns </div> </div> - <div class="row flex-items-xs-between"> + <div class="row flex-items-between"> <div class="col-4"> One of two columns </div> @@ -271,13 +271,13 @@ Flexbox utilities for controlling the **visual order** of your content. {% example html %} <div class="container"> <div class="row"> - <div class="col-xs flex-xs-unordered"> + <div class="col-xs flex-unordered"> First, but unordered </div> - <div class="col-xs flex-xs-last"> + <div class="col-xs flex-last"> Second, but last </div> - <div class="col-xs flex-xs-first"> + <div class="col-xs flex-first"> Third, but first </div> </div> |
