Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
044716ed
Commit
044716ed
authored
9 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
Conditionally include the flex utils in the import stack and reduce to a single query
parent
f50dedaa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scss/_utilities.scss
+4
-0
scss/_utilities.scss
scss/utilities/_flex.scss
+12
-22
scss/utilities/_flex.scss
with
16 additions
and
22 deletions
+16
-22
scss/_utilities.scss
+
4
-
0
View file @
044716ed
...
@@ -6,3 +6,7 @@
...
@@ -6,3 +6,7 @@
@import
"utilities/spacing"
;
@import
"utilities/spacing"
;
@import
"utilities/text"
;
@import
"utilities/text"
;
@import
"utilities/visibility"
;
@import
"utilities/visibility"
;
@if
$enable-flex
and
$enable-grid-classes
{
@import
"utilities/flex"
;
}
This diff is collapsed.
Click to expand it.
scss/utilities/_flex.scss
+
12
-
22
View file @
044716ed
...
@@ -2,34 +2,24 @@
...
@@ -2,34 +2,24 @@
//
//
// Custom styles for additional flex alignment options.
// Custom styles for additional flex alignment options.
@if
$enable-flex
and
$enable-grid-classes
{
@each
$breakpoint
in
map-keys
(
$grid-breakpoints
)
{
// Flex column reordering
// Flex column reordering
@include
media-breakpoint-up
(
$breakpoint
)
{
@each
$breakpoint
in
map-keys
(
$grid-breakpoints
)
{
.flex-
#{
$breakpoint
}
-first
{
order
:
-1
;
}
@include
media-breakpoint-up
(
$breakpoint
)
{
.flex-
#{
$breakpoint
}
-last
{
order
:
1
;
}
.flex-
#{
$breakpoint
}
-first
{
order
:
-1
;
}
.flex-
#{
$breakpoint
}
-last
{
order
:
1
;
}
}
}
}
// Alignment for every column in row
// Alignment for every column in row
@include
media-breakpoint-up
(
$breakpoint
)
{
@each
$breakpoint
in
map-keys
(
$grid-breakpoints
)
{
.flex-all-
#{
$breakpoint
}
-top
{
align-items
:
flex-start
;
}
@include
media-breakpoint-up
(
$breakpoint
)
{
.flex-all-
#{
$breakpoint
}
-center
{
align-items
:
center
;
}
.flex-all-
#{
$breakpoint
}
-top
{
align-items
:
flex-start
;
}
.flex-all-
#{
$breakpoint
}
-bottom
{
align-items
:
flex-end
;
}
.flex-all-
#{
$breakpoint
}
-center
{
align-items
:
center
;
}
.flex-all-
#{
$breakpoint
}
-bottom
{
align-items
:
flex-end
;
}
}
}
}
// Alignment per column
// Alignment per column
@include
media-breakpoint-up
(
$breakpoint
)
{
@each
$breakpoint
in
map-keys
(
$grid-breakpoints
)
{
.flex-
#{
$breakpoint
}
-top
{
align-self
:
flex-start
;
}
@include
media-breakpoint-up
(
$breakpoint
)
{
.flex-
#{
$breakpoint
}
-center
{
align-self
:
center
;
}
.flex-
#{
$breakpoint
}
-top
{
align-self
:
flex-start
;
}
.flex-
#{
$breakpoint
}
-bottom
{
align-self
:
flex-end
;
}
.flex-
#{
$breakpoint
}
-center
{
align-self
:
center
;
}
.flex-
#{
$breakpoint
}
-bottom
{
align-self
:
flex-end
;
}
}
}
}
}
}
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment