From 2d26d1a09b1d4a9a6325ab6c8dba8c52710b4e93 Mon Sep 17 00:00:00 2001 From: Nicolas Coden Date: Sat, 16 Jun 2018 09:10:38 +0200 Subject: [PATCH] Use pull request #10842 from ncoden/fix/media-object-custom-component for v6.5.0 ee3399bc1 Revert "fix: prevent side-effect from .stack-for in media-object" Signed-off-by: Nicolas Coden --- scss/components/_media-object.scss | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scss/components/_media-object.scss b/scss/components/_media-object.scss index 1f6d44b3d..0ae8c51a6 100644 --- a/scss/components/_media-object.scss +++ b/scss/components/_media-object.scss @@ -38,12 +38,6 @@ $mediaobject-image-width-stacked: 100% !default; } } } - - &.stack-for-#{$-zf-zero-breakpoint} .media-object-section { - @include breakpoint($-zf-zero-breakpoint only) { - @include media-object-stack; - } - } } /// Adds styles for sections within a media object. @@ -69,6 +63,12 @@ $mediaobject-image-width-stacked: 100% !default; margin-bottom: 0; } + .stack-for-#{$-zf-zero-breakpoint} & { + @include breakpoint($-zf-zero-breakpoint only) { + @include media-object-stack; + } + } + @if $global-flexbox { &.main-section { flex: 1 1 0px; // sass-lint:disable-line zero-unit -- 2.47.3