diff options
Diffstat (limited to 'assets/stylesheets/bootstrap/_media.scss')
-rw-r--r-- | assets/stylesheets/bootstrap/_media.scss | 82 |
1 files changed, 50 insertions, 32 deletions
diff --git a/assets/stylesheets/bootstrap/_media.scss b/assets/stylesheets/bootstrap/_media.scss index 8c835e8..c92e2b1 100644 --- a/assets/stylesheets/bootstrap/_media.scss +++ b/assets/stylesheets/bootstrap/_media.scss @@ -1,21 +1,45 @@ -.media { - // Proper spacing between instances of .media - margin-top: 15px; +@if $enable-flex { + .media { + display: flex; + margin-bottom: $spacer; + } + .media-body { + flex: 1; + } +} @else { + .media { + margin-top: 15px; - &:first-child { - margin-top: 0; + &:first-child { + margin-top: 0; + } + } + .media, + .media-body { + overflow: hidden; + zoom: 1; + } + .media-body { + width: 10000px; + } + .media-left, + .media-right, + .media-body { + display: table-cell; + vertical-align: top; + } + .media-middle { + vertical-align: middle; + } + .media-bottom { + vertical-align: bottom; } } -.media, -.media-body { - zoom: 1; - overflow: hidden; -} -.media-body { - width: 10000px; -} +// +// Images/elements as the media anchor +// .media-object { display: block; @@ -26,40 +50,34 @@ } } -.media-right, -.media > .pull-right { + +// +// Alignment +// + +.media-right { padding-left: 10px; } -.media-left, -.media > .pull-left { +.media-left { padding-right: 10px; } -.media-left, -.media-right, -.media-body { - display: table-cell; - vertical-align: top; -} - -.media-middle { - vertical-align: middle; -} -.media-bottom { - vertical-align: bottom; -} +// +// Headings +// -// Reset margins on headings for tighter default spacing .media-heading { margin-top: 0; margin-bottom: 5px; } + +// // Media list variation // -// Undo default ul/ol styles + .media-list { padding-left: 0; list-style: none; |