diff --git a/scss/layout/_scrollbar.scss b/scss/layout/_scrollbar.scss index 5e555d14..e51503e6 100644 --- a/scss/layout/_scrollbar.scss +++ b/scss/layout/_scrollbar.scss @@ -46,17 +46,6 @@ } } -#monkey_scroll_wrapper_for_channels_scroller { - .monkey_scroll_bar { - background: $color-shade-mid; - } - - .monkey_scroll_handle_inner { - background: $color-shade-light; - border: 3px solid $color-base; - } -} - .c-scrollbar--monkey .c-scrollbar { &__track { background: $color-shade-mid; diff --git a/scss/layout/_sidebar.scss b/scss/layout/_sidebar.scss index b161c480..1ed39467 100644 --- a/scss/layout/_sidebar.scss +++ b/scss/layout/_sidebar.scss @@ -7,10 +7,6 @@ color: $base-font-color; } -#col_channels_collapse_view { - background: $color-shade-dark; -} - .p-channel_sidebar { background-color: $color-shade-dark; color: $base-font-color; @@ -171,137 +167,6 @@ } } -.channels_list_new_btn { - color: $base-link-color; -} - -.list_more { - border-bottom: 1px dotted $base-link-color; - color: $base-link-color !important; - - &:hover { - border-bottom: 1px solid $base-link-color-active; - color: $base-link-color-active !important; - } -} - -#channels_scroller { - &.show_which_channel_is_active ul li.active { - .primary_action { - background: $color-base; - color: $base-font-color; - - &.im_name .im_name_background, - &.im_name > *:not(.unread_highlights) { - background: $color-base; - } - - &.feature_user_custom_status .im_name_background { - background: $color-base; - } - - .prefix { - color: $color-highlight; - } - } - - .group_close, - .im_close, - .mpim_close { - color: $base-font-color; - } - - .unread_highlights, - .unread_msgs { - background: $color-red; - color: $base-font-color; - } - } - - ul li.muted_channel:not(.active) .primary_action>:not(.im_name_background), - &:not(.show_which_channel_is_active) li.muted_channel .primary_action>:not(.im_name_background) { - opacity: 0.6; - } -} - -#channel_scroll_down, -#channel_scroll_up { - background: $color-shade-darkest; - color: $base-font-color; - text-shadow: 0 1px 1px $color-shadow-light; -} - -#channel_scroll_down { - &:hover { - color: $base-font-color; - } - - &.unseen_have_mentions { - background: $color-red; - } -} - -#channel_scroll_up { - &.unseen_have_mentions { - background: $color-red; - } -} - -#channel_scroll_up:hover { - color: $base-font-color; -} - -#list_controls { - border-bottom: 1px solid $color-shade-dark; - color: $color-highlight; -} - -#list_search { - border: 1px solid $color-shade-dark; -} - -#list_search_container { - .icon_search { - color: $color-highlight; - } - - .icon_close { - color: $color-highlight; - } -} - -#list_browser { - p.highlighted { - background: $color-base; - } - - &:not(.keyboard_active) p:hover { - background: $color-base; - } - - .item_creator { - color: $color-highlight; - } - - .item_count { - color: $base-font-color; - } - - .item_purpose { - color: $base-font-color; - } -} - -#list_browser_dialog { - .modal-footer a { - color: $base-link-color; - - &:hover { - color: $base-link-color-active; - } - } -} - #channel_list_invites_link { border-bottom: 1px dotted $base-link-color; color: $base-link-color !important; @@ -332,17 +197,9 @@ #quick_switcher_label { color: $base-link-color; } - - #quick_switcher_shortcut { - color: $base-link-color; - } } } -#quick_switcher_shortcut { - color: $color-highlight; -} - #quick_switcher_label { color: $color-highlight; } diff --git a/scss/modules/_loader.scss b/scss/modules/_loader.scss index 3f12f5b5..ebd8d8b9 100644 --- a/scss/modules/_loader.scss +++ b/scss/modules/_loader.scss @@ -18,26 +18,12 @@ } } -#col_channels_bg { - background: $color-base; -} - #loading_team_menu_bg, #loading_user_menu_bg { background: $color-base; border: none; } -#loading_message_spinner { - background-image: none; - width: auto; - - &::after { - color: $color-highlight; - content: "Loading..."; - } -} - .infinite_spinner_bg, .infinite_spinner_blue { stroke: $base-font-color; diff --git a/scss/modules/flexpane/_files.scss b/scss/modules/flexpane/_files.scss index da9b9604..c5b0450e 100644 --- a/scss/modules/flexpane/_files.scss +++ b/scss/modules/flexpane/_files.scss @@ -11,14 +11,6 @@ } } -#primary_file_button { - color: $color-highlight !important; - - &:hover { - color: $base-font-color !important; - } -} - .file_list_item .icon, .file_reference .icon { background: $color-shade-lightest; diff --git a/scss/modules/flexpane/_team.scss b/scss/modules/flexpane/_team.scss index db7be912..96dee53d 100644 --- a/scss/modules/flexpane/_team.scss +++ b/scss/modules/flexpane/_team.scss @@ -51,18 +51,34 @@ } } -#member_preview_scroller, -#member_preview_web_container { +#member_preview_scroller { background-color: $color-shade-dark; -} -#team_tab { - #member_preview_scroller, - #member_preview_web_container { - background-color: $color-base; + .member_data_table .current_status_cell { + .current_status_container { + .current_status_cover { + &:hover { + border-color: $color-shade-dark; + } + } + + &:not(.active) { + .current_status_cover { + &.without_status_set { + .current_status_placeholder { + color: rgba($base-font-color, 0.35) !important; + } + } + } + } + } } } +#team_tab #member_preview_scroller { + background-color: $color-base; +} + #member_preview_scroller, #member_preview_web_container, .menu_member_header { @@ -150,23 +166,3 @@ background: $color-shade-light; } } - -#member_preview_scroller .member_data_table .current_status_cell { - .current_status_container { - .current_status_cover { - &:hover { - border-color: $color-shade-dark; - } - } - - &:not(.active) { - .current_status_cover { - &.without_status_set { - .current_status_placeholder { - color: rgba($base-font-color, 0.35) !important; - } - } - } - } - } -} diff --git a/scss/modules/flexpane/_whats-new.scss b/scss/modules/flexpane/_whats-new.scss index 54015d8a..c0c3d659 100644 --- a/scss/modules/flexpane/_whats-new.scss +++ b/scss/modules/flexpane/_whats-new.scss @@ -7,9 +7,3 @@ color: $color-highlight; } } - -#whats_new_updates { - h3 a { - color: $base-font-color !important; - } -} diff --git a/scss/modules/header/_banners.scss b/scss/modules/header/_banners.scss deleted file mode 100644 index 4e85f92f..00000000 --- a/scss/modules/header/_banners.scss +++ /dev/null @@ -1,31 +0,0 @@ -#banner { - background: $color-shade-darkest; - - a { - color: $base-link-color; - } -} - -.banner_content { - color: $base-font-color; - text-shadow: 0 1px 1px $color-shadow-light; -} - -#notifications_banner { - background: $color-shade-darkest; -} - -#banner:hover #notifications_banner { - background: $color-shade-darkest; -} - -#notifications_dismiss_banner { - background: $color-shade-darkest; -} - -#macssb1_banner, -#macssb1_dismiss_banner, -#winssb1_banner, -#winssb1_dismiss_banner { - background: $color-shade-darkest; -} diff --git a/scss/modules/header/_base.scss b/scss/modules/header/_base.scss index 96ec667d..a390bb46 100644 --- a/scss/modules/header/_base.scss +++ b/scss/modules/header/_base.scss @@ -48,25 +48,15 @@ color: $color-highlight; } -.channel_header_info { - .star, - button { - color: $base-link-color; - } +.channel_header_info button { + color: $base-link-color; } .channel_title_info { background: $color-base; color: $color-highlight; - .divider_bar { - background: $color-shade-dark; - } - - .channel_details_toggle { - color: $color-highlight; - } - + .channel_details_toggle, .channel_actions_toggle { color: $color-highlight; } diff --git a/scss/modules/header/_search.scss b/scss/modules/header/_search.scss index c36beea8..b9cae205 100644 --- a/scss/modules/header/_search.scss +++ b/scss/modules/header/_search.scss @@ -10,10 +10,6 @@ } } -.feature_keyboard_navigation .search_form { - border-color: $color-shade-light; -} - .search_focused .search_form { border-color: $color-shade-lightest; } diff --git a/scss/modules/header/_topic-editor.scss b/scss/modules/header/_topic-editor.scss deleted file mode 100644 index 6669a18f..00000000 --- a/scss/modules/header/_topic-editor.scss +++ /dev/null @@ -1,32 +0,0 @@ -.inline_edit { - .inline_edit_inner { - &::before { - background: $color-shade-dark; - border: 1px solid $color-shade-light; - box-shadow: 0 1px 1px 0 $color-shadow-dark; - } - - &::after { - color: $base-font-color; - } - } - - &.inline_edit_success .inline_edit_inner::after { - color: $color-green; - } - - &.inline_edit_error .inline_edit_inner::after { - color: $color-red; - } - - &.inline_edit_editing .inline_edit_inner { - &::before { - border-color: $color-shade-darkest; - box-shadow: none; - } - - &::after { - color: $color-highlight; - } - } -} diff --git a/scss/modules/menu/_direct-messaging.scss b/scss/modules/menu/_direct-messaging.scss deleted file mode 100644 index c19c19bf..00000000 --- a/scss/modules/menu/_direct-messaging.scss +++ /dev/null @@ -1,10 +0,0 @@ -#im-list, -#starred-list { - li.member.active .presence { - color: $white; - - &.away { - text-shadow: 1px 1px $color-shadow-light; - } - } -} diff --git a/scss/modules/menu/_team.scss b/scss/modules/menu/_team.scss index 7ef77cb1..21d2ac5c 100644 --- a/scss/modules/menu/_team.scss +++ b/scss/modules/menu/_team.scss @@ -39,16 +39,6 @@ opacity: 0.75; } -#im-list li.member.active .presence, -#starred-list li.member.active .presence { - color: $base-font-color; - - &.away { - color: $color-highlight; - text-shadow: 1px 1px $color-shadow-light; - } -} - .slack_menu_section::before { border-top-color: $color-base; } diff --git a/scss/modules/messaging/_attachments.scss b/scss/modules/messaging/_attachments.scss index 8bb93c69..c85da187 100644 --- a/scss/modules/messaging/_attachments.scss +++ b/scss/modules/messaging/_attachments.scss @@ -77,8 +77,6 @@ .msg_inline_attachment_collapser, .msg_inline_attachment_expander, -.msg_inline_file_preview_collapser, -.msg_inline_file_preview_expander, .msg_inline_img_collapser, .msg_inline_img_expander, .msg_inline_media_toggler, @@ -177,8 +175,7 @@ } } - .ts_icon.msg_inline_media_toggler:hover, - ts-icon.msg_inline_media_toggler:hover { + .ts_icon.msg_inline_media_toggler:hover { color: $base-link-color-active !important; } } diff --git a/scss/modules/messaging/_banners.scss b/scss/modules/messaging/_banners.scss index ed505ffe..acae6e26 100644 --- a/scss/modules/messaging/_banners.scss +++ b/scss/modules/messaging/_banners.scss @@ -62,11 +62,8 @@ border-left: 1px solid $color-shadow-light; } -#messages_container { - &:not(.has_reply_banners).has_top_messages_banner::before, - &.has_top_messages_banner::before { - background: none; - } +#messages_container.has_top_messages_banner::before { + background: none; } .end_div_msg_lim { diff --git a/scss/modules/messaging/_base.scss b/scss/modules/messaging/_base.scss index 19cfcb65..412083ac 100644 --- a/scss/modules/messaging/_base.scss +++ b/scss/modules/messaging/_base.scss @@ -233,14 +233,6 @@ ts-mention { border-top: 1px solid $color-shade-light; } - .more_messages { - background: $color-shade-light; - } - - .more_messages_container .more_messages { - color: $color-highlight; - } - ts-conversation { &::after { background: rgba($color-shade-darkest, 0.08); @@ -310,18 +302,6 @@ ts-mention { } } } - - ts-message.automated_grey { - background: $color-shade-darkest; - - .timestamp { - color: $base-link-color; - } - - &:hover .timestamp { - color: $base-link-color-active; - } - } } .channel_archive_messages.card .col:first-child { @@ -399,14 +379,11 @@ ts-mention { } } -.is_limited_div { - background-color: $color-base !important; - - &.mini { - color: $color-highlight !important; - } +#toggle-subscription-status .subscription_desc { + color: $color-highlight; } -#toggle-subscription-status .subscription_desc { +.bot_label { + background: $color-shade-darkest; color: $color-highlight; } diff --git a/scss/modules/messaging/_dense.scss b/scss/modules/messaging/_dense.scss index 0bcd37ef..e62e0813 100644 --- a/scss/modules/messaging/_dense.scss +++ b/scss/modules/messaging/_dense.scss @@ -6,79 +6,13 @@ font-family: $base-font-family; } - &.unprocessed { - color: rgba($base-font-color, 0.75); - } - - &.first .timestamp, - &:hover .timestamp { - color: $base-link-color-active; - } - &.first .message_gutter .timestamp, &.selected .message_gutter .timestamp { color: $base-link-color; } - &.divider { - border-top: 1px solid $color-base; - } - - &.archived, - &.bot_change, - &.joined, - &.left, - &.pinned .pinned_item_message_header, - &.purpose, - &.rename, - &.sh_created .sh_auto_msg_text, - &.sh_shared .sh_auto_msg_text, - &.topic, - &.unarchived { - color: $color-highlight; - } - .message_content .message_current_status { border-color: $color-shade-dark; } } - - #message_editing_info { - color: $color-highlight; - } - - .file_reference { - .post_meta, - .space_meta { - color: $color-highlight; - } - - .post_meta, - .snippet_meta, - .space_meta { - color: $color-highlight; - } - - a:not(.member):not(.member_name):not(.icon):not(.timestamp):not(.preview_main_action):not(.preview_show_more):not(.file_preview_action) { - color: $base-link-color; - } - - &:hover a { - &:not(.member):not(.member_name):not(.icon):not(.timestamp) { - color: $base-link-color; - } - - &:hover:not(.member):not(.member_name):not(.icon):not(.timestamp) { - color: $base-link-color-active; - } - - &.file_download_link { - color: $base-link-color !important; - - &:hover { - color: $base-link-color-active !important; - } - } - } - } } diff --git a/scss/modules/messaging/_light.scss b/scss/modules/messaging/_light.scss index 003e3df9..4bcf7ada 100644 --- a/scss/modules/messaging/_light.scss +++ b/scss/modules/messaging/_light.scss @@ -6,14 +6,6 @@ font-family: $base-font-family; } - &.unprocessed { - color: rgba($base-font-color, 0.75); - } - - .msg_right_link { - color: $base-link-color; - } - .message_content { .message_sender { color: $base-font-color !important; @@ -23,38 +15,5 @@ .comment::before { color: $color-highlight; } - - &.archived .message_content, - &.bot_change .message_content, - &.joined .message_content, - &.left .message_content, - &.purpose .message_content, - &.rename .message_content, - &.sh_created .message_content .sh_auto_msg_text, - &.sh_shared .message_content .sh_auto_msg_text, - &.topic .message_content, - &.unarchived .message_content { - color: $color-highlight; - } - - .meta { - color: $color-highlight; - } - - .file_service_icon { - color: $color-highlight; - } - } - - #message_editing_info { - color: $color-highlight; - } - - .msg_inline_video_holder { - border: 1px solid $color-shade-dark; - } - - .pinned_item_message_header { - color: $color-highlight; } } diff --git a/scss/modules/modals/_base.scss b/scss/modules/modals/_base.scss index 1e087248..10f61ca8 100644 --- a/scss/modules/modals/_base.scss +++ b/scss/modules/modals/_base.scss @@ -88,8 +88,3 @@ background-color: $color-shade-dark; } } - -.bot_label { - background: $color-shade-darkest; - color: $color-highlight; -} diff --git a/scss/modules/modals/_channel.scss b/scss/modules/modals/_channel.scss index 7facd1ad..e634970f 100644 --- a/scss/modules/modals/_channel.scss +++ b/scss/modules/modals/_channel.scss @@ -92,7 +92,3 @@ .notification_prefs_icon::before { color: $base-font-color; } - -.channel_prefs_body__mute_help_text { - color: $color-highlight; -} diff --git a/scss/modules/modals/_invite.scss b/scss/modules/modals/_invite.scss index fd1176f6..c925ed3c 100644 --- a/scss/modules/modals/_invite.scss +++ b/scss/modules/modals/_invite.scss @@ -24,13 +24,6 @@ } } -.admin_invites_container { - &:not(.experiment_guest_profiles_and_expiration) #admin_invites_add_row { - background: $color-base; - border-color: $color-shade-dark; - } -} - .admin_invite_row, .admin_invites_custom_message_container { .delete_row, @@ -56,20 +49,6 @@ border: 1px solid $color-shade-dark; } -.admin_invite_row { - .delete_row { - color: $color-highlight; - - &:hover { - color: $color-red; - } - } - - &.delete_highlight { - background: rgba($color-red, 0.25); - } -} - #admin_invites_workflow .lazy_filter_select .lfs_input_container { background-color: $color-shade-light; } diff --git a/scss/modules/modals/_preferences.scss b/scss/modules/modals/_preferences.scss index 68fbdab9..28b37451 100644 --- a/scss/modules/modals/_preferences.scss +++ b/scss/modules/modals/_preferences.scss @@ -1,17 +1,4 @@ #fs_modal.prefs_modal { - .section_rollup { - border-bottom: 1px solid $color-shade-dark; - - &:first-of-type { - border-top: 1px solid $color-shade-dark; - } - - &:hover:not(.active) { - background: $color-base; - color: $base-font-color; - } - } - label.sound_option { &:hover:not(.disabled) ts-icon { color: $color-highlight; diff --git a/scss/modules/modals/_quick-search.scss b/scss/modules/modals/_quick-search.scss index 78fa026a..c1f0d538 100644 --- a/scss/modules/modals/_quick-search.scss +++ b/scss/modules/modals/_quick-search.scss @@ -64,7 +64,6 @@ ts-jumper { li.highlighted, &:not(.keyboard_active) li:hover { .channel_not_member, - .match_score, .member_real_name + .member_username, .member_username + .member_real_name, i.presence_icon, diff --git a/scss/modules/pages/_downloads.scss b/scss/modules/pages/_downloads.scss deleted file mode 100644 index 209d32d2..00000000 --- a/scss/modules/pages/_downloads.scss +++ /dev/null @@ -1,66 +0,0 @@ -.downloads_header { - background-color: $color-shade-lightest; - - .welcome .meta { - color: $base-font-color; - - a { - color: $base-font-color; - } - - .pipe_sep { - background-color: $color-shadow-medium; - } - } - - select[name=build_variant] { - color: $base-font-color; - } -} - -.stay_in_sync { - .card { - background-color: $color-shade-dark; - border-color: $color-shade-darkest; - - h2 { - color: $base-font-color; - } - } - - .other_links { - color: $color-highlight; - - a { - color: $base-font-color; - } - } -} - -.sms_form { - .sms_number_container::before { - color: $color-highlight; - } - - input[name=sms_number] { - color: $base-font-color; - } - - input[type=submit] { - background-color: $color-base; - color: $base-link-color; - } - - .sms_select_container .lazy_filter_select { - background-color: $color-shade-light; - } -} - -.go_button { - background-color: $color-base; - color: $base-link-color; -} - -nav.top.fixed { - display: none; -} diff --git a/scss/modules/pages/admin/_billing.scss b/scss/modules/pages/admin/_billing.scss index 28d1d122..6db30a5b 100644 --- a/scss/modules/pages/admin/_billing.scss +++ b/scss/modules/pages/admin/_billing.scss @@ -36,10 +36,6 @@ border-top: 1px solid $color-shade-darkest; } -.billing_callout { - background: none; -} - .billing_contact { border-bottom: 1px solid $color-base; } diff --git a/scss/styles.scss b/scss/styles.scss index 989d6cdd..c63f6b33 100644 --- a/scss/styles.scss +++ b/scss/styles.scss @@ -16,17 +16,14 @@ @import "modules/menu/base"; @import "modules/menu/autocomplete"; @import "modules/menu/calendar"; -@import "modules/menu/direct-messaging"; @import "modules/menu/filters"; @import "modules/menu/popover"; @import "modules/menu/tabcomplete"; @import "modules/menu/team"; @import "modules/header/base"; -@import "modules/header/banners"; @import "modules/header/day-divider"; @import "modules/header/search"; -@import "modules/header/topic-editor"; @import "modules/messaging/base"; @import "modules/messaging/attachments"; @@ -92,7 +89,6 @@ @import "modules/pages/admin/tooltips"; @import "modules/pages/api"; @import "modules/pages/apps"; -@import "modules/pages/downloads"; @import "modules/pages/legal"; @import "modules/pages/oauth"; @import "modules/pages/spaces";