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
bfe20c29
Commit
bfe20c29
authored
9 years ago
by
Mark Otto
Browse files
Options
Download
Plain Diff
Merge pull request #19242 from twbs/carousel-caption-width
Extract $carousel-caption-width variable
parents
13c8ecd8
cbdb043e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scss/_carousel.scss
+4
-4
scss/_carousel.scss
scss/_variables.scss
+2
-0
scss/_variables.scss
with
6 additions
and
4 deletions
+6
-4
scss/_carousel.scss
+
4
-
4
View file @
bfe20c29
...
@@ -201,9 +201,9 @@
...
@@ -201,9 +201,9 @@
.carousel-caption
{
.carousel-caption
{
position
:
absolute
;
position
:
absolute
;
right
:
15%
;
right
:
((
100%
-
$carousel-caption-width
)
/
2
)
;
bottom
:
20px
;
bottom
:
20px
;
left
:
15%
;
left
:
((
100%
-
$carousel-caption-width
)
/
2
)
;
z-index
:
10
;
z-index
:
10
;
padding-top
:
20px
;
padding-top
:
20px
;
padding-bottom
:
20px
;
padding-bottom
:
20px
;
...
@@ -241,8 +241,8 @@
...
@@ -241,8 +241,8 @@
// Show and left align the captions
// Show and left align the captions
.carousel-caption
{
.carousel-caption
{
right
:
20%
;
right
:
((
100%
-
$carousel-caption-sm-up-width
)
/
2
)
;
left
:
20%
;
left
:
((
100%
-
$carousel-caption-sm-up-width
)
/
2
)
;
padding-bottom
:
30px
;
padding-bottom
:
30px
;
}
}
...
...
This diff is collapsed.
Click to expand it.
scss/_variables.scss
+
2
-
0
View file @
bfe20c29
...
@@ -783,6 +783,8 @@ $carousel-indicator-active-size: 12px !default;
...
@@ -783,6 +783,8 @@ $carousel-indicator-active-size: 12px !default;
$carousel-indicator-active-bg
:
#fff
!
default
;
$carousel-indicator-active-bg
:
#fff
!
default
;
$carousel-indicator-border-color
:
#fff
!
default
;
$carousel-indicator-border-color
:
#fff
!
default
;
$carousel-caption-width
:
70%
!
default
;
$carousel-caption-sm-up-width
:
60%
!
default
;
$carousel-caption-color
:
#fff
!
default
;
$carousel-caption-color
:
#fff
!
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