From ab7220ea082a0c2278ffafdce4341d6d6af3e910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sat, 27 Nov 2021 13:34:13 +0100 Subject: [PATCH 01/25] Remove $memberstatus-placeholder-color MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/css/views/context_menus/_StatusMessageContextMenu.scss | 2 +- res/themes/legacy-light/css/_legacy-light.scss | 2 -- res/themes/light-custom/css/_custom.scss | 1 - res/themes/light/css/_light.scss | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/res/css/views/context_menus/_StatusMessageContextMenu.scss b/res/css/views/context_menus/_StatusMessageContextMenu.scss index 74a08a4f5bf..d313936c091 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/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss index ecea426285d..9d7f226835e 100644 --- a/res/themes/legacy-light/css/_legacy-light.scss +++ b/res/themes/legacy-light/css/_legacy-light.scss @@ -242,8 +242,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 02815eee5b9..9a48ae0dbae 100644 --- a/res/themes/light-custom/css/_custom.scss +++ b/res/themes/light-custom/css/_custom.scss @@ -95,7 +95,6 @@ $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); diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index 1a35f8343b7..ee518dbd28d 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -81,7 +81,6 @@ $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 From b428d3328d67a09e3f74068df369c26802e7720d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sat, 27 Nov 2021 13:36:32 +0100 Subject: [PATCH 02/25] Remove $event-notsent-color MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/themes/legacy-light/css/_legacy-light.scss | 3 --- res/themes/light/css/_light.scss | 1 - 2 files changed, 4 deletions(-) diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss index 9d7f226835e..899a664e659 100644 --- a/res/themes/legacy-light/css/_legacy-light.scss +++ b/res/themes/legacy-light/css/_legacy-light.scss @@ -199,9 +199,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 diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index ee518dbd28d..b63d4230e0b 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -67,7 +67,6 @@ $button-fg-color: white; $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; From ad1a17eb51408a337f646874733bb4e965b53545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sat, 27 Nov 2021 13:43:39 +0100 Subject: [PATCH 03/25] $preview-bar-bg-color -> $info-plinth-bg-color MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/css/views/rooms/_RoomUpgradeWarningBar.scss | 2 +- res/themes/dark/css/_dark.scss | 1 - res/themes/legacy-dark/css/_legacy-dark.scss | 2 -- res/themes/legacy-light/css/_legacy-light.scss | 2 -- res/themes/light/css/_light.scss | 1 - 5 files changed, 1 insertion(+), 7 deletions(-) diff --git a/res/css/views/rooms/_RoomUpgradeWarningBar.scss b/res/css/views/rooms/_RoomUpgradeWarningBar.scss index efa2ccc5315..f1059162e9a 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; diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index dca852db2f0..0c829487e9e 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -51,7 +51,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 diff --git a/res/themes/legacy-dark/css/_legacy-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss index 3539e2054d7..fad59afb217 100644 --- a/res/themes/legacy-dark/css/_legacy-dark.scss +++ b/res/themes/legacy-dark/css/_legacy-dark.scss @@ -34,8 +34,6 @@ $rte-group-pill-color: $room-highlight-color; $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; diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss index 899a664e659..92339065fbb 100644 --- a/res/themes/legacy-light/css/_legacy-light.scss +++ b/res/themes/legacy-light/css/_legacy-light.scss @@ -43,8 +43,6 @@ $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; diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index b63d4230e0b..a4d19703ffc 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -59,7 +59,6 @@ $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; From a625d9fa4634ab28afca15148e3ac895792bc8cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sat, 27 Nov 2021 13:45:21 +0100 Subject: [PATCH 04/25] Use $secondary-accent-color for $input-lighter-bg-color MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/themes/light/css/_light.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index a4d19703ffc..be205d339f9 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -141,7 +141,7 @@ $input-fg-color: rgba(74, 74, 74, 0.9); $input-border-color: #e7e7e7; $input-darker-bg-color: $quinary-content; $input-darker-fg-color: #9fa9ba; -$input-lighter-bg-color: #f2f5f8; +$input-lighter-bg-color: $secondary-accent-color; $input-focused-border-color: $accent-alt; // ******************** From 7de63868110b3a1da244b94377de0702660931e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sat, 27 Nov 2021 13:47:57 +0100 Subject: [PATCH 05/25] Remove $tertiary-accent-color MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/css/_common.scss | 4 ---- res/themes/legacy-light/css/_legacy-light.scss | 1 - res/themes/light/css/_light.scss | 1 - 3 files changed, 6 deletions(-) diff --git a/res/css/_common.scss b/res/css/_common.scss index 4c782d00fb3..bb5c74d5b90 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/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss index 92339065fbb..abd655b8c2e 100644 --- a/res/themes/legacy-light/css/_legacy-light.scss +++ b/res/themes/legacy-light/css/_legacy-light.scss @@ -45,7 +45,6 @@ $info-plinth-fg-color: #888; // left-panel style muted accent color $secondary-accent-color: #f2f5f8; -$tertiary-accent-color: #d3efe1; $groupFilterPanel-bg-color: #27303a; $inverted-bg-color: $groupFilterPanel-bg-color; diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index be205d339f9..63d5d0ac5ab 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -60,7 +60,6 @@ $focus-bg-color: #dddddd; $info-plinth-bg-color: #f7f7f7; $info-plinth-fg-color: #888; $secondary-accent-color: #f2f5f8; -$tertiary-accent-color: #d3efe1; $event-selected-color: #f6f7f8; $button-fg-color: white; $h3-color: #3d3b39; From 1f9f3a641e65272aca4fe15001a274ed7500d1d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sat, 27 Nov 2021 13:49:35 +0100 Subject: [PATCH 06/25] Use $background for $button-fg-color MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/themes/light/css/_light.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index 63d5d0ac5ab..ef505370332 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -61,7 +61,7 @@ $info-plinth-bg-color: #f7f7f7; $info-plinth-fg-color: #888; $secondary-accent-color: #f2f5f8; $event-selected-color: #f6f7f8; -$button-fg-color: white; +$button-fg-color: $background; $h3-color: #3d3b39; $yellow-background: #fff8e3; $greyed-fg-color: #888; From b565ee2086842377e9ee73a8706404e8b7b2a6f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sat, 27 Nov 2021 13:53:19 +0100 Subject: [PATCH 07/25] $greyed-fg-color -> $info-plinth-fg-color MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/css/structures/_GroupView.scss | 2 +- res/css/structures/_RoomView.scss | 2 +- res/css/views/dialogs/_ExportDialog.scss | 6 +++--- res/css/views/elements/_Field.scss | 4 ++-- res/css/views/elements/_RoomAliasField.scss | 4 ++-- res/css/views/rooms/_LinkPreviewWidget.scss | 2 +- res/css/views/rooms/_MemberList.scss | 2 +- res/css/views/rooms/_MessageComposer.scss | 4 ++-- res/css/views/rooms/_RoomUpgradeWarningBar.scss | 2 +- res/themes/dark/css/_dark.scss | 1 - res/themes/legacy-light/css/_legacy-light.scss | 2 +- res/themes/light-custom/css/_custom.scss | 1 - res/themes/light/css/_light.scss | 1 - 13 files changed, 15 insertions(+), 18 deletions(-) diff --git a/res/css/structures/_GroupView.scss b/res/css/structures/_GroupView.scss index f0f60f26bb8..8d05135a9af 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/_RoomView.scss b/res/css/structures/_RoomView.scss index a61b330e24e..d7e31e618d1 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/views/dialogs/_ExportDialog.scss b/res/css/views/dialogs/_ExportDialog.scss index 0035ca9eff7..294daba2e87 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/_Field.scss b/res/css/views/elements/_Field.scss index a00c73191bc..aa9f70725df 100644 --- a/res/css/views/elements/_Field.scss +++ b/res/css/views/elements/_Field.scss @@ -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 { @@ -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/_RoomAliasField.scss b/res/css/views/elements/_RoomAliasField.scss index 0fe53b27662..124d24f1f55 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/rooms/_LinkPreviewWidget.scss b/res/css/views/rooms/_LinkPreviewWidget.scss index b874f753aee..1546164710e 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 80b5b28969d..b84beea89be 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 642f548b359..f7ac714d660 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/_RoomUpgradeWarningBar.scss b/res/css/views/rooms/_RoomUpgradeWarningBar.scss index f1059162e9a..26a63232ae7 100644 --- a/res/css/views/rooms/_RoomUpgradeWarningBar.scss +++ b/res/css/views/rooms/_RoomUpgradeWarningBar.scss @@ -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/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index 0c829487e9e..eb265428f5b 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -35,7 +35,6 @@ $header-panel-text-primary-color: #B9BEC6; $text-secondary-color: #B9BEC6; $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); diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss index abd655b8c2e..8d951a817e2 100644 --- a/res/themes/legacy-light/css/_legacy-light.scss +++ b/res/themes/legacy-light/css/_legacy-light.scss @@ -102,7 +102,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; diff --git a/res/themes/light-custom/css/_custom.scss b/res/themes/light-custom/css/_custom.scss index 9a48ae0dbae..920dead8e5e 100644 --- a/res/themes/light-custom/css/_custom.scss +++ b/res/themes/light-custom/css/_custom.scss @@ -101,7 +101,6 @@ $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 diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index ef505370332..9769f676adb 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -64,7 +64,6 @@ $event-selected-color: #f6f7f8; $button-fg-color: $background; $h3-color: #3d3b39; $yellow-background: #fff8e3; -$greyed-fg-color: #888; $accent-alt: #238CF5; $strong-input-border-color: #c7c7c7; $neutral-badge-color: #dbdbdb; From 34805dd778a5cfe8586b757cd92c09399c978a87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sat, 27 Nov 2021 13:58:54 +0100 Subject: [PATCH 08/25] Use $focus-bg-color for $preview-widget-bar-color MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/themes/light/css/_light.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index 9769f676adb..51ce3925399 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -67,7 +67,7 @@ $yellow-background: #fff8e3; $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); From 096e244d856ffe6716b4812892936d71f3cd238f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sat, 27 Nov 2021 14:08:22 +0100 Subject: [PATCH 09/25] Use $panel-actions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/themes/dark/css/_dark.scss | 4 ++-- res/themes/light/css/_light.scss | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index eb265428f5b..b96acfa990d 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -98,7 +98,7 @@ $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-button-bg-color: $panel-actions; // Buttons include the filter box, explore button, and sublist buttons $roomlist-bg-color: rgba(33, 38, 44, 0.90); $roomsublist-skeleton-ui-bg: linear-gradient(180deg, #3e444c 0%, #3e444c00 100%); $roomtile-default-badge-bg-color: #61708b; @@ -107,7 +107,7 @@ $roomtile-default-badge-bg-color: #61708b; // 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 diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index 51ce3925399..1e55f9c02f0 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -71,7 +71,7 @@ $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; @@ -160,7 +160,7 @@ $imagebody-giflabel-color: rgba(255, 255, 255, 1); // RoomList // ******************** -$roomlist-button-bg-color: rgba(141, 151, 165, 0.2); // Buttons include the filter box, explore button, and sublist buttons +$roomlist-button-bg-color: $panel-actions; // 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%); $roomtile-default-badge-bg-color: $muted-fg-color; From bbfb64d9bc3d3b3e9d5fd049c9bb0ace8688b54e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sat, 27 Nov 2021 14:14:57 +0100 Subject: [PATCH 10/25] $roomlist-button-bg-color -> $panel-actions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/css/structures/_LeftPanel.scss | 4 ++-- res/css/structures/_RoomSearch.scss | 2 +- res/css/structures/_SpacePanel.scss | 2 +- res/css/views/messages/_MessageActionBar.scss | 2 +- res/css/views/right_panel/_PinnedMessagesCard.scss | 2 +- res/css/views/rooms/_MessageComposerFormatBar.scss | 2 +- res/css/views/rooms/_RoomList.scss | 2 +- res/css/views/rooms/_RoomSublist.scss | 4 ++-- res/css/views/spaces/_SpaceCreateMenu.scss | 2 +- res/themes/dark/css/_dark.scss | 1 - res/themes/legacy-dark/css/_legacy-dark.scss | 3 +-- res/themes/legacy-light/css/_legacy-light.scss | 11 +++++------ res/themes/light-custom/css/_custom.scss | 1 - .../light-high-contrast/css/_light-high-contrast.scss | 5 ++--- res/themes/light/css/_light.scss | 1 - 15 files changed, 19 insertions(+), 25 deletions(-) diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss index a6580058216..0bfa0c993af 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 bbd60a5ff36..89e9a9d0aea 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/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss index e343af88b5c..42fb72464a5 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/messages/_MessageActionBar.scss b/res/css/views/messages/_MessageActionBar.scss index 46fc11956f4..e78b8cefe23 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 f3861a3decd..ddfd131c8b1 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/_MessageComposerFormatBar.scss b/res/css/views/rooms/_MessageComposerFormatBar.scss index ce7aed2deea..dac83bfb286 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 7d967661a62..c9f60887daa 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 fdc850fbb73..a449591c5ce 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/spaces/_SpaceCreateMenu.scss b/res/css/views/spaces/_SpaceCreateMenu.scss index 06c799af577..80c1c39da22 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 b96acfa990d..f8a7d10490d 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -98,7 +98,6 @@ $lightbox-background-bg-opacity: 0.85; // RoomList // ******************** -$roomlist-button-bg-color: $panel-actions; // Buttons include the filter box, explore button, and sublist buttons $roomlist-bg-color: rgba(33, 38, 44, 0.90); $roomsublist-skeleton-ui-bg: linear-gradient(180deg, #3e444c 0%, #3e444c00 100%); $roomtile-default-badge-bg-color: #61708b; diff --git a/res/themes/legacy-dark/css/_legacy-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss index fad59afb217..94ca43011df 100644 --- a/res/themes/legacy-dark/css/_legacy-dark.scss +++ b/res/themes/legacy-dark/css/_legacy-dark.scss @@ -116,8 +116,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 8d951a817e2..b233b6cb4c4 100644 --- a/res/themes/legacy-light/css/_legacy-light.scss +++ b/res/themes/legacy-light/css/_legacy-light.scss @@ -133,12 +133,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; @@ -166,6 +160,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; diff --git a/res/themes/light-custom/css/_custom.scss b/res/themes/light-custom/css/_custom.scss index 920dead8e5e..53e235de787 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); 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 c9d66aabf4f..7b113782240 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; @@ -93,11 +92,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 1e55f9c02f0..e9da54480c1 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -160,7 +160,6 @@ $imagebody-giflabel-color: rgba(255, 255, 255, 1); // RoomList // ******************** -$roomlist-button-bg-color: $panel-actions; // 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%); $roomtile-default-badge-bg-color: $muted-fg-color; From cd963c081c0c1392004fde5815ee1407cd8316a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sat, 27 Nov 2021 14:15:36 +0100 Subject: [PATCH 11/25] Use $roomlist-bg-color for $authpage-modal-bg-color MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/themes/light/css/_light.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index e9da54480c1..7fe1e020519 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -197,7 +197,7 @@ $togglesw-ball-color: $background; // Authpage // ******************** $authpage-bg-color: #2e3649; -$authpage-modal-bg-color: rgba(245, 245, 245, 0.90); +$authpage-modal-bg-color: $roomlist-bg-color; $authpage-focus-bg-color: #dddddd; $authpage-lang-color: #4e5054; $authpage-primary-color: #232f32; From 3d14c8102336ef487e35dc218dafe1859cd70948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sat, 27 Nov 2021 14:16:39 +0100 Subject: [PATCH 12/25] Use $background MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/themes/light/css/_light.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index 7fe1e020519..2112639823f 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -155,13 +155,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-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; // ******************** From 32167b34fecad47175c8cc01f84f22bee93dfbd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sat, 27 Nov 2021 14:28:04 +0100 Subject: [PATCH 13/25] Use $focus-bg-color MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/themes/light/css/_light.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index 2112639823f..5fdc873c5d7 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -81,7 +81,7 @@ $event-highlight-bg-color: $yellow-background; // Blockquote // ******************** -$blockquote-bar-color: #ddd; +$blockquote-bar-color: $focus-bg-color; // ******************** // Tooltip @@ -198,7 +198,7 @@ $togglesw-ball-color: $background; // ******************** $authpage-bg-color: #2e3649; $authpage-modal-bg-color: $roomlist-bg-color; -$authpage-focus-bg-color: #dddddd; +$authpage-focus-bg-color: $focus-bg-color; $authpage-lang-color: #4e5054; $authpage-primary-color: #232f32; $authpage-secondary-color: $muted-fg-color; From 11d6357c14a2291a4d7ff0dfcac841847b913b81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sun, 28 Nov 2021 08:13:39 +0100 Subject: [PATCH 14/25] Use $menu-border-color MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/themes/light/css/_light.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index 5fdc873c5d7..e7311334172 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -108,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; // ******************** @@ -136,7 +136,7 @@ $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: $secondary-accent-color; From e7c420082dd55002b53fabae50e382953e956f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sun, 28 Nov 2021 08:17:26 +0100 Subject: [PATCH 15/25] $rte-group-pill-color -> $rte-room-pill-color MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/css/views/elements/_RichText.scss | 2 +- res/themes/dark/css/_dark.scss | 1 - res/themes/legacy-dark/css/_legacy-dark.scss | 1 - res/themes/legacy-light/css/_legacy-light.scss | 1 - res/themes/light/css/_light.scss | 1 - 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss index 3d20b73ba02..03c3741d5ea 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/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index f8a7d10490d..b42832c813d 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -63,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 diff --git a/res/themes/legacy-dark/css/_legacy-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss index 94ca43011df..aafd4d34cfc 100644 --- a/res/themes/legacy-dark/css/_legacy-dark.scss +++ b/res/themes/legacy-dark/css/_legacy-dark.scss @@ -28,7 +28,6 @@ $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; diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss index b233b6cb4c4..fbef882c507 100644 --- a/res/themes/legacy-light/css/_legacy-light.scss +++ b/res/themes/legacy-light/css/_legacy-light.scss @@ -118,7 +118,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; diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index e7311334172..d35e3593cac 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -123,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 From b337e7e5f1e253a474026db842ca5568b9c3504b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sun, 28 Nov 2021 08:19:57 +0100 Subject: [PATCH 16/25] $input-focused-border-color -> $accent-alt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/css/views/elements/_Dropdown.scss | 4 ++-- res/css/views/elements/_Field.scss | 4 ++-- res/themes/legacy-dark/css/_legacy-dark.scss | 1 - res/themes/legacy-light/css/_legacy-light.scss | 1 - res/themes/light-custom/css/_custom.scss | 1 - res/themes/light-high-contrast/css/_light-high-contrast.scss | 1 - res/themes/light/css/_light.scss | 1 - 7 files changed, 4 insertions(+), 9 deletions(-) diff --git a/res/css/views/elements/_Dropdown.scss b/res/css/views/elements/_Dropdown.scss index e1e265f7017..88cf027e037 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 aa9f70725df..a97e7ee949e 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, @@ -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, diff --git a/res/themes/legacy-dark/css/_legacy-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss index aafd4d34cfc..216f61d7af5 100644 --- a/res/themes/legacy-dark/css/_legacy-dark.scss +++ b/res/themes/legacy-dark/css/_legacy-dark.scss @@ -50,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; diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss index fbef882c507..8d3a21af159 100644 --- a/res/themes/legacy-light/css/_legacy-light.scss +++ b/res/themes/legacy-light/css/_legacy-light.scss @@ -66,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; diff --git a/res/themes/light-custom/css/_custom.scss b/res/themes/light-custom/css/_custom.scss index 53e235de787..0d4ba05b4b4 100644 --- a/res/themes/light-custom/css/_custom.scss +++ b/res/themes/light-custom/css/_custom.scss @@ -104,7 +104,6 @@ $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 7b113782240..a664544cff6 100644 --- a/res/themes/light-high-contrast/css/_light-high-contrast.scss +++ b/res/themes/light-high-contrast/css/_light-high-contrast.scss @@ -21,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; diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index d35e3593cac..be59d31331a 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -139,7 +139,6 @@ $input-border-color: $menu-border-color; $input-darker-bg-color: $quinary-content; $input-darker-fg-color: #9fa9ba; $input-lighter-bg-color: $secondary-accent-color; -$input-focused-border-color: $accent-alt; // ******************** // Dialog From 8ca91f79b676265ed81a281ac90feb6fd626be83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sun, 28 Nov 2021 08:20:28 +0100 Subject: [PATCH 17/25] Use $dialog-title-fg-color MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/themes/light/css/_light.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index be59d31331a..2382582ce17 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -173,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; // ******************** From 8d72d8cb96c6e4cbee71d980cfcf4c3a09f7a23f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sun, 28 Nov 2021 08:23:01 +0100 Subject: [PATCH 18/25] Use $togglesw-off-color MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/themes/light/css/_light.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index 2382582ce17..60261eac7e1 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -258,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); From d146bec3880d4b469f3a5ec2bf4078cf60bfcf82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sun, 28 Nov 2021 08:23:34 +0100 Subject: [PATCH 19/25] Use $message-action-bar-border-color MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/themes/light/css/_light.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index 60261eac7e1..10435aec85a 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -212,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; // ******************** From 2579934339857b9891a645f4965b89cf003288d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sun, 28 Nov 2021 08:28:47 +0100 Subject: [PATCH 20/25] Use $header-panel-text-primary-color MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/themes/dark/css/_dark.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index b42832c813d..97102378467 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -32,7 +32,7 @@ $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; $event-highlight-bg-color: #25271F; @@ -185,7 +185,7 @@ $visual-bell-bg-color: #800; $avatar-initial-color: #ffffff; $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); From 2c7e05d2da630d027f1dc184d0e395ec5fe581fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sun, 28 Nov 2021 08:30:27 +0100 Subject: [PATCH 21/25] Use $input-darker-fg-color MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/themes/dark/css/_dark.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index 97102378467..95acfb593f5 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -99,7 +99,7 @@ $lightbox-background-bg-opacity: 0.85; // ******************** $roomlist-bg-color: rgba(33, 38, 44, 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 From 4f78bad23f8e158772796bfb6b6e9ca62c8c71bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sun, 28 Nov 2021 08:31:48 +0100 Subject: [PATCH 22/25] Use $menu-border-color MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/themes/dark/css/_dark.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index 95acfb593f5..4afc3d9efda 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -84,14 +84,14 @@ $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; // ******************** @@ -180,7 +180,7 @@ $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; $theme-button-bg-color: #e3e8f0; @@ -256,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) { From 89b0ed139f324b7f0876a142f043aae9c60e67ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sun, 28 Nov 2021 08:32:50 +0100 Subject: [PATCH 23/25] Use $system MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/themes/dark/css/_dark.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index 4afc3d9efda..f2437706d4c 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -97,7 +97,7 @@ $lightbox-background-bg-opacity: 0.85; // RoomList // ******************** -$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: $input-darker-fg-color; // ******************** From 92b5efc6f752557ea0a1e360f9945d7cf69a083e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sun, 28 Nov 2021 08:33:23 +0100 Subject: [PATCH 24/25] Use $message-action-bar-border-color MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/themes/dark/css/_dark.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index f2437706d4c..bfc0c559d2b 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -143,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; // ******************** From e8beec5f4985aaed6aaed88ebd9a479389cd19f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Sun, 28 Nov 2021 08:34:08 +0100 Subject: [PATCH 25/25] Use $primary-content MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- res/themes/dark/css/_dark.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index bfc0c559d2b..5266d568184 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -182,7 +182,7 @@ $video-feed-secondary-background: $system; // ******************** $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: rgba($header-panel-text-primary-color, 0.74); // muted-text with a 0.74 opacity.