kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

fix up carousel alignment and line-height

Browse source
This commit is contained in:
Mark Otto 2012-07-08 21:47:16 -07:00
parent 20676ddd4d
commit db9925510b
3 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
docs/assets/css/bootstrap.css vendored
View file

@ -5298,16 +5298,25 @@ a.badge:hover {
right: 0; right: 0;
bottom: 0; bottom: 0;
left: 0; left: 0;
padding: 10px 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;

4
docs/assets/css/docs.css
View file

@ -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,

10
less/carousel.less
View file

@ -105,6 +105,7 @@
} }
} }
// Caption for text below images // Caption for text below images
// ----------------------------- // -----------------------------
@ -113,11 +114,18 @@
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
padding: 10px 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;
} }