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
db992551
Commit
db992551
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
fix up carousel alignment and line-height
parent
20676ddd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docs/assets/css/bootstrap.css
+10
-1
docs/assets/css/bootstrap.css
docs/assets/css/docs.css
+2
-2
docs/assets/css/docs.css
less/carousel.less
+9
-1
less/carousel.less
with
21 additions
and
4 deletions
+21
-4
docs/assets/css/bootstrap.css
+
10
-
1
View file @
db992551
...
@@ -5298,16 +5298,25 @@ a.badge:hover {
...
@@ -5298,16 +5298,25 @@ a.badge:hover {
right
:
0
;
right
:
0
;
bottom
:
0
;
bottom
:
0
;
left
:
0
;
left
:
0
;
padding
:
1
0px
15px
5px
;
padding
:
15px
;
background
:
#333333
;
background
:
#333333
;
background
:
rgba
(
0
,
0
,
0
,
0.75
);
background
:
rgba
(
0
,
0
,
0
,
0.75
);
}
}
.carousel-caption
h4
,
.carousel-caption
h4
,
.carousel-caption
p
{
.carousel-caption
p
{
line-height
:
20px
;
color
:
#ffffff
;
color
:
#ffffff
;
}
}
.carousel-caption
h4
{
margin
:
0
0
5px
;
}
.carousel-caption
p
{
margin-bottom
:
0
;
}
.hero-unit
{
.hero-unit
{
padding
:
60px
;
padding
:
60px
;
margin-bottom
:
30px
;
margin-bottom
:
30px
;
...
...
This diff is collapsed.
Click to expand it.
docs/assets/css/docs.css
+
2
-
2
View file @
db992551
...
@@ -547,10 +547,10 @@ h2 + .row {
...
@@ -547,10 +547,10 @@ h2 + .row {
font-size
:
13px
;
font-size
:
13px
;
line-height
:
18px
;
line-height
:
18px
;
}
}
.bs-docs-example
p
{
.bs-docs-example
>
p
{
margin-bottom
:
9px
;
margin-bottom
:
9px
;
}
}
.bs-docs-example
p
:last-child
{
.bs-docs-example
>
p
:last-child
{
margin-bottom
:
0
;
margin-bottom
:
0
;
}
}
.bs-docs-example
.table
,
.bs-docs-example
.table
,
...
...
This diff is collapsed.
Click to expand it.
less/carousel.less
+
9
-
1
View file @
db992551
...
@@ -105,6 +105,7 @@
...
@@ -105,6 +105,7 @@
}
}
}
}
// Caption for text below images
// Caption for text below images
// -----------------------------
// -----------------------------
...
@@ -113,11 +114,18 @@
...
@@ -113,11 +114,18 @@
left: 0;
left: 0;
right: 0;
right: 0;
bottom: 0;
bottom: 0;
padding: 1
0px 15px
5px;
padding: 15px;
background: @grayDark;
background: @grayDark;
background: rgba(0,0,0,.75);
background: rgba(0,0,0,.75);
}
}
.carousel-caption h4,
.carousel-caption h4,
.carousel-caption p {
.carousel-caption p {
color: @white;
color: @white;
line-height: @baseLineHeight;
}
.carousel-caption h4 {
margin: 0 0 5px;
}
.carousel-caption p {
margin-bottom: 0;
}
}
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