From 330062b51c8c71726a5b2357c5a54a088f14039d Mon Sep 17 00:00:00 2001 From: Branden Date: Fri, 11 Jan 2019 12:35:04 +0900 Subject: [PATCH 01/37] Channel setting's additional options and edit message retention modal style missing fix --- scss/modules/inputs/_base.scss | 12 ++++++++++++ scss/modules/inputs/_messaging.scss | 7 +++++++ scss/modules/modals/_base.scss | 29 +++++++++++++++++++++++++++++ scss/modules/modals/_channel.scss | 20 ++++++++++++++++++++ 4 files changed, 68 insertions(+) diff --git a/scss/modules/inputs/_base.scss b/scss/modules/inputs/_base.scss index ac957780..6c7a0793 100644 --- a/scss/modules/inputs/_base.scss +++ b/scss/modules/inputs/_base.scss @@ -49,6 +49,18 @@ textarea { } } +.c-input_textarea { + border: 1px solid $color-shade-darkest; + color: $base-font-color; + background: $color-shade-light; + + &:active, + &:focus { + border-color: $color-shade-dark; + box-shadow: 0 0 7px rgba($color-shade-lightest, 0.15); + } +} + input:disabled, input:disabled:active, select:disabled, diff --git a/scss/modules/inputs/_messaging.scss b/scss/modules/inputs/_messaging.scss index f1f64163..aa88ac88 100644 --- a/scss/modules/inputs/_messaging.scss +++ b/scss/modules/inputs/_messaging.scss @@ -199,6 +199,13 @@ &__warning { color: $color-red; } + + &__emoji_happy_icon, + &__emoji_smile_icon, + &__emoji_circle_icon { + color: rgba($base-font-color, 0.3); + } + } .c-button { diff --git a/scss/modules/modals/_base.scss b/scss/modules/modals/_base.scss index 10f61ca8..dd5b4602 100644 --- a/scss/modules/modals/_base.scss +++ b/scss/modules/modals/_base.scss @@ -88,3 +88,32 @@ background-color: $color-shade-dark; } } + +.c-fullscreen_modal { + &__content { + background: $color-base; + } + + &__header { + background: $color-base; + } + + &__body { + color: $base-font-color; + } + + &__back, + &__close { + color: rgba($base-font-color, 0.5); + + &:hover { + // background: $color-shade-lightest; + color: $base-font-color; + } + + &:active { + // background: $color-shade-lightest; + color: $base-font-color; + } + } +} diff --git a/scss/modules/modals/_channel.scss b/scss/modules/modals/_channel.scss index 7287dd32..02a43dc5 100644 --- a/scss/modules/modals/_channel.scss +++ b/scss/modules/modals/_channel.scss @@ -107,3 +107,23 @@ .notification_prefs_icon::before { color: $base-font-color; } + +.channel_options_modal { + .c-fullscreen_modal { + &__title { + color: $base-font-color; + } + } +} + +.channel_option_item { + border-top-color: $color-shade-dark; + + .title { + color: $base-font-color; + } + + &:hover { + background: $color-shade-dark; + } +} From 65bd4ba93b882275d13ce5823ba4bf69e6dabde0 Mon Sep 17 00:00:00 2001 From: Branden Date: Fri, 11 Jan 2019 13:27:08 +0900 Subject: [PATCH 02/37] search modal files list missing style fix --- scss/modules/header/_search.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scss/modules/header/_search.scss b/scss/modules/header/_search.scss index 8ad1492e..ddf2550b 100644 --- a/scss/modules/header/_search.scss +++ b/scss/modules/header/_search.scss @@ -119,3 +119,7 @@ .c-search__input_and_close__close { color: $base-font-color; } + +.c-pillow_file_container { + background: $color-base; +} From 105570c7386b9a27148c895ff97dfe4e750eaef7 Mon Sep 17 00:00:00 2001 From: Branden Date: Mon, 27 May 2019 13:42:40 +0900 Subject: [PATCH 03/37] preference modal missing style added --- scss/modules/modals/_preferences.scss | 28 +++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/scss/modules/modals/_preferences.scss b/scss/modules/modals/_preferences.scss index 28b37451..40ef5c20 100644 --- a/scss/modules/modals/_preferences.scss +++ b/scss/modules/modals/_preferences.scss @@ -114,3 +114,31 @@ .jumbomoji_disabled_note { color: rgba($color-highlight, 0.6); } + +.c-sidebar_menu { + &__list_item { + color: $white; + + &.is_active { + background: $color-shade-light; + border-color: $color-shade-light; + } + } +} + +.p-prefs_modal__radiogroup { + label { + &.p-prefs_modal__radiogroup--selected { + background: $color-shade-light; + border-color: $color-shade-light; + + .p-prefs_modal__radio_decorator { + background: $color-shade-light; + } + } + } + + .p-prefs_modal__radio_decorator { + background: $color-base; + } +} \ No newline at end of file From 916305511e0a5e69edad33451e63b7b337b8f79d Mon Sep 17 00:00:00 2001 From: Branden Date: Mon, 27 May 2019 14:01:42 +0900 Subject: [PATCH 04/37] select input missing style added --- scss/modules/inputs/_base.scss | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/scss/modules/inputs/_base.scss b/scss/modules/inputs/_base.scss index c09aa9d0..fd194555 100644 --- a/scss/modules/inputs/_base.scss +++ b/scss/modules/inputs/_base.scss @@ -360,3 +360,19 @@ textarea { color: $base-font-color; } } + +.c-select_button { + background: $color-shade-light; + + &:active { + background: $color-shade-dark; + } + + &__icon, &:hover, &:hover .c-select_button__icon { + color: $white; + } + + &:focus { + box-shadow: 0 0 0 1px $white, 0 0 0 5px $color-shadow-transparent; + } +} \ No newline at end of file From 416ff45ef7bc9b51abe6d46f14ed04ad8b234491 Mon Sep 17 00:00:00 2001 From: Branden Date: Mon, 27 May 2019 14:03:28 +0900 Subject: [PATCH 05/37] moved select input style from base to _select.scss --- scss/modules/inputs/_select.scss | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/scss/modules/inputs/_select.scss b/scss/modules/inputs/_select.scss index 67874018..84c88ba9 100644 --- a/scss/modules/inputs/_select.scss +++ b/scss/modules/inputs/_select.scss @@ -22,3 +22,19 @@ color: $base-font-color; } } + +.c-select_button { + background: $color-shade-light; + + &:active { + background: $color-shade-dark; + } + + &__icon, &:hover, &:hover .c-select_button__icon { + color: $white; + } + + &:focus { + box-shadow: 0 0 0 1px $white, 0 0 0 5px $color-shadow-transparent; + } +} From 79eb6881c7802fa976aa0cca4d0620b3b0d54481 Mon Sep 17 00:00:00 2001 From: Branden Date: Mon, 27 May 2019 14:05:36 +0900 Subject: [PATCH 06/37] preference modal link color style added --- scss/modules/modals/_preferences.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scss/modules/modals/_preferences.scss b/scss/modules/modals/_preferences.scss index 40ef5c20..19524fb8 100644 --- a/scss/modules/modals/_preferences.scss +++ b/scss/modules/modals/_preferences.scss @@ -141,4 +141,12 @@ .p-prefs_modal__radio_decorator { background: $color-base; } +} + +.c-link--button { + color: $base-link-color; + + &:active, &:hover { + color: $base-link-color-active; + } } \ No newline at end of file From d335caa177156c0baeb2d810bf96e76d7b21e16c Mon Sep 17 00:00:00 2001 From: Branden Date: Mon, 27 May 2019 15:48:11 +0900 Subject: [PATCH 07/37] missing style added --- scss/modules/flexpane/_base.scss | 2 +- scss/modules/inputs/_select.scss | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/scss/modules/flexpane/_base.scss b/scss/modules/flexpane/_base.scss index 3f1e34eb..fb3699fc 100644 --- a/scss/modules/flexpane/_base.scss +++ b/scss/modules/flexpane/_base.scss @@ -136,5 +136,5 @@ } #client_body:not(.onboarding):not(.feature_global_nav_layout):before { - background: $color-shade-dark; + background: $color-base; } diff --git a/scss/modules/inputs/_select.scss b/scss/modules/inputs/_select.scss index 84c88ba9..9a8e12d6 100644 --- a/scss/modules/inputs/_select.scss +++ b/scss/modules/inputs/_select.scss @@ -23,18 +23,3 @@ } } -.c-select_button { - background: $color-shade-light; - - &:active { - background: $color-shade-dark; - } - - &__icon, &:hover, &:hover .c-select_button__icon { - color: $white; - } - - &:focus { - box-shadow: 0 0 0 1px $white, 0 0 0 5px $color-shadow-transparent; - } -} From 801877747f2061073f00c6696b1d43e88737706a Mon Sep 17 00:00:00 2001 From: Branden Date: Mon, 27 May 2019 15:58:39 +0900 Subject: [PATCH 08/37] select input scss file import added --- scss/styles.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/scss/styles.scss b/scss/styles.scss index 2c20138c..dfddac83 100644 --- a/scss/styles.scss +++ b/scss/styles.scss @@ -15,6 +15,7 @@ @import "modules/inputs/toggle"; @import "modules/inputs/label"; @import "modules/inputs/datepicker"; +@import "modules/inputs/select"; @import "modules/menu/base"; @import "modules/menu/autocomplete"; From 33927fa1b8978e16033fa88403b6eedcf8094407 Mon Sep 17 00:00:00 2001 From: Branden Date: Mon, 27 May 2019 15:59:21 +0900 Subject: [PATCH 09/37] select input style added --- scss/modules/inputs/_base.scss | 16 ---------------- scss/modules/inputs/_select.scss | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/scss/modules/inputs/_base.scss b/scss/modules/inputs/_base.scss index fd194555..2bb0d9b4 100644 --- a/scss/modules/inputs/_base.scss +++ b/scss/modules/inputs/_base.scss @@ -359,20 +359,4 @@ textarea { .ql-placeholder { color: $base-font-color; } -} - -.c-select_button { - background: $color-shade-light; - - &:active { - background: $color-shade-dark; - } - - &__icon, &:hover, &:hover .c-select_button__icon { - color: $white; - } - - &:focus { - box-shadow: 0 0 0 1px $white, 0 0 0 5px $color-shadow-transparent; - } } \ No newline at end of file diff --git a/scss/modules/inputs/_select.scss b/scss/modules/inputs/_select.scss index 9a8e12d6..26ca69b8 100644 --- a/scss/modules/inputs/_select.scss +++ b/scss/modules/inputs/_select.scss @@ -23,3 +23,33 @@ } } +.c-select_button { + background: $color-shade-light; + + &:active { + background: $color-shade-dark; + } + + &__icon, &:hover, &:hover .c-select_button__icon { + color: $white; + } + + &:focus { + box-shadow: 0 0 0 1px $white, 0 0 0 5px $color-shadow-transparent; + } +} + +.c-select_options_list { + &__wrapper { + background-color: $color-shade-light; + } + + &__option { + color: $color-highlight; + + &--selected { + color: $base-font-color; + } + + } +} \ No newline at end of file From eec2187dec7b2547c828fd4ba297900bb919b58e Mon Sep 17 00:00:00 2001 From: Branden Date: Wed, 29 May 2019 10:42:05 +0900 Subject: [PATCH 10/37] Threads page missing style added --- scss/modules/threads/_base.scss | 43 +++++++++++++++++++++++++++++++++ scss/styles.scss | 2 ++ 2 files changed, 45 insertions(+) create mode 100644 scss/modules/threads/_base.scss diff --git a/scss/modules/threads/_base.scss b/scss/modules/threads/_base.scss new file mode 100644 index 00000000..2d9a7ff6 --- /dev/null +++ b/scss/modules/threads/_base.scss @@ -0,0 +1,43 @@ +.p-threads_view_root, +.p-threads_view_reply, +.p-threads_view__footer { + border-color: $color-shade-mid; +} + +.p_threads_view_load_newer_button, +.p_threads_view_load_older_button { + border-color: $color-shade-mid; + background: $color-base; +} + +.p-threads_view { + background: $color-base; + + &__divider_line { + border-color: $color-shade-dark; + } + + &__divider_label { + color: $color-highlight; + background: $color-base; + } + + &__default_background { + background: $color-base; + } +} + +.p-threads_view_header { + &__channel_name { + color: $base-font-color; + } +} + +.p-threads_footer { + &__input--legacy { + .p-message_input_file_button, + .p-message_input_field { + border-color: $color-shade-mid; + } + } +} \ No newline at end of file diff --git a/scss/styles.scss b/scss/styles.scss index dfddac83..39da2da6 100644 --- a/scss/styles.scss +++ b/scss/styles.scss @@ -99,3 +99,5 @@ @import "modules/pages/legal"; @import "modules/pages/oauth"; @import "modules/pages/spaces"; + +@import "modules/threads/base"; \ No newline at end of file From b4c28011136596367d85f1372de9d6d186ad1867 Mon Sep 17 00:00:00 2001 From: Branden Date: Wed, 29 May 2019 10:50:07 +0900 Subject: [PATCH 11/37] moved threads styling to existing file --- scss/modules/messaging/_threads.scss | 44 ++++++++++++++++++++++++++++ scss/modules/threads/_base.scss | 43 --------------------------- 2 files changed, 44 insertions(+), 43 deletions(-) delete mode 100644 scss/modules/threads/_base.scss diff --git a/scss/modules/messaging/_threads.scss b/scss/modules/messaging/_threads.scss index 5ce9acc8..6266ee8b 100644 --- a/scss/modules/messaging/_threads.scss +++ b/scss/modules/messaging/_threads.scss @@ -146,3 +146,47 @@ ts-thread .thread_participants { color: $color-highlight; } } + +.p-threads_view_root, +.p-threads_view_reply, +.p-threads_view__footer { + border-color: $color-shade-mid; +} + +.p_threads_view_load_newer_button, +.p_threads_view_load_older_button { + border-color: $color-shade-mid; + background: $color-base; +} + +.p-threads_view { + background: $color-base; + + &__divider_line { + border-color: $color-shade-dark; + } + + &__divider_label { + color: $color-highlight; + background: $color-base; + } + + &__default_background { + background: $color-base; + } +} + +.p-threads_view_header { + &__channel_name { + color: $base-font-color; + } +} + +.p-threads_footer { + &__input--legacy { + .p-message_input_file_button, + .p-message_input_field { + border-color: $color-shade-mid; + } + } +} \ No newline at end of file diff --git a/scss/modules/threads/_base.scss b/scss/modules/threads/_base.scss deleted file mode 100644 index 2d9a7ff6..00000000 --- a/scss/modules/threads/_base.scss +++ /dev/null @@ -1,43 +0,0 @@ -.p-threads_view_root, -.p-threads_view_reply, -.p-threads_view__footer { - border-color: $color-shade-mid; -} - -.p_threads_view_load_newer_button, -.p_threads_view_load_older_button { - border-color: $color-shade-mid; - background: $color-base; -} - -.p-threads_view { - background: $color-base; - - &__divider_line { - border-color: $color-shade-dark; - } - - &__divider_label { - color: $color-highlight; - background: $color-base; - } - - &__default_background { - background: $color-base; - } -} - -.p-threads_view_header { - &__channel_name { - color: $base-font-color; - } -} - -.p-threads_footer { - &__input--legacy { - .p-message_input_file_button, - .p-message_input_field { - border-color: $color-shade-mid; - } - } -} \ No newline at end of file From 91e6d70b83bb5ffb14d63f2214ac632d8504df33 Mon Sep 17 00:00:00 2001 From: Branden Date: Wed, 29 May 2019 10:50:51 +0900 Subject: [PATCH 12/37] added missing style for highlight panel in All unreads pane --- scss/modules/messaging/_unreads.scss | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/scss/modules/messaging/_unreads.scss b/scss/modules/messaging/_unreads.scss index 2cb5fc31..fb63f28f 100644 --- a/scss/modules/messaging/_unreads.scss +++ b/scss/modules/messaging/_unreads.scss @@ -110,3 +110,30 @@ background: $color-base; background-image: none; } + +.sli_briefing { + background: $color-base; +} + +.sli_briefing_preview { + background-color: $color-base; + border-color: $color-shade-mid; + + &__title { + color: $base-font-color; + } + + &__description_text { + b { + color: $base-font-color; + } + } +} + +.sli_briefing_preview_container { + &::after, + &::before { + border-color: $color-shade-mid; + background-color: $color-base; + } +} \ No newline at end of file From 4cac10f8234b8a8f8f815bfa15fe04c403518f77 Mon Sep 17 00:00:00 2001 From: Branden Date: Wed, 29 May 2019 10:52:48 +0900 Subject: [PATCH 13/37] moved threads style to existing file --- scss/styles.scss | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scss/styles.scss b/scss/styles.scss index 39da2da6..0a57e49d 100644 --- a/scss/styles.scss +++ b/scss/styles.scss @@ -98,6 +98,4 @@ @import "modules/pages/apps"; @import "modules/pages/legal"; @import "modules/pages/oauth"; -@import "modules/pages/spaces"; - -@import "modules/threads/base"; \ No newline at end of file +@import "modules/pages/spaces"; \ No newline at end of file From 0c219439e84906431875a74e39d0f84e1d4b0490 Mon Sep 17 00:00:00 2001 From: Branden Date: Wed, 29 May 2019 11:07:58 +0900 Subject: [PATCH 14/37] Threads pane scrollbar color change --- scss/modules/messaging/_threads.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scss/modules/messaging/_threads.scss b/scss/modules/messaging/_threads.scss index 6266ee8b..fe4d7e99 100644 --- a/scss/modules/messaging/_threads.scss +++ b/scss/modules/messaging/_threads.scss @@ -189,4 +189,8 @@ ts-thread .thread_participants { border-color: $color-shade-mid; } } +} + +.c-scrollbar__bar { + background: rgba($white, .25); } \ No newline at end of file From cede8442ecd09602579986589ddf1efd654f80b4 Mon Sep 17 00:00:00 2001 From: Branden Date: Fri, 31 May 2019 13:22:19 +0900 Subject: [PATCH 15/37] resolved review by @mastermel --- scss/modules/modals/_base.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/scss/modules/modals/_base.scss b/scss/modules/modals/_base.scss index dd5b4602..c9a8e614 100644 --- a/scss/modules/modals/_base.scss +++ b/scss/modules/modals/_base.scss @@ -107,12 +107,10 @@ color: rgba($base-font-color, 0.5); &:hover { - // background: $color-shade-lightest; color: $base-font-color; } &:active { - // background: $color-shade-lightest; color: $base-font-color; } } From 1831aa5d144860f10028e33f696774efbe5c50c9 Mon Sep 17 00:00:00 2001 From: Branden Date: Fri, 31 May 2019 13:28:54 +0900 Subject: [PATCH 16/37] resolving reviews --- scss/modules/inputs/_base.scss | 2 +- scss/modules/inputs/_messaging.scss | 4 ++-- scss/modules/modals/_channel.scss | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scss/modules/inputs/_base.scss b/scss/modules/inputs/_base.scss index 2bb0d9b4..e72ba645 100644 --- a/scss/modules/inputs/_base.scss +++ b/scss/modules/inputs/_base.scss @@ -50,9 +50,9 @@ textarea { } .c-input_textarea { + background: $color-shade-light; border: 1px solid $color-shade-darkest; color: $base-font-color; - background: $color-shade-light; &:active, &:focus { diff --git a/scss/modules/inputs/_messaging.scss b/scss/modules/inputs/_messaging.scss index aa88ac88..5459de3c 100644 --- a/scss/modules/inputs/_messaging.scss +++ b/scss/modules/inputs/_messaging.scss @@ -199,8 +199,8 @@ &__warning { color: $color-red; } - - &__emoji_happy_icon, + + &__emoji_happy_icon, &__emoji_smile_icon, &__emoji_circle_icon { color: rgba($base-font-color, 0.3); diff --git a/scss/modules/modals/_channel.scss b/scss/modules/modals/_channel.scss index 02a43dc5..eb49eed2 100644 --- a/scss/modules/modals/_channel.scss +++ b/scss/modules/modals/_channel.scss @@ -108,7 +108,7 @@ color: $base-font-color; } -.channel_options_modal { +.channel_options_modal { .c-fullscreen_modal { &__title { color: $base-font-color; From e50712da481199c8b1dc68a69904146314074fce Mon Sep 17 00:00:00 2001 From: Branden Date: Fri, 31 May 2019 13:33:12 +0900 Subject: [PATCH 17/37] resolved lint reviews --- scss/modules/messaging/_threads.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scss/modules/messaging/_threads.scss b/scss/modules/messaging/_threads.scss index fe4d7e99..2506dbb8 100644 --- a/scss/modules/messaging/_threads.scss +++ b/scss/modules/messaging/_threads.scss @@ -153,10 +153,10 @@ ts-thread .thread_participants { border-color: $color-shade-mid; } -.p_threads_view_load_newer_button, +.p_threads_view_load_newer_button, .p_threads_view_load_older_button { - border-color: $color-shade-mid; background: $color-base; + border-color: $color-shade-mid; } .p-threads_view { @@ -167,8 +167,8 @@ ts-thread .thread_participants { } &__divider_label { - color: $color-highlight; background: $color-base; + color: $color-highlight; } &__default_background { @@ -193,4 +193,4 @@ ts-thread .thread_participants { .c-scrollbar__bar { background: rgba($white, .25); -} \ No newline at end of file +} From 7a37a352813d6570de656b19924cf3960b4f192b Mon Sep 17 00:00:00 2001 From: Branden Date: Fri, 31 May 2019 13:39:05 +0900 Subject: [PATCH 18/37] resolving lint reviews --- scss/modules/inputs/_base.scss | 2 +- scss/modules/inputs/_select.scss | 7 ++++--- scss/modules/messaging/_threads.scss | 2 +- scss/modules/messaging/_unreads.scss | 4 ++-- scss/modules/modals/_preferences.scss | 7 ++++--- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/scss/modules/inputs/_base.scss b/scss/modules/inputs/_base.scss index e72ba645..716cb5cd 100644 --- a/scss/modules/inputs/_base.scss +++ b/scss/modules/inputs/_base.scss @@ -359,4 +359,4 @@ textarea { .ql-placeholder { color: $base-font-color; } -} \ No newline at end of file +} diff --git a/scss/modules/inputs/_select.scss b/scss/modules/inputs/_select.scss index 26ca69b8..6a2959f7 100644 --- a/scss/modules/inputs/_select.scss +++ b/scss/modules/inputs/_select.scss @@ -30,7 +30,9 @@ background: $color-shade-dark; } - &__icon, &:hover, &:hover .c-select_button__icon { + &__icon, + &:hover, + &:hover .c-select_button__icon { color: $white; } @@ -50,6 +52,5 @@ &--selected { color: $base-font-color; } - } -} \ No newline at end of file +} diff --git a/scss/modules/messaging/_threads.scss b/scss/modules/messaging/_threads.scss index 2506dbb8..b07b37b2 100644 --- a/scss/modules/messaging/_threads.scss +++ b/scss/modules/messaging/_threads.scss @@ -192,5 +192,5 @@ ts-thread .thread_participants { } .c-scrollbar__bar { - background: rgba($white, .25); + background: rgba($white, 0.25); } diff --git a/scss/modules/messaging/_unreads.scss b/scss/modules/messaging/_unreads.scss index fb63f28f..8c34a9b6 100644 --- a/scss/modules/messaging/_unreads.scss +++ b/scss/modules/messaging/_unreads.scss @@ -133,7 +133,7 @@ .sli_briefing_preview_container { &::after, &::before { - border-color: $color-shade-mid; background-color: $color-base; + border-color: $color-shade-mid; } -} \ No newline at end of file +} diff --git a/scss/modules/modals/_preferences.scss b/scss/modules/modals/_preferences.scss index 19524fb8..5d53200c 100644 --- a/scss/modules/modals/_preferences.scss +++ b/scss/modules/modals/_preferences.scss @@ -119,7 +119,7 @@ &__list_item { color: $white; - &.is_active { + &.is_active { background: $color-shade-light; border-color: $color-shade-light; } @@ -146,7 +146,8 @@ .c-link--button { color: $base-link-color; - &:active, &:hover { + &:active, + &:hover { color: $base-link-color-active; } -} \ No newline at end of file +} From 228be65905899ee57bcb34294b0f07fcae8b62ad Mon Sep 17 00:00:00 2001 From: Branden Date: Fri, 12 Jul 2019 15:11:15 +0900 Subject: [PATCH 19/37] post message checklist background fix --- scss/modules/flexpane/_files.scss | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/scss/modules/flexpane/_files.scss b/scss/modules/flexpane/_files.scss index 35283470..f7961b18 100644 --- a/scss/modules/flexpane/_files.scss +++ b/scss/modules/flexpane/_files.scss @@ -433,6 +433,10 @@ html.no_touch a.filetype_button_web:hover { &__title { color: $base-font-color; } + + &__content--collapsed:after { + background: linear-gradient(0deg, $color-shade-darkest, hsla(0,0%,100%,0) 40px); + } } .p-file_list { @@ -481,3 +485,11 @@ html.no_touch a.filetype_button_web:hover { } } } + +.c-pillow_file__post { + &__content { + ul.checklist { + background-color: $color-base; + } + } +} \ No newline at end of file From c00194e923d2d17f525b8b3ea91aa40109cd9863 Mon Sep 17 00:00:00 2001 From: Branden Date: Fri, 26 Jul 2019 11:22:45 +0900 Subject: [PATCH 20/37] header and message line color fix for >4.0 --- scss/modules/header/_base.scss | 31 +++++++++++++++++++++++++++++ scss/modules/pages/admin/_base.scss | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/scss/modules/header/_base.scss b/scss/modules/header/_base.scss index 61e0db9c..215b6edd 100644 --- a/scss/modules/header/_base.scss +++ b/scss/modules/header/_base.scss @@ -135,3 +135,34 @@ #edit_topic_trigger { color: $base-link-color; } + +.p-classic_nav { + background: $color-base; + &__model { + &__title { + &__info { + color: $base-font-color; + } + } + + &__button { + color: $base-font-color; + } + } + + &__right { + &__search { + border-color: $base-font-color; + &__icon { + color: $base-font-color; + } + &__placeholder { + color: $base-font-color; + } + } + + &__button { + color: $base-font-color; + } + } +} \ No newline at end of file diff --git a/scss/modules/pages/admin/_base.scss b/scss/modules/pages/admin/_base.scss index f0428d84..31cc3245 100644 --- a/scss/modules/pages/admin/_base.scss +++ b/scss/modules/pages/admin/_base.scss @@ -46,7 +46,7 @@ header { footer, #autocomplete_menu.search_menu footer.unified { - background-color: $color-shade-dark; + background-color: $color-base; border-color: $color-shade-darkest; color: $base-font-color; From 3984b1f3a23e798a4b3dfc3d38aab823a4069ec1 Mon Sep 17 00:00:00 2001 From: Branden Date: Fri, 26 Jul 2019 11:57:57 +0900 Subject: [PATCH 21/37] missing style add for > 4.0 --- scss/modules/inputs/_base.scss | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/scss/modules/inputs/_base.scss b/scss/modules/inputs/_base.scss index 716cb5cd..3d280fdb 100644 --- a/scss/modules/inputs/_base.scss +++ b/scss/modules/inputs/_base.scss @@ -360,3 +360,20 @@ textarea { color: $base-font-color; } } + +.c-texty_input.focus { + .c-texty_input { + &__button { + color: $white; + } + } +} + +.p-workspace__input { + .p-message_input_field.focus { + background: $color-shade-light; + &~.p-message_input_file_button:not(:hover) { + color: $white; + } + } +} \ No newline at end of file From dc1d4200d35c8ea38387e26e8c93a3820780abd3 Mon Sep 17 00:00:00 2001 From: Branden Date: Fri, 26 Jul 2019 13:16:42 +0900 Subject: [PATCH 22/37] style change --- scss/modules/inputs/_base.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scss/modules/inputs/_base.scss b/scss/modules/inputs/_base.scss index 3d280fdb..ab78791a 100644 --- a/scss/modules/inputs/_base.scss +++ b/scss/modules/inputs/_base.scss @@ -370,10 +370,11 @@ textarea { } .p-workspace__input { + .p-message_input_field, .p-message_input_field.focus { background: $color-shade-light; &~.p-message_input_file_button:not(:hover) { color: $white; } - } + } } \ No newline at end of file From 40a760aeabfb664a3b267c6d5dea83643a18054b Mon Sep 17 00:00:00 2001 From: Branden Date: Fri, 26 Jul 2019 14:05:33 +0900 Subject: [PATCH 23/37] download flexpane body background change --- scss/modules/flexpane/_base.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scss/modules/flexpane/_base.scss b/scss/modules/flexpane/_base.scss index fb3699fc..ec891e42 100644 --- a/scss/modules/flexpane/_base.scss +++ b/scss/modules/flexpane/_base.scss @@ -133,6 +133,9 @@ border-color: $color-shade-light; color: $base-font-color; } + &__body { + background: $color-base; + } } #client_body:not(.onboarding):not(.feature_global_nav_layout):before { From c379ad0fbdb21d95d5d5a154c3374f27a44a3c85 Mon Sep 17 00:00:00 2001 From: Branden Date: Mon, 29 Jul 2019 11:54:24 +0900 Subject: [PATCH 24/37] file upload dialog missing style --- scss/modules/modals/_file.scss | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/scss/modules/modals/_file.scss b/scss/modules/modals/_file.scss index bbf5a37d..73b69029 100644 --- a/scss/modules/modals/_file.scss +++ b/scss/modules/modals/_file.scss @@ -103,3 +103,18 @@ border-color: $color-shade-dark; } } + +.p-multi_file_upload { + &__container { + .p-galler_scroller { + &__wrapper { + background: $color-base; + border-color: $color-base; + } + } + } + + &__file_gallery { + background: $color-base; + } +} \ No newline at end of file From bc11e636e7b429a0da494974109f077eff3c0044 Mon Sep 17 00:00:00 2001 From: Branden Date: Tue, 30 Jul 2019 14:42:38 +0900 Subject: [PATCH 25/37] channel pinned item style fix v4 --- scss/modules/flexpane/_channel.scss | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scss/modules/flexpane/_channel.scss b/scss/modules/flexpane/_channel.scss index 65515908..5ac3a214 100644 --- a/scss/modules/flexpane/_channel.scss +++ b/scss/modules/flexpane/_channel.scss @@ -240,3 +240,12 @@ color: $color-highlight; } } + +.c-message_kit { + &__pillow { + background: $color-base; + &:hover { + border-color: $color-shade-light; + } + } +} From c316bf2029dcb8dab1aaec4bb8b54dacae7d9f9b Mon Sep 17 00:00:00 2001 From: Branden Date: Tue, 30 Jul 2019 14:47:29 +0900 Subject: [PATCH 26/37] channel highlights date label style fix v4 --- scss/modules/flexpane/_channel.scss | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scss/modules/flexpane/_channel.scss b/scss/modules/flexpane/_channel.scss index 5ac3a214..797a7e05 100644 --- a/scss/modules/flexpane/_channel.scss +++ b/scss/modules/flexpane/_channel.scss @@ -249,3 +249,13 @@ } } } + +.p-highlights_section { + &__group_title_line { + border-color: $color-shade-light; + } + &__group_title_label { + background-color: $color-base; + color: $base-font-color; + } +} From 0aa9ccc95a421fc4a991a5dc68b6a3707440f86a Mon Sep 17 00:00:00 2001 From: Branden Date: Tue, 30 Jul 2019 14:52:16 +0900 Subject: [PATCH 27/37] member tooltip style fix v4 --- scss/modules/tooltips/_member.scss | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scss/modules/tooltips/_member.scss b/scss/modules/tooltips/_member.scss index 0767cc7c..495c441d 100644 --- a/scss/modules/tooltips/_member.scss +++ b/scss/modules/tooltips/_member.scss @@ -54,3 +54,13 @@ .member_meta { color: $base-link-color; } + +.p-member_profile_card { + background: $black; +} + +.p-member_profile_field { + &__label { + color: $color-shade-light; + } +} From 3b37e9d8a0ef7b421a196db03bc0bc4d00bb6e21 Mon Sep 17 00:00:00 2001 From: Branden Date: Tue, 30 Jul 2019 15:21:37 +0900 Subject: [PATCH 28/37] resolved houndci-bot reviews --- scss/modules/flexpane/_channel.scss | 2 ++ scss/modules/flexpane/_files.scss | 9 ++++----- scss/modules/header/_base.scss | 6 ++++-- scss/modules/inputs/_base.scss | 15 ++++++++------- scss/modules/modals/_file.scss | 2 +- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/scss/modules/flexpane/_channel.scss b/scss/modules/flexpane/_channel.scss index 797a7e05..20f556f7 100644 --- a/scss/modules/flexpane/_channel.scss +++ b/scss/modules/flexpane/_channel.scss @@ -244,6 +244,7 @@ .c-message_kit { &__pillow { background: $color-base; + &:hover { border-color: $color-shade-light; } @@ -254,6 +255,7 @@ &__group_title_line { border-color: $color-shade-light; } + &__group_title_label { background-color: $color-base; color: $base-font-color; diff --git a/scss/modules/flexpane/_files.scss b/scss/modules/flexpane/_files.scss index f7961b18..4b7f7a2f 100644 --- a/scss/modules/flexpane/_files.scss +++ b/scss/modules/flexpane/_files.scss @@ -432,10 +432,9 @@ html.no_touch a.filetype_button_web:hover { &__description, &__title { color: $base-font-color; - } - - &__content--collapsed:after { - background: linear-gradient(0deg, $color-shade-darkest, hsla(0,0%,100%,0) 40px); + } + &__content--collapsed::after { + background: linear-gradient(0deg, $color-shade-darkest, hsla(0, 0%, 100%, 0) 40px); } } @@ -492,4 +491,4 @@ html.no_touch a.filetype_button_web:hover { background-color: $color-base; } } -} \ No newline at end of file +} diff --git a/scss/modules/header/_base.scss b/scss/modules/header/_base.scss index 215b6edd..93b6f21a 100644 --- a/scss/modules/header/_base.scss +++ b/scss/modules/header/_base.scss @@ -138,6 +138,7 @@ .p-classic_nav { background: $color-base; + &__model { &__title { &__info { @@ -153,9 +154,10 @@ &__right { &__search { border-color: $base-font-color; + &__icon { color: $base-font-color; - } + } &__placeholder { color: $base-font-color; } @@ -165,4 +167,4 @@ color: $base-font-color; } } -} \ No newline at end of file +} diff --git a/scss/modules/inputs/_base.scss b/scss/modules/inputs/_base.scss index ab78791a..61b3bb5e 100644 --- a/scss/modules/inputs/_base.scss +++ b/scss/modules/inputs/_base.scss @@ -359,12 +359,12 @@ textarea { .ql-placeholder { color: $base-font-color; } -} - -.c-texty_input.focus { - .c-texty_input { - &__button { - color: $white; + + &.focus { + .c-texty_input { + &__button { + color: $white; + } } } } @@ -373,8 +373,9 @@ textarea { .p-message_input_field, .p-message_input_field.focus { background: $color-shade-light; + &~.p-message_input_file_button:not(:hover) { color: $white; } - } + } } \ No newline at end of file diff --git a/scss/modules/modals/_file.scss b/scss/modules/modals/_file.scss index 73b69029..af2391a4 100644 --- a/scss/modules/modals/_file.scss +++ b/scss/modules/modals/_file.scss @@ -117,4 +117,4 @@ &__file_gallery { background: $color-base; } -} \ No newline at end of file +} From 6e4e1546488aa52907d06405232fe66f42427eff Mon Sep 17 00:00:00 2001 From: Branden Date: Tue, 30 Jul 2019 15:44:22 +0900 Subject: [PATCH 29/37] sass lint resolve --- .gitignore | 1 + scss/modules/flexpane/_files.scss | 2 +- scss/modules/header/_base.scss | 3 ++- scss/modules/inputs/_base.scss | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 060ae6c2..e2386dbd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .sass-cache *.css.map .idea +.vscode \ No newline at end of file diff --git a/scss/modules/flexpane/_files.scss b/scss/modules/flexpane/_files.scss index 4b7f7a2f..1c624c6f 100644 --- a/scss/modules/flexpane/_files.scss +++ b/scss/modules/flexpane/_files.scss @@ -432,7 +432,7 @@ html.no_touch a.filetype_button_web:hover { &__description, &__title { color: $base-font-color; - } + } &__content--collapsed::after { background: linear-gradient(0deg, $color-shade-darkest, hsla(0, 0%, 100%, 0) 40px); } diff --git a/scss/modules/header/_base.scss b/scss/modules/header/_base.scss index 93b6f21a..f60b6250 100644 --- a/scss/modules/header/_base.scss +++ b/scss/modules/header/_base.scss @@ -157,7 +157,8 @@ &__icon { color: $base-font-color; - } + } + &__placeholder { color: $base-font-color; } diff --git a/scss/modules/inputs/_base.scss b/scss/modules/inputs/_base.scss index 61b3bb5e..9e7b14e3 100644 --- a/scss/modules/inputs/_base.scss +++ b/scss/modules/inputs/_base.scss @@ -359,7 +359,7 @@ textarea { .ql-placeholder { color: $base-font-color; } - + &.focus { .c-texty_input { &__button { From 3683e083cce9197dcbb91e60c9c86f8b67586c6b Mon Sep 17 00:00:00 2001 From: Branden Date: Tue, 30 Jul 2019 15:52:51 +0900 Subject: [PATCH 30/37] resolve lint --- scss/modules/flexpane/_files.scss | 2 +- scss/modules/header/_base.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/modules/flexpane/_files.scss b/scss/modules/flexpane/_files.scss index 1c624c6f..c4a961b4 100644 --- a/scss/modules/flexpane/_files.scss +++ b/scss/modules/flexpane/_files.scss @@ -434,7 +434,7 @@ html.no_touch a.filetype_button_web:hover { color: $base-font-color; } &__content--collapsed::after { - background: linear-gradient(0deg, $color-shade-darkest, hsla(0, 0%, 100%, 0) 40px); + background: linear-gradient(0deg, $color-shade-darkest, $color-shadow-transparent 40px); } } diff --git a/scss/modules/header/_base.scss b/scss/modules/header/_base.scss index f60b6250..c275d251 100644 --- a/scss/modules/header/_base.scss +++ b/scss/modules/header/_base.scss @@ -158,7 +158,7 @@ &__icon { color: $base-font-color; } - + &__placeholder { color: $base-font-color; } From d9a15bd1a30b79c477201d4c69acdee4fb797946 Mon Sep 17 00:00:00 2001 From: Branden Date: Tue, 30 Jul 2019 15:55:00 +0900 Subject: [PATCH 31/37] remove trailing whitespace --- scss/modules/flexpane/_channel.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/modules/flexpane/_channel.scss b/scss/modules/flexpane/_channel.scss index 20f556f7..25b1377f 100644 --- a/scss/modules/flexpane/_channel.scss +++ b/scss/modules/flexpane/_channel.scss @@ -244,7 +244,7 @@ .c-message_kit { &__pillow { background: $color-base; - + &:hover { border-color: $color-shade-light; } From c007fcde975e840ea7d71f6b1db7a19003acef47 Mon Sep 17 00:00:00 2001 From: Branden Date: Tue, 30 Jul 2019 16:34:23 +0900 Subject: [PATCH 32/37] All unreads tab missing style fix --- scss/modules/flexpane/_unreads.scss | 39 +++++++++++++++++++++++++++++ scss/styles.scss | 1 + 2 files changed, 40 insertions(+) create mode 100644 scss/modules/flexpane/_unreads.scss diff --git a/scss/modules/flexpane/_unreads.scss b/scss/modules/flexpane/_unreads.scss new file mode 100644 index 00000000..b1e779ce --- /dev/null +++ b/scss/modules/flexpane/_unreads.scss @@ -0,0 +1,39 @@ +.p-pages { + &__legacy_page_header { + color: $base-font-color; + } +} + +.p-classic_nav { + &__channel_header { + &__subtitle { + color: $base-font-color; + } + } +} + +.p-unreads_view { + &__header { + background: $color-base; + + &__channel_name { + color: $base-font-color; + } + + &--collapsed { + box-shadow: inset 0 -1px $color-shade-dark; + } + } +} + +.c-icon_button--light, +.c-icon_button--light.c-button-unstyled, +.c-icon_button--light:link { + color: $base-font-color; +} + +.c-icon_button--light.c-button-unstyled:hover, +.c-icon_button--light:hover, +.c-icon_button--light:link:hover { + color: $base-font-color; +} diff --git a/scss/styles.scss b/scss/styles.scss index 0a57e49d..df8dfa8d 100644 --- a/scss/styles.scss +++ b/scss/styles.scss @@ -53,6 +53,7 @@ @import "modules/flexpane/team"; @import "modules/flexpane/threads"; @import "modules/flexpane/whats-new"; +@import "modules/flexpane/unreads"; @import "modules/team/base"; From 476f4cb3c5def6a20af9e4d37280760c240cb429 Mon Sep 17 00:00:00 2001 From: Branden Date: Tue, 30 Jul 2019 16:39:02 +0900 Subject: [PATCH 33/37] all unreads missing style added --- scss/modules/flexpane/_unreads.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scss/modules/flexpane/_unreads.scss b/scss/modules/flexpane/_unreads.scss index b1e779ce..155631f8 100644 --- a/scss/modules/flexpane/_unreads.scss +++ b/scss/modules/flexpane/_unreads.scss @@ -24,6 +24,12 @@ box-shadow: inset 0 -1px $color-shade-dark; } } + + &__spacer { + &--bottom { + border-color: $color-shade-dark; + } + } } .c-icon_button--light, From 25e3345d0b63caed09bf53612e32c709e3bd59a9 Mon Sep 17 00:00:00 2001 From: Branden Date: Thu, 8 Aug 2019 15:01:17 +0900 Subject: [PATCH 34/37] mentions' auto complete missing style for v4 --- scss/modules/menu/_tabcomplete.scss | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/scss/modules/menu/_tabcomplete.scss b/scss/modules/menu/_tabcomplete.scss index d4e71431..ecc6762a 100644 --- a/scss/modules/menu/_tabcomplete.scss +++ b/scss/modules/menu/_tabcomplete.scss @@ -80,3 +80,16 @@ color: $color-highlight; } } + +.c-texty_autocomplete { + background: $color-base; + border: 1px solid $color-shade-dark; + box-shadow: 0 1px 15px $color-shadow-dark; + + &__help { + background: $black; + border-bottom: 1px solid $color-shade-dark; + color: $base-font-color; + text-shadow: 0 1px $color-shadow-light; + } +} From ca80d088476dc0b1a22f94f250a39b365083d2cb Mon Sep 17 00:00:00 2001 From: Branden Date: Fri, 9 Aug 2019 18:30:33 +0900 Subject: [PATCH 35/37] DM modal missing style fix --- scss/modules/modals/_direct-messages.scss | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/scss/modules/modals/_direct-messages.scss b/scss/modules/modals/_direct-messages.scss index 6d2b53ee..4e01bf40 100644 --- a/scss/modules/modals/_direct-messages.scss +++ b/scss/modules/modals/_direct-messages.scss @@ -46,3 +46,15 @@ } } } + +.c-multi_select_input { + background-color: $color-shade-light; +} + +.c-truncate { + color: $base-font-color; +} + +.c-token { + background: $color-highlight; +} From 360ef9249c6c28b08a25274bc3cca82e8801c6c1 Mon Sep 17 00:00:00 2001 From: playBranden Date: Mon, 12 Aug 2019 13:49:56 +0900 Subject: [PATCH 36/37] unreads view class background change --- scss/modules/flexpane/_unreads.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scss/modules/flexpane/_unreads.scss b/scss/modules/flexpane/_unreads.scss index 155631f8..26fbbea7 100644 --- a/scss/modules/flexpane/_unreads.scss +++ b/scss/modules/flexpane/_unreads.scss @@ -13,6 +13,8 @@ } .p-unreads_view { + background: $color-base; + &__header { background: $color-base; From d4fc43d4fd53894ee0c1006102a97a18e6495eb8 Mon Sep 17 00:00:00 2001 From: playBranden Date: Mon, 12 Aug 2019 13:53:09 +0900 Subject: [PATCH 37/37] unreads empty missing style fix --- scss/modules/flexpane/_unreads.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scss/modules/flexpane/_unreads.scss b/scss/modules/flexpane/_unreads.scss index 26fbbea7..7132d0c8 100644 --- a/scss/modules/flexpane/_unreads.scss +++ b/scss/modules/flexpane/_unreads.scss @@ -32,6 +32,10 @@ border-color: $color-shade-dark; } } + + &__empty { + background: $color-base; + } } .c-icon_button--light,