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
496f9c2d
Commit
496f9c2d
authored
9 years ago
by
Chris Rebert
Browse files
Options
Download
Plain Diff
Merge pull request #18822 from twbs/progress-box-shadow
Add $progress-box-shadow variable /fyi
@mdo
parents
f646ed79
46c9f4b1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scss/_progress.scss
+3
-3
scss/_progress.scss
scss/_variables.scss
+1
-0
scss/_variables.scss
with
4 additions
and
3 deletions
+4
-3
scss/_progress.scss
+
3
-
3
View file @
496f9c2d
...
...
@@ -59,13 +59,13 @@
.progress
[
value
]
::-webkit-progress-bar
{
background-color
:
$progress-bg
;
@include
border-radius
(
$border-radius
);
@include
box-shadow
(
inset
0
.1rem
.1rem
rgba
(
0
,
0
,
0
,.
1
)
);
@include
box-shadow
(
$progress-box-shadow
);
}
base
:
:-
moz-progress-bar
,
//
Absurd-but-syntactically-valid
selector
to
make
these
styles
Firefox-only
.
progress
[
value
]
{
background-color
:
$progress-bg
;
@include
border-radius
(
$border-radius
);
@include
box-shadow
(
inset
0
.1rem
.1rem
rgba
(
0
,
0
,
0
,.
1
)
);
@include
box-shadow
(
$progress-box-shadow
);
}
// IE9 hacks to accompany custom markup. We don't need to scope this via media queries, but I feel better doing it anyway.
...
...
@@ -73,7 +73,7 @@ base::-moz-progress-bar, // Absurd-but-syntactically-valid selector to make thes
.progress
{
background-color
:
$progress-bg
;
@include
border-radius
(
$border-radius
);
@include
box-shadow
(
inset
0
.1rem
.1rem
rgba
(
0
,
0
,
0
,.
1
)
);
@include
box-shadow
(
$progress-box-shadow
);
}
.progress-bar
{
display
:
inline-block
;
...
...
This diff is collapsed.
Click to expand it.
scss/_variables.scss
+
1
-
0
View file @
496f9c2d
...
...
@@ -575,6 +575,7 @@ $alert-danger-border: $state-danger-border !default;
$progress-bg
:
#eee
!
default
;
$progress-bar-color
:
#0074d9
!
default
;
$progress-border-radius
:
$border-radius
!
default
;
$progress-box-shadow
:
inset
0
.1rem
.1rem
rgba
(
0
,
0
,
0
,.
1
)
!
default
;
$progress-bar-bg
:
$brand-primary
!
default
;
$progress-bar-success-bg
:
$brand-success
!
default
;
...
...
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
Menu
Explore
Projects
Groups
Snippets