From 631d141ad0010cda69b8942ee46d84937cafc9f5 Mon Sep 17 00:00:00 2001 From: nightpool Date: Sun, 18 Nov 2018 18:35:42 -0500 Subject: [PATCH] fix full-width embeds and light theme embeds --- app/javascript/styles/cybre-light.scss | 12 +++++++----- app/javascript/styles/fullwidth-media.scss | 19 +++++++------------ 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/app/javascript/styles/cybre-light.scss b/app/javascript/styles/cybre-light.scss index c2457e3c2..3b61193e6 100644 --- a/app/javascript/styles/cybre-light.scss +++ b/app/javascript/styles/cybre-light.scss @@ -17,10 +17,8 @@ $action-button-color: $icon-button-inactive-color; $about-page-text: $primary-text-color; -@import 'application'; @import 'cybre-base'; - $gold-star: #dd9d08; /* cybre-specific additions */ @@ -265,6 +263,10 @@ $gold-star: #dd9d08; } } +.status-card, .status-card.compact { + border-color: $ui-highlight-color; +} + // selectivity -- needs to override .column-header > button .column-header .column-header__back-button { background: $header-color; @@ -784,7 +786,7 @@ button.icon-button { color: $primary-text-color; } -.admin-wrapper .content { +.admin-wrapper .content { & > p { color: $primary-text-color; } @@ -916,8 +918,8 @@ button.icon-button { color: $white; } } -.public-layout .header .brand:hover, -.public-layout .header .brand:focus, +.public-layout .header .brand:hover, +.public-layout .header .brand:focus, .public-layout .header .brand:active { background: lighten($ui-highlight-color, 5%); } diff --git a/app/javascript/styles/fullwidth-media.scss b/app/javascript/styles/fullwidth-media.scss index a681a3535..f6a036d4f 100644 --- a/app/javascript/styles/fullwidth-media.scss +++ b/app/javascript/styles/fullwidth-media.scss @@ -1,16 +1,14 @@ -/* Use 100% of the viewport width always*/ .detailed-status > .media-spoiler, .status > .media-spoiler, .status .video-player, .media-gallery, -.status .status-card { - margin-top:20px; - margin-left:-68px; +.status .status-card.interactive { + margin-top: 20px; + margin-left: -68px; width: calc(100% + 80px); } -/* Unset max-width for spoilers and the video player */ .detailed-status > .media-spoiler, .status > .media-spoiler, .video-player { @@ -25,16 +23,13 @@ margin-top: 40px; } -/* Undo transforms on videos inside the video player */ .status__video-player-video { - transform:unset; - top:unset; + transform: unset; + top: unset; } - -/* Adjust offset and width for detail view */ .detailed-status .media-gallery { - margin-left:-10px; + margin-left: -10px; width: calc(100% + 22px); } @@ -46,7 +41,7 @@ .video-player, .media-gallery, .status-card { - margin-top:20px; + margin-top: 20px; width: calc(100% + 94px); margin-left: -78px; }