Skip to content
GitLab
Explore
Projects
Groups
Snippets
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
27cf3d67
Commit
27cf3d67
authored
8 years ago
by
Pierre-Denis Vanduynslager
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'twbs/v4-dev' into v4-dev
parents
f0c0a753
8e4f3fe7
Changes
162
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scss/utilities/_background.scss
+2
-4
scss/utilities/_background.scss
scss/utilities/_flex.scss
+1
-0
scss/utilities/_flex.scss
with
3 additions
and
4 deletions
+3
-4
scss/utilities/_background.scss
+
2
-
4
View file @
27cf3d67
...
...
@@ -2,10 +2,6 @@
// Contextual backgrounds
//
.bg-inverse
{
background-color
:
$brand-inverse
;
}
.bg-faded
{
background-color
:
$gray-lightest
;
}
...
...
@@ -19,3 +15,5 @@
@include
bg-variant
(
'.bg-warning'
,
$brand-warning
);
@include
bg-variant
(
'.bg-danger'
,
$brand-danger
);
@include
bg-variant
(
'.bg-inverse'
,
$brand-inverse
);
This diff is collapsed.
Click to expand it.
scss/utilities/_flex.scss
+
1
-
0
View file @
27cf3d67
...
...
@@ -8,6 +8,7 @@
@include
media-breakpoint-up
(
$breakpoint
)
{
.flex-
#{
$breakpoint
}
-first
{
order
:
-1
;
}
.flex-
#{
$breakpoint
}
-last
{
order
:
1
;
}
.flex-
#{
$breakpoint
}
-unordered
{
order
:
0
;
}
}
// Alignment for every item
...
...
This diff is collapsed.
Click to expand it.
Prev
1
…
5
6
7
8
9
Next
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
Menu
Explore
Projects
Groups
Snippets