From b0c3f8f46291c213e4bacf060c1b2a82266cd041 Mon Sep 17 00:00:00 2001 From: Joe <33972521+hnb-ku@users.noreply.github.com> Date: Wed, 13 Feb 2019 12:23:49 +0800 Subject: [PATCH 1/2] UX: updates icon colors for FABs There was a recent change in core where the opacity property was removed from icons due to SVG rendering issues on iOS. The colors for core icons were adjusted after that change but the theme was still using the old colors. --- desktop/desktop.scss | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/desktop/desktop.scss b/desktop/desktop.scss index f7465dd..af83172 100644 --- a/desktop/desktop.scss +++ b/desktop/desktop.scss @@ -1,3 +1,5 @@ +@import "common/foundation/variables"; + @mixin boxShadow { box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 0 0 0 rgba(0, 0, 0, 0.12); } @@ -12,6 +14,19 @@ background-color 2s, transform 0.5s; } +// make header icons semi-translucent +.d-header-icons { + .d-icon { + color: rgba( + dark-light-choose( + scale-color($header_primary, $lightness: 50%), + $header_primary + ), + 0.7 + ); + } +} + //add shadow behind the list of topics on right in Category and Latest View //add shadow behind list of categories on left in Category and Latest View //add shadow behind topics in Latest view @@ -100,13 +115,14 @@ position: fixed; bottom: 30px; right: 50px; - z-index: 999; + z-index: z("composer", "content") - 1; background-color: $tertiary; color: $secondary; white-space: nowrap; overflow: hidden; .d-icon { margin: 0; + color: $secondary; } .d-button-label { display: inline-block; @@ -144,14 +160,15 @@ position: absolute; top: 50px; left: -18px; - z-index: 300; background-color: $tertiary; - color: $header-primary; @include buttonShadow; overflow: hidden; width: 60px; height: 60px; @include buttonTransition; + .d-icon { + color: $secondary; + } } //Increase size of reply icon From a1ce5ecc27fa11fb3f07cb1701f67cf243c5a472 Mon Sep 17 00:00:00 2001 From: Joe <33972521+hnb-ku@users.noreply.github.com> Date: Wed, 13 Feb 2019 12:29:59 +0800 Subject: [PATCH 2/2] DEV: removes unnecessary styles These were used to prevent images from being cropped (on one side) due to the lost width when topic / reply cards are factored in. This is being removed for two reasons: 1. It's no longer necessary since https://github.com/discourse/discourse/commit/2ee2e5c98175a4d46435c165602152e6d3d56473#diff-6ff7a83257165f5f3bdf4ab585411e46 was introduced in core. 2. It might create infinite-scroll issues when the images sizes are not set (height: auto) --- common/common.scss | 7 ------- 1 file changed, 7 deletions(-) diff --git a/common/common.scss b/common/common.scss index 5256c71..d652923 100644 --- a/common/common.scss +++ b/common/common.scss @@ -38,10 +38,3 @@ body textarea { border-radius: 0; box-shadow: none; } - -//No more image cropping -#reply-control .d-editor-preview img:not(.thumbnail):not(.emoji), -.cooked img:not(.thumbnail):not(.emoji) { - max-width: 100% !important; - height: auto; -}