From b76f7e6c3284d0bd060cac3380934fe29f141051 Mon Sep 17 00:00:00 2001 From: bill bittner Date: Thu, 19 Jul 2018 14:10:34 -0700 Subject: [PATCH 1/2] added object-fit and position to assets --- client/scss/components/_asset-display.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/scss/components/_asset-display.scss b/client/scss/components/_asset-display.scss index 20bcfd7d..33d3674b 100644 --- a/client/scss/components/_asset-display.scss +++ b/client/scss/components/_asset-display.scss @@ -9,6 +9,8 @@ .asset-image, .asset-video { max-width: 100%; max-height: 100%; + object-fit: contain; + object-position: center; margin : 0; } .asset-video { -- 2.45.3 From ce901e27817726abd9abee0f501db867e3fa979b Mon Sep 17 00:00:00 2001 From: bill bittner Date: Fri, 20 Jul 2018 09:58:18 -0700 Subject: [PATCH 2/2] alphabetized css properties --- client/scss/components/_asset-display.scss | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/client/scss/components/_asset-display.scss b/client/scss/components/_asset-display.scss index 33d3674b..11d42c4c 100644 --- a/client/scss/components/_asset-display.scss +++ b/client/scss/components/_asset-display.scss @@ -1,22 +1,21 @@ .asset-display { - flex: 1 0 auto; display: flex; - justify-content: center; - + flex: 1 0 auto; flex-direction: column; + justify-content: center; } .asset-image, .asset-video { + margin : 0; max-width: 100%; max-height: 100%; object-fit: contain; object-position: center; - margin : 0; } .asset-video { + border: 1px solid #d0d0d0; margin: 16px; padding: 6px; - border: 1px solid #d0d0d0; } .vertical-split .asset-display { height: 90vh; -- 2.45.3