From 9b31c8b7c5526452968d54dfff8713616d385c06 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 6 Apr 2014 20:25:15 +0200 Subject: [PATCH] Orbit: `min-height` for slides_container (instead of `height`) Using `min-height` (with `position:relative`) allows the slide container to get expanded, in case it contains elements of variable height (e.g. accordions). --- js/foundation/foundation.orbit.js | 6 +++--- scss/foundation/components/_orbit.scss | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/js/foundation/foundation.orbit.js b/js/foundation/foundation.orbit.js index d52c27427..ebc71ae98 100644 --- a/js/foundation/foundation.orbit.js +++ b/js/foundation/foundation.orbit.js @@ -152,7 +152,7 @@ }; if (slides_container.height() != next.height() && settings.variable_height) { - slides_container.animate({'height': next.height()}, 250, 'linear', unlock); + slides_container.animate({'min-height': next.height()}, 250, 'linear', unlock); } else { unlock(); } @@ -166,7 +166,7 @@ }; if (next.height() > slides_container.height() && settings.variable_height) { - slides_container.animate({'height': next.height()}, 250, 'linear', start_animation); + slides_container.animate({'min-height': next.height()}, 250, 'linear', start_animation); } else { start_animation(); } @@ -237,7 +237,7 @@ if ($(this).height() > h) { h = $(this).height(); } }); } - slides_container.height(h); + slides_container.css('minHeight', String(h)+'px'); }; self.create_timer = function() { diff --git a/scss/foundation/components/_orbit.scss b/scss/foundation/components/_orbit.scss index 22377ad5b..7e988d179 100644 --- a/scss/foundation/components/_orbit.scss +++ b/scss/foundation/components/_orbit.scss @@ -190,6 +190,8 @@ $orbit-timer-hide-for-small: true !default; &.active { opacity: 1; + // "relative" positioning is required for variable height of children. + position:relative; top: 0; left: 0; @include translate3d(0,0,0); -- 2.47.2