diff options
| author | Chris Rebert <[email protected]> | 2016-01-16 14:07:49 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2016-01-16 14:07:49 -0800 |
| commit | dda263d9ac5832519f27ae44b6e087bfb305559b (patch) | |
| tree | 3ae104a170d81e1b0d0ab4e925ee318bf56ea873 | |
| parent | db5babb26a52a44d471a1ee65bcfbd5843471d4c (diff) | |
| parent | 4a667f5bb773c737edf5cd802bbc88f0eb30b9bd (diff) | |
| download | bootstrap-dda263d9ac5832519f27ae44b6e087bfb305559b.tar.xz bootstrap-dda263d9ac5832519f27ae44b6e087bfb305559b.zip | |
Merge pull request #18820 from twbs/media-obj-vars
Add variables for media object margins and padding
| -rw-r--r-- | scss/_media.scss | 8 | ||||
| -rw-r--r-- | scss/_variables.scss | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/scss/_media.scss b/scss/_media.scss index 1fc466cb7..d970c946a 100644 --- a/scss/_media.scss +++ b/scss/_media.scss @@ -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; } diff --git a/scss/_variables.scss b/scss/_variables.scss index 4042dc835..9e4a79f36 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -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; |