Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename order utilities to intended class names #21739

Merged
merged 2 commits into from
Jan 24, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/layout/grid.md
Original file line number Diff line number Diff line change
Expand Up @@ -514,13 +514,13 @@ Use flexbox utilities for controlling the **visual order** of your content.
{% example html %}
<div class="container">
<div class="row">
<div class="col flex-unordered">
<div class="col order-0">
First, but unordered
</div>
<div class="col flex-last">
<div class="col order-last">
Second, but last
</div>
<div class="col flex-first">
<div class="col order-first">
Third, but first
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions docs/utilities/flexbox.md
Original file line number Diff line number Diff line change
Expand Up @@ -354,9 +354,9 @@ Change the _visual_ order of specific flex items with a handful of `order` utili

{% example html %}
<div class="d-flex flex-nowrap bd-highlight">
<div class="flex-last p-2 bd-highlight">First flex item</div>
<div class="order-last p-2 bd-highlight">First flex item</div>
<div class="p-2 bd-highlight">Second flex item</div>
<div class="flex-first p-2 bd-highlight">Third flex item</div>
<div class="order-first p-2 bd-highlight">Third flex item</div>
</div>
{% endexample %}

Expand All @@ -365,7 +365,7 @@ Responsive variations also exist for `order`.
{% for bp in site.data.breakpoints %}
- `.order{{ bp.abbr }}-first`
- `.order{{ bp.abbr }}-last`
- `.order{{ bp.abbr }}-unordered`{% endfor %}
- `.order{{ bp.abbr }}-0`{% endfor %}

## Align content

Expand Down
6 changes: 3 additions & 3 deletions scss/utilities/_flex.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
@include media-breakpoint-up($breakpoint) {
$infix: breakpoint-infix($breakpoint, $grid-breakpoints);

.flex#{$infix}-first { order: -1; }
.flex#{$infix}-last { order: 1; }
.flex#{$infix}-unordered { order: 0; }
.order#{$infix}-first { order: -1; }
.order#{$infix}-last { order: 1; }
.order#{$infix}-0 { order: 0; }

.flex#{$infix}-row { flex-direction: row !important; }
.flex#{$infix}-column { flex-direction: column !important; }
Expand Down