From c345c0d5e8f0cb1c817e068ed127314efc6913bc Mon Sep 17 00:00:00 2001 From: Leonard Kim Date: Tue, 24 Oct 2017 12:00:22 -0700 Subject: [PATCH] fix(filmstrip): do not apply flex on local video for horizontal mode Firefox flex behaves differently from chrome. In firefox, flex is not allowing the local video and invite button to exceed the height of the parent, causing the local video to display shorter than expected due to the invite button. Flex doesn't need to be applied for local video in horizontal filmstrip mode as it's only needed in vertical filmstrip mode to flip the position of the invite button from above the local video to below. Honestly, this could be better off done declaratively in the html, but that's not as straigtforward in this jquery+react world. --- css/_filmstrip.scss | 2 +- css/_vertical_filmstrip_overrides.scss | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/css/_filmstrip.scss b/css/_filmstrip.scss index f045b1f74..f10326dc6 100644 --- a/css/_filmstrip.scss +++ b/css/_filmstrip.scss @@ -65,7 +65,7 @@ */ &#filmstripLocalVideo { bottom: 32px; - flex-direction: column; + display: block; /** * The invite button style. diff --git a/css/_vertical_filmstrip_overrides.scss b/css/_vertical_filmstrip_overrides.scss index 2f052428b..5cb518a89 100644 --- a/css/_vertical_filmstrip_overrides.scss +++ b/css/_vertical_filmstrip_overrides.scss @@ -56,6 +56,7 @@ */ #filmstripLocalVideo { bottom: 5px; + display: flex; flex-direction: column-reverse; height: auto; justify-content: flex-start;