0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-19 16:54:24 +01:00

Merge pull request #18820 from twbs/media-obj-vars

Add variables for media object margins and padding
This commit is contained in:
Chris Rebert 2016-01-16 14:07:49 -08:00
commit dda263d9ac
2 changed files with 11 additions and 4 deletions

View File

@ -14,7 +14,7 @@
}
} @else {
.media {
margin-top: 15px;
margin-top: $media-margin-top;
&:first-child {
margin-top: 0;
@ -61,11 +61,11 @@
//
.media-right {
padding-left: 10px;
padding-left: $media-alignment-padding-x;
}
.media-left {
padding-right: 10px;
padding-right: $media-alignment-padding-x;
}
@ -75,7 +75,7 @@
.media-heading {
margin-top: 0;
margin-bottom: 5px;
margin-bottom: $media-heading-margin-bottom;
}

View File

@ -628,6 +628,13 @@ $breadcrumb-active-color: $gray-light !default;
$breadcrumb-divider: "/" !default;
// Media objects
$media-margin-top: 15px !default;
$media-heading-margin-bottom: 5px !default;
$media-alignment-padding-x: 10px !default;
// Carousel
$carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6) !default;