From 9db0ebb7f5479f70e8f637b76f0a4470de591f34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Mon, 29 Nov 2021 13:52:09 +0100 Subject: [PATCH] Task/colors 11 (#7211) --- res/css/_common.scss | 4 --- res/css/structures/_GroupView.scss | 2 +- res/css/structures/_LeftPanel.scss | 4 +-- res/css/structures/_RoomSearch.scss | 2 +- res/css/structures/_RoomView.scss | 2 +- res/css/structures/_SpacePanel.scss | 2 +- .../_StatusMessageContextMenu.scss | 2 +- res/css/views/dialogs/_ExportDialog.scss | 6 ++-- res/css/views/elements/_Dropdown.scss | 4 +-- res/css/views/elements/_Field.scss | 8 ++--- res/css/views/elements/_RichText.scss | 2 +- res/css/views/elements/_RoomAliasField.scss | 4 +-- res/css/views/messages/_MessageActionBar.scss | 2 +- .../right_panel/_PinnedMessagesCard.scss | 2 +- res/css/views/rooms/_LinkPreviewWidget.scss | 2 +- res/css/views/rooms/_MemberList.scss | 2 +- res/css/views/rooms/_MessageComposer.scss | 4 +-- .../rooms/_MessageComposerFormatBar.scss | 2 +- res/css/views/rooms/_RoomList.scss | 2 +- res/css/views/rooms/_RoomSublist.scss | 4 +-- .../views/rooms/_RoomUpgradeWarningBar.scss | 4 +-- res/css/views/spaces/_SpaceCreateMenu.scss | 2 +- res/themes/dark/css/_dark.scss | 26 ++++++-------- res/themes/legacy-dark/css/_legacy-dark.scss | 7 +--- .../legacy-light/css/_legacy-light.scss | 23 ++++-------- res/themes/light-custom/css/_custom.scss | 4 --- .../css/_light-high-contrast.scss | 6 ++-- res/themes/light/css/_light.scss | 36 ++++++++----------- 28 files changed, 66 insertions(+), 104 deletions(-) diff --git a/res/css/_common.scss b/res/css/_common.scss index 4c782d00fb..bb5c74d5b9 100644 --- a/res/css/_common.scss +++ b/res/css/_common.scss @@ -248,10 +248,6 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus { color: $secondary-accent-color; } -#mx_theme_tertiaryAccentColor { - color: $tertiary-accent-color; -} - /* Expected z-indexes for dialogs: 4000 - Default wrapper index 4009 - Static dialog background diff --git a/res/css/structures/_GroupView.scss b/res/css/structures/_GroupView.scss index f0f60f26bb..8d05135a9a 100644 --- a/res/css/structures/_GroupView.scss +++ b/res/css/structures/_GroupView.scss @@ -244,7 +244,7 @@ limitations under the License. } .mx_GroupView_membershipSection { - color: $greyed-fg-color; + color: $info-plinth-fg-color; margin-top: 10px; } diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss index a658005821..0bfa0c993a 100644 --- a/res/css/structures/_LeftPanel.scss +++ b/res/css/structures/_LeftPanel.scss @@ -129,7 +129,7 @@ $roomListCollapsedWidth: 68px; width: 32px; height: 32px; border-radius: 8px; - background-color: $roomlist-button-bg-color; + background-color: $panel-actions; position: relative; margin-left: 8px; @@ -152,7 +152,7 @@ $roomListCollapsedWidth: 68px; width: 32px; height: 32px; border-radius: 8px; - background-color: $roomlist-button-bg-color; + background-color: $panel-actions; position: relative; margin-left: 8px; diff --git a/res/css/structures/_RoomSearch.scss b/res/css/structures/_RoomSearch.scss index bbd60a5ff3..89e9a9d0ae 100644 --- a/res/css/structures/_RoomSearch.scss +++ b/res/css/structures/_RoomSearch.scss @@ -18,7 +18,7 @@ limitations under the License. .mx_RoomSearch { flex: 1; border-radius: 8px; - background-color: $roomlist-button-bg-color; + background-color: $panel-actions; // keep border thickness consistent to prevent movement border: 1px solid transparent; height: 28px; diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss index a61b330e24..d7e31e618d 100644 --- a/res/css/structures/_RoomView.scss +++ b/res/css/structures/_RoomView.scss @@ -132,7 +132,7 @@ limitations under the License. } .mx_RoomView_messagePanelSearchSpinner::before { - background-color: $greyed-fg-color; + background-color: $info-plinth-fg-color; mask: url('$(res)/img/feather-customised/search-input.svg'); mask-repeat: no-repeat; mask-position: center; diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss index e343af88b5..42fb72464a 100644 --- a/res/css/structures/_SpacePanel.scss +++ b/res/css/structures/_SpacePanel.scss @@ -218,7 +218,7 @@ $activeBorderColor: $secondary-content; } &.mx_SpaceButton_new .mx_SpaceButton_icon { - background-color: $roomlist-button-bg-color; + background-color: $panel-actions; &::before { background-color: $primary-content; diff --git a/res/css/views/context_menus/_StatusMessageContextMenu.scss b/res/css/views/context_menus/_StatusMessageContextMenu.scss index 74a08a4f5b..d313936c09 100644 --- a/res/css/views/context_menus/_StatusMessageContextMenu.scss +++ b/res/css/views/context_menus/_StatusMessageContextMenu.scss @@ -33,7 +33,7 @@ input.mx_StatusMessageContextMenu_message { } .mx_StatusMessageContextMenu_message::placeholder { - color: $memberstatus-placeholder-color; + color: $tertiary-content; } .mx_StatusMessageContextMenu_actionContainer { diff --git a/res/css/views/dialogs/_ExportDialog.scss b/res/css/views/dialogs/_ExportDialog.scss index 0035ca9eff..294daba2e8 100644 --- a/res/css/views/dialogs/_ExportDialog.scss +++ b/res/css/views/dialogs/_ExportDialog.scss @@ -35,7 +35,7 @@ limitations under the License. } .mx_StyledRadioButton input[type="radio"]:checked + div > div { - background: $greyed-fg-color; + background: $info-plinth-fg-color; } .mx_StyledRadioButton input[type=radio]:checked + div { @@ -52,8 +52,8 @@ limitations under the License. } .mx_Checkbox input[type="checkbox"]:checked + label > .mx_Checkbox_background { - background: $greyed-fg-color; - border-color: $greyed-fg-color; + background: $info-plinth-fg-color; + border-color: $info-plinth-fg-color; } } diff --git a/res/css/views/elements/_Dropdown.scss b/res/css/views/elements/_Dropdown.scss index e1e265f701..88cf027e03 100644 --- a/res/css/views/elements/_Dropdown.scss +++ b/res/css/views/elements/_Dropdown.scss @@ -38,7 +38,7 @@ limitations under the License. } .mx_Dropdown_input:focus { - border-color: $input-focused-border-color; + border-color: $accent-alt; } /* Disable dropdown highlight on focus */ @@ -110,7 +110,7 @@ input.mx_Dropdown_option:focus { margin: 0; padding: 0px; border-radius: 4px; - border: 1px solid $input-focused-border-color; + border: 1px solid $accent-alt; background-color: $background; max-height: 200px; overflow-y: auto; diff --git a/res/css/views/elements/_Field.scss b/res/css/views/elements/_Field.scss index a00c73191b..a97e7ee949 100644 --- a/res/css/views/elements/_Field.scss +++ b/res/css/views/elements/_Field.scss @@ -73,7 +73,7 @@ limitations under the License. } .mx_Field:focus-within { - border-color: $input-focused-border-color; + border-color: $accent-alt; } .mx_Field input:focus, @@ -92,7 +92,7 @@ limitations under the License. .mx_Field textarea:placeholder-shown:focus::placeholder, .mx_Field.mx_Field_placeholderIsHint input::placeholder { transition: color 0.25s ease-in 0.1s; - color: $greyed-fg-color; + color: $info-plinth-fg-color; } .mx_Field label { @@ -136,7 +136,7 @@ limitations under the License. .mx_Field input:focus + label, .mx_Field select:focus + label, .mx_Field textarea:focus + label { - color: $input-focused-border-color; + color: $accent-alt; } .mx_Field select:disabled, @@ -146,7 +146,7 @@ limitations under the License. .mx_Field textarea:disabled, .mx_Field textarea:disabled + label { background-color: $background; - color: $greyed-fg-color; + color: $info-plinth-fg-color; } .mx_Field_valid { diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss index 3d20b73ba0..03c3741d5e 100644 --- a/res/css/views/elements/_RichText.scss +++ b/res/css/views/elements/_RichText.scss @@ -32,7 +32,7 @@ a.mx_Pill { .mx_EventTile_content .markdown-body a.mx_GroupPill, .mx_GroupPill { color: $accent-fg-color; - background-color: $rte-group-pill-color; + background-color: $rte-room-pill-color; } /* More specific to override `.markdown-body a` text-decoration */ diff --git a/res/css/views/elements/_RoomAliasField.scss b/res/css/views/elements/_RoomAliasField.scss index 0fe53b2766..124d24f1f5 100644 --- a/res/css/views/elements/_RoomAliasField.scss +++ b/res/css/views/elements/_RoomAliasField.scss @@ -30,12 +30,12 @@ limitations under the License. } input::placeholder { - color: $greyed-fg-color; + color: $info-plinth-fg-color; font-weight: normal; } .mx_Field_prefix, .mx_Field_postfix { - color: $greyed-fg-color; + color: $info-plinth-fg-color; border-left: none; border-right: none; font-weight: 600; diff --git a/res/css/views/messages/_MessageActionBar.scss b/res/css/views/messages/_MessageActionBar.scss index 46fc11956f..e78b8cefe2 100644 --- a/res/css/views/messages/_MessageActionBar.scss +++ b/res/css/views/messages/_MessageActionBar.scss @@ -55,7 +55,7 @@ limitations under the License. margin: 2px; &:hover { - background: $roomlist-button-bg-color; + background: $panel-actions; border-radius: 6px; z-index: 1; } diff --git a/res/css/views/right_panel/_PinnedMessagesCard.scss b/res/css/views/right_panel/_PinnedMessagesCard.scss index f3861a3dec..ddfd131c8b 100644 --- a/res/css/views/right_panel/_PinnedMessagesCard.scss +++ b/res/css/views/right_panel/_PinnedMessagesCard.scss @@ -61,7 +61,7 @@ limitations under the License. } .mx_MessageActionBar_optionsButton { - background: $roomlist-button-bg-color; + background: $panel-actions; border-radius: 6px; z-index: 1; diff --git a/res/css/views/rooms/_LinkPreviewWidget.scss b/res/css/views/rooms/_LinkPreviewWidget.scss index b874f753ae..1546164710 100644 --- a/res/css/views/rooms/_LinkPreviewWidget.scss +++ b/res/css/views/rooms/_LinkPreviewWidget.scss @@ -21,7 +21,7 @@ limitations under the License. display: flex; border-left: 2px solid $preview-widget-bar-color; border-radius: 2px; - color: $greyed-fg-color; + color: $info-plinth-fg-color; } .mx_LinkPreviewWidget_image { diff --git a/res/css/views/rooms/_MemberList.scss b/res/css/views/rooms/_MemberList.scss index 80b5b28969..b84beea89b 100644 --- a/res/css/views/rooms/_MemberList.scss +++ b/res/css/views/rooms/_MemberList.scss @@ -96,7 +96,7 @@ limitations under the License. } .mx_MemberList_invite.mx_AccessibleButton_disabled { - background-color: $greyed-fg-color; + background-color: $info-plinth-fg-color; cursor: not-allowed; } diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss index 642f548b35..f7ac714d66 100644 --- a/res/css/views/rooms/_MessageComposer.scss +++ b/res/css/views/rooms/_MessageComposer.scss @@ -85,7 +85,7 @@ limitations under the License. width: 100%; height: 60px; font-style: italic; - color: $greyed-fg-color; + color: $info-plinth-fg-color; display: flex; align-items: center; justify-content: center; @@ -319,7 +319,7 @@ limitations under the License. flex-direction: row; align-items: center; font-size: $font-10px; - color: $greyed-fg-color; + color: $info-plinth-fg-color; } .mx_MessageComposer_formatbar * { diff --git a/res/css/views/rooms/_MessageComposerFormatBar.scss b/res/css/views/rooms/_MessageComposerFormatBar.scss index ce7aed2dee..dac83bfb28 100644 --- a/res/css/views/rooms/_MessageComposerFormatBar.scss +++ b/res/css/views/rooms/_MessageComposerFormatBar.scss @@ -39,7 +39,7 @@ limitations under the License. margin: 2px; &:hover { - background: $roomlist-button-bg-color; + background: $panel-actions; border-radius: 6px; z-index: 1; } diff --git a/res/css/views/rooms/_RoomList.scss b/res/css/views/rooms/_RoomList.scss index 7d967661a6..c9f60887da 100644 --- a/res/css/views/rooms/_RoomList.scss +++ b/res/css/views/rooms/_RoomList.scss @@ -54,7 +54,7 @@ limitations under the License. margin-top: 12px; display: block; text-align: start; - background-color: $roomlist-button-bg-color; + background-color: $panel-actions; border-radius: 4px; &::before { diff --git a/res/css/views/rooms/_RoomSublist.scss b/res/css/views/rooms/_RoomSublist.scss index fdc850fbb7..a449591c5c 100644 --- a/res/css/views/rooms/_RoomSublist.scss +++ b/res/css/views/rooms/_RoomSublist.scss @@ -120,7 +120,7 @@ limitations under the License. .mx_RoomSublist_auxButton:hover, .mx_RoomSublist_menuButton:hover { - background: $roomlist-button-bg-color; + background: $panel-actions; } // Hide the menu button by default @@ -304,7 +304,7 @@ limitations under the License. width: 32px !important; // !important to override hover styles height: 32px !important; // !important to override hover styles margin-left: 0 !important; // !important to override hover styles - background-color: $roomlist-button-bg-color; + background-color: $panel-actions; margin-top: 8px; &::before { diff --git a/res/css/views/rooms/_RoomUpgradeWarningBar.scss b/res/css/views/rooms/_RoomUpgradeWarningBar.scss index efa2ccc531..26a63232ae 100644 --- a/res/css/views/rooms/_RoomUpgradeWarningBar.scss +++ b/res/css/views/rooms/_RoomUpgradeWarningBar.scss @@ -16,7 +16,7 @@ limitations under the License. .mx_RoomUpgradeWarningBar { max-height: 235px; - background-color: $preview-bar-bg-color; + background-color: $info-plinth-bg-color; padding-left: 20px; padding-right: 20px; overflow: scroll; @@ -48,6 +48,6 @@ limitations under the License. } .mx_RoomUpgradeWarningBar_small { - color: $greyed-fg-color; + color: $info-plinth-fg-color; font-size: 70%; } diff --git a/res/css/views/spaces/_SpaceCreateMenu.scss b/res/css/views/spaces/_SpaceCreateMenu.scss index 06c799af57..80c1c39da2 100644 --- a/res/css/views/spaces/_SpaceCreateMenu.scss +++ b/res/css/views/spaces/_SpaceCreateMenu.scss @@ -65,7 +65,7 @@ $spacePanelWidth: 68px; width: 28px; height: 28px; position: relative; - background-color: $roomlist-button-bg-color; + background-color: $panel-actions; border-radius: 14px; margin-bottom: 12px; diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index dca852db2f..5266d56818 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -32,10 +32,9 @@ $icon-button-color: $tertiary-content; // Colors that aren't in Figma - we need to get rid of these // ******************** $header-panel-text-primary-color: #B9BEC6; -$text-secondary-color: #B9BEC6; +$text-secondary-color: $header-panel-text-primary-color; $header-panel-text-secondary-color: #c8c8cd; $room-highlight-color: #343a46; -$info-plinth-fg-color: #888; $event-highlight-bg-color: #25271F; $groupFilterPanel-bg-color: rgba(38, 39, 43, 0.82); $roomheader-addroom-bg-color: rgba(92, 100, 112, 0.3); @@ -51,7 +50,6 @@ $light-fg-color: $header-panel-text-secondary-color; $muted-fg-color: $header-panel-text-primary-color; $info-plinth-bg-color: $header-panel-bg-color; $dark-panel-bg-color: $header-panel-bg-color; -$preview-bar-bg-color: $header-panel-bg-color; // ******************** // Settings @@ -65,7 +63,6 @@ $settings-subsection-fg-color: $text-secondary-color; // Rich-text editor // ******************** $rte-room-pill-color: $room-highlight-color; -$rte-group-pill-color: $room-highlight-color; // ******************** // Inputs @@ -87,29 +84,28 @@ $menu-selected-color: $room-highlight-color; // Dialogs // ******************** $dialog-title-fg-color: $primary-content; -$dialog-backdrop-color: #000; +$dialog-backdrop-color: $menu-border-color; $dialog-shadow-color: rgba(0, 0, 0, 0.48); $dialog-close-fg-color: #9fa9ba; // ******************** // Lightbox // ******************** -$lightbox-background-bg-color: #000; +$lightbox-background-bg-color: $menu-border-color; $lightbox-background-bg-opacity: 0.85; // ******************** // RoomList // ******************** -$roomlist-button-bg-color: rgba(141, 151, 165, 0.2); // Buttons include the filter box, explore button, and sublist buttons -$roomlist-bg-color: rgba(33, 38, 44, 0.90); +$roomlist-bg-color: rgba($system, 0.90); $roomsublist-skeleton-ui-bg: linear-gradient(180deg, #3e444c 0%, #3e444c00 100%); -$roomtile-default-badge-bg-color: #61708b; +$roomtile-default-badge-bg-color: $input-darker-fg-color; // ******************** // Widgets // ******************** $widget-menu-bar-bg-color: $header-panel-bg-color; -$widget-body-bg-color: rgba(141, 151, 165, 0.2); +$widget-body-bg-color: $panel-actions; // ******************** // Tabbed views @@ -147,7 +143,7 @@ $message-action-bar-hover-border-color: $header-panel-text-primary-color; // Reaction row // ******************** -$reaction-row-button-border-color: #616b7f; +$reaction-row-button-border-color: $message-action-bar-border-color; $reaction-row-button-hover-border-color: $header-panel-text-primary-color; $reaction-row-button-selected-bg-color: #1f6954; // ******************** @@ -184,12 +180,12 @@ $video-feed-secondary-background: $system; // One-off colors // ******************** -$kbd-border-color: #000000; +$kbd-border-color: $menu-border-color; $visual-bell-bg-color: #800; -$avatar-initial-color: #ffffff; +$avatar-initial-color: $primary-content; $theme-button-bg-color: #e3e8f0; $codeblock-background-color: #2a3039; -$resend-button-divider-color: #b9bec64a; // muted-text with a 4A opacity. +$resend-button-divider-color: rgba($header-panel-text-primary-color, 0.74); // muted-text with a 0.74 opacity. $breadcrumb-placeholder-bg-color: #272c35; $composer-shadow-color: rgba(0, 0, 0, 0.28); $scrollbar-thumb-color: rgba(255, 255, 255, 0.2); @@ -260,7 +256,7 @@ $appearance-tab-border-color: $room-highlight-color; .mx_EventTile_content .markdown-body { table { tr { - background-color: #000000; + background-color: $menu-border-color; } tr:nth-child(2n) { diff --git a/res/themes/legacy-dark/css/_legacy-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss index 3539e2054d..216f61d7af 100644 --- a/res/themes/legacy-dark/css/_legacy-dark.scss +++ b/res/themes/legacy-dark/css/_legacy-dark.scss @@ -28,14 +28,11 @@ $focus-bg-color: $room-highlight-color; $other-user-pill-bg-color: $room-highlight-color; $rte-room-pill-color: $room-highlight-color; -$rte-group-pill-color: $room-highlight-color; // informational plinth $info-plinth-bg-color: $header-panel-bg-color; $info-plinth-fg-color: #888; -$preview-bar-bg-color: $header-panel-bg-color; - $groupFilterPanel-bg-color: $base-color; $inverted-bg-color: $groupFilterPanel-bg-color; @@ -53,7 +50,6 @@ $input-border-color: #e7e7e7; $input-darker-bg-color: #181b21; $input-darker-fg-color: #61708b; $input-lighter-bg-color: #f2f5f8; -$input-focused-border-color: #238cf5; $resend-button-divider-color: $muted-fg-color; @@ -118,8 +114,7 @@ $call-view-button-off-background: $primary-content; $video-feed-secondary-background: $system; -$roomlist-button-bg-color: #1A1D23; // Buttons include the filter box, explore button, and sublist buttons -$roomlist-filter-active-bg-color: $roomlist-button-bg-color; +$roomlist-filter-active-bg-color: $panel-actions; $roomlist-bg-color: $header-panel-bg-color; $roomsublist-skeleton-ui-bg: linear-gradient(180deg, #3e444c 0%, #3e444c00 100%); diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss index ecea426285..8d3a21af15 100644 --- a/res/themes/legacy-light/css/_legacy-light.scss +++ b/res/themes/legacy-light/css/_legacy-light.scss @@ -43,11 +43,8 @@ $other-user-pill-bg-color: rgba(0, 0, 0, 0.1); $info-plinth-bg-color: #f7f7f7; $info-plinth-fg-color: #888; -$preview-bar-bg-color: #f7f7f7; - // left-panel style muted accent color $secondary-accent-color: #f2f5f8; -$tertiary-accent-color: #d3efe1; $groupFilterPanel-bg-color: #27303a; $inverted-bg-color: $groupFilterPanel-bg-color; @@ -69,7 +66,6 @@ $input-border-color: #e7e7e7; $input-darker-bg-color: #e3e8f0; $input-darker-fg-color: #9fa9ba; $input-lighter-bg-color: #f2f5f8; -$input-focused-border-color: #238cf5; $resend-button-divider-color: $input-darker-bg-color; @@ -105,7 +101,7 @@ $imagebody-giflabel: rgba(0, 0, 0, 0.7); $imagebody-giflabel-border: rgba(0, 0, 0, 0.2); $imagebody-giflabel-color: rgba(255, 255, 255, 1); -$greyed-fg-color: #888; +$info-plinth-fg-color: #888; $neutral-badge-color: #dbdbdb; @@ -121,7 +117,6 @@ $settings-subsection-fg-color: #61708b; $rte-bg-color: #e9e9e9; $rte-code-bg-color: rgba(0, 0, 0, 0.04); $rte-room-pill-color: #aaa; -$rte-group-pill-color: #aaa; $header-panel-text-primary-color: #91a1c0; @@ -136,12 +131,6 @@ $roomtopic-color: #9e9e9e; $theme-button-bg-color: #e3e8f0; -$roomlist-button-bg-color: #fff; // Buttons include the filter box, explore button, and sublist buttons -$roomlist-filter-active-bg-color: $roomlist-button-bg-color; -$roomlist-bg-color: $header-panel-bg-color; -$roomlist-header-color: $primary-fg-color; -$roomsublist-skeleton-ui-bg: linear-gradient(180deg, #ffffff 0%, #ffffff00 100%); - $roomtile-default-badge-bg-color: #61708b; $roomtile-selected-bg-color: #fff; @@ -169,6 +158,11 @@ $space-nav: rgba($tertiary-content, 0.15); // ******************** +$roomlist-filter-active-bg-color: $panel-actions; +$roomlist-bg-color: $header-panel-bg-color; +$roomlist-header-color: $primary-fg-color; +$roomsublist-skeleton-ui-bg: linear-gradient(180deg, #ffffff 0%, #ffffff00 100%); + $voipcall-plinth-color: $system; $call-view-button-on-foreground: $secondary-content; @@ -199,9 +193,6 @@ $widget-body-bg-color: #fff; // defined before both $yellow-background: #fff8e3; -// event tile lifecycle -$event-notsent-color: #f44; - $event-highlight-bg-color: $yellow-background; // event timestamp @@ -242,8 +233,6 @@ $slider-background-color: #c1c9d6; $progressbar-bg-color: rgba(141, 151, 165, 0.2); -$memberstatus-placeholder-color: $muted-fg-color; - $authpage-bg-color: #2e3649; $authpage-modal-bg-color: rgba(255, 255, 255, 0.59); $authpage-focus-bg-color: #dddddd; diff --git a/res/themes/light-custom/css/_custom.scss b/res/themes/light-custom/css/_custom.scss index 02815eee5b..0d4ba05b4b 100644 --- a/res/themes/light-custom/css/_custom.scss +++ b/res/themes/light-custom/css/_custom.scss @@ -57,7 +57,6 @@ $panel-actions: var(--roomlist-highlights-color); $groupFilterPanel-bg-color: var(--sidebar-color); $tooltip-timeline-bg-color: var(--sidebar-color); $dialog-backdrop-color: var(--sidebar-color-50pct); -$roomlist-button-bg-color: var(--sidebar-color-15pct); // // --roomlist-background-color $header-panel-bg-color: var(--roomlist-background-color); @@ -95,19 +94,16 @@ $primary-hairline-color: var(--roomlist-separator-color);// originally #e5e5e5, // // --timeline-text-secondary-color $authpage-secondary-color: var(--timeline-text-secondary-color); -$memberstatus-placeholder-color: var(--timeline-text-secondary-color); $pinned-color: var(--timeline-text-secondary-color); $settings-subsection-fg-color: var(--timeline-text-secondary-color); $roomheader-addroom-bg-color: var(--timeline-text-secondary-color); // was #747474 $light-fg-color: var(--timeline-text-secondary-color); // was #888888 -$greyed-fg-color: var(--timeline-text-secondary-color); $info-plinth-fg-color: var(--timeline-text-secondary-color); // // --primary-color $accent-alt: var(--primary-color); -$input-focused-border-color: var(--primary-color); // // --warning-color $button-danger-disabled-bg-color: var(--warning-color-50pct); // still needs alpha at 0.5 diff --git a/res/themes/light-high-contrast/css/_light-high-contrast.scss b/res/themes/light-high-contrast/css/_light-high-contrast.scss index c9d66aabf4..a664544cff 100644 --- a/res/themes/light-high-contrast/css/_light-high-contrast.scss +++ b/res/themes/light-high-contrast/css/_light-high-contrast.scss @@ -7,7 +7,6 @@ $secondary-content: #5E6266; $tertiary-content: $secondary-content; $quaternary-content: $secondary-content; $quinary-content: $secondary-content; -$roomlist-button-bg-color: rgba(141, 151, 165, 0.2); $username-variant1-color: #0A6ECA; $username-variant2-color: #AC3BA8; @@ -22,7 +21,6 @@ $accent-alt: $links; $input-border-color: $secondary-content; $input-darker-bg-color: $quinary-content; $input-darker-fg-color: $secondary-content; -$input-focused-border-color: $accent; $resend-button-divider-color: $input-darker-bg-color; $icon-button-color: $quaternary-content; $theme-button-bg-color: $quinary-content; @@ -93,11 +91,11 @@ $roomtopic-color: $secondary-content; } .mx_UserMenu_contextMenu .mx_UserMenu_contextMenu_header .mx_UserMenu_contextMenu_themeButton { - background-color: $roomlist-button-bg-color !important; + background-color: $panel-actions !important; } .mx_FontScalingPanel_fontSlider { - background-color: $roomlist-button-bg-color !important; + background-color: $panel-actions !important; } .mx_ThemeChoicePanel > .mx_ThemeSelectors > .mx_StyledRadioButton input[type="radio"]:disabled + div { diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index 1a35f8343b..10435aec85 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -59,34 +59,29 @@ $light-fg-color: #747474; $focus-bg-color: #dddddd; $info-plinth-bg-color: #f7f7f7; $info-plinth-fg-color: #888; -$preview-bar-bg-color: #f7f7f7; $secondary-accent-color: #f2f5f8; -$tertiary-accent-color: #d3efe1; $event-selected-color: #f6f7f8; -$button-fg-color: white; +$button-fg-color: $background; $h3-color: #3d3b39; $yellow-background: #fff8e3; -$greyed-fg-color: #888; -$event-notsent-color: #f44; $accent-alt: #238CF5; $strong-input-border-color: #c7c7c7; $neutral-badge-color: #dbdbdb; -$preview-widget-bar-color: #ddd; +$preview-widget-bar-color: $focus-bg-color; $topleftmenu-color: #212121; $roomtopic-color: #9e9e9e; $groupFilterPanel-bg-color: rgba(232, 232, 232, 0.77); -$progressbar-bg-color: rgba(141, 151, 165, 0.2); +$progressbar-bg-color: $panel-actions; $panel-gradient: rgba(242, 245, 248, 0), rgba(242, 245, 248, 1); $accent-fg-color: $background; $selection-fg-color: $background; $dark-panel-bg-color: $secondary-accent-color; $event-highlight-bg-color: $yellow-background; -$memberstatus-placeholder-color: $muted-fg-color; // ******************** // Blockquote // ******************** -$blockquote-bar-color: #ddd; +$blockquote-bar-color: $focus-bg-color; // ******************** // Tooltip @@ -113,7 +108,7 @@ $menu-selected-color: #f5f8fa; // ******************** $settings-grey-fg-color: #a2a2a2; $settings-profile-overlay-placeholder-fg-color: #2e2f32; -$settings-profile-button-bg-color: #e7e7e7; +$settings-profile-button-bg-color: $menu-border-color; $settings-subsection-fg-color: $muted-fg-color; // ******************** @@ -128,7 +123,6 @@ $roomheader-addroom-fg-color: #5c6470; $rte-bg-color: #e9e9e9; $rte-code-bg-color: rgba(0, 0, 0, 0.04); $rte-room-pill-color: #aaa; -$rte-group-pill-color: #aaa; // ******************** // Presence @@ -141,11 +135,10 @@ $presence-offline: $quinary-content; // ******************** $input-underline-color: rgba(151, 151, 151, 0.5); $input-fg-color: rgba(74, 74, 74, 0.9); -$input-border-color: #e7e7e7; +$input-border-color: $menu-border-color; $input-darker-bg-color: $quinary-content; $input-darker-fg-color: #9fa9ba; -$input-lighter-bg-color: #f2f5f8; -$input-focused-border-color: $accent-alt; +$input-lighter-bg-color: $secondary-accent-color; // ******************** // Dialog @@ -160,14 +153,13 @@ $dialog-close-fg-color: #c1c1c1; // ******************** $imagebody-giflabel: rgba(0, 0, 0, 0.7); $imagebody-giflabel-border: rgba(0, 0, 0, 0.2); -$imagebody-giflabel-color: rgba(255, 255, 255, 1); +$imagebody-giflabel-color: $background; // ******************** // RoomList // ******************** -$roomlist-button-bg-color: rgba(141, 151, 165, 0.2); // Buttons include the filter box, explore button, and sublist buttons $roomlist-bg-color: rgba(245, 245, 245, 0.90); -$roomsublist-skeleton-ui-bg: linear-gradient(180deg, #ffffff 0%, #ffffff00 100%); +$roomsublist-skeleton-ui-bg: linear-gradient(180deg, $background 0%, #ffffff00 100%); $roomtile-default-badge-bg-color: $muted-fg-color; // ******************** @@ -181,7 +173,7 @@ $e2e-warning-color: #ba6363; // Tabbed views // ******************** -$tab-label-fg-color: #45474a; +$tab-label-fg-color: $dialog-title-fg-color; $tab-label-active-fg-color: $background; // ******************** @@ -203,8 +195,8 @@ $togglesw-ball-color: $background; // Authpage // ******************** $authpage-bg-color: #2e3649; -$authpage-modal-bg-color: rgba(245, 245, 245, 0.90); -$authpage-focus-bg-color: #dddddd; +$authpage-modal-bg-color: $roomlist-bg-color; +$authpage-focus-bg-color: $focus-bg-color; $authpage-lang-color: #4e5054; $authpage-primary-color: #232f32; $authpage-secondary-color: $muted-fg-color; @@ -220,7 +212,7 @@ $message-action-bar-hover-border-color: $focus-bg-color; // Reaction row // ******************** -$reaction-row-button-border-color: #e9edf1; +$reaction-row-button-border-color: $message-action-bar-border-color; $reaction-row-button-hover-border-color: $focus-bg-color; $reaction-row-button-selected-bg-color: #e9fff9; // ******************** @@ -266,7 +258,7 @@ $video-feed-secondary-background: #394049; // XXX: Color from dark theme // ******************** $visual-bell-bg-color: #faa; $event-timestamp-color: #acacac; -$slider-background-color: #c1c9d6; +$slider-background-color: $togglesw-off-color; $breadcrumb-placeholder-bg-color: #e8eef5; $primary-hairline-color: transparent; $composer-shadow-color: rgba(0, 0, 0, 0.04);