root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 11 Packages Projects Releases Wiki Activity

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
parent db5babb26a 4a667f5bb7
commit dda263d9ac
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scss/_media.scss
View File

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

7
scss/_variables.scss
View File

@ -628,6 +628,13 @@ $breadcrumb-active-color: $gray-light !default;
$breadcrumb-divider: "/" !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
$carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6) !default; $carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6) !default;