From 361d524e7e5b8560bcbf983f2b3dadee0d4a5ae1 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 17 Jul 2020 16:18:15 -0600 Subject: [PATCH] Rename remaining SCSS variables to remove 2 suffix --- res/css/views/rooms/_NotificationBadge.scss | 2 +- res/css/views/rooms/_RoomSublist.scss | 6 +++--- res/css/views/rooms/_RoomTile.scss | 4 ++-- res/themes/dark/css/_dark.scss | 8 ++++---- res/themes/legacy-dark/css/_legacy-dark.scss | 8 ++++---- res/themes/legacy-light/css/_legacy-light.scss | 8 ++++---- res/themes/light-custom/css/_custom.scss | 8 ++++---- res/themes/light/css/_light.scss | 8 ++++---- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/res/css/views/rooms/_NotificationBadge.scss b/res/css/views/rooms/_NotificationBadge.scss index dbc9006ca3..64b2623238 100644 --- a/res/css/views/rooms/_NotificationBadge.scss +++ b/res/css/views/rooms/_NotificationBadge.scss @@ -27,7 +27,7 @@ limitations under the License. // ^- The count is an element floating within that. &.mx_NotificationBadge_visible { - background-color: $roomtile2-default-badge-bg-color; + background-color: $roomtile-default-badge-bg-color; // Create a flexbox to order the count a bit easier display: flex; diff --git a/res/css/views/rooms/_RoomSublist.scss b/res/css/views/rooms/_RoomSublist.scss index 5b7e1a63e5..3ec4d114af 100644 --- a/res/css/views/rooms/_RoomSublist.scss +++ b/res/css/views/rooms/_RoomSublist.scss @@ -245,7 +245,7 @@ limitations under the License. cursor: pointer; font-size: $font-13px; line-height: $font-18px; - color: $roomtile2-preview-color; + color: $roomtile-preview-color; // Update the render() function for RoomSublist if these change // Update the ListLayout class for minVisibleTiles if these change. @@ -265,7 +265,7 @@ limitations under the License. mask-position: center; mask-size: contain; mask-repeat: no-repeat; - background: $roomtile2-preview-color; + background: $roomtile-preview-color; } .mx_RoomSublist_showMoreButtonChevron { @@ -375,7 +375,7 @@ limitations under the License. margin-top: 16px; margin-bottom: 16px; margin-right: 16px; // additional 16px - border: 1px solid $roomsublist2-divider-color; + border: 1px solid $roomsublist-divider-color; opacity: 0.1; } diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss index 4171127d7b..9afbd44b20 100644 --- a/res/css/views/rooms/_RoomTile.scss +++ b/res/css/views/rooms/_RoomTile.scss @@ -26,7 +26,7 @@ limitations under the License. &:hover, &:focus-within, &.mx_RoomTile_hasMenuOpen { - background-color: $roomtile2-selected-bg-color; + background-color: $roomtile-selected-bg-color; border-radius: 8px; } @@ -67,7 +67,7 @@ limitations under the License. .mx_RoomTile_messagePreview { font-size: $font-13px; line-height: $font-18px; - color: $roomtile2-preview-color; + color: $roomtile-preview-color; } .mx_RoomTile_nameWithPreview { diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index dc9604c69d..04452df51a 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -117,11 +117,11 @@ $theme-button-bg-color: #e3e8f0; $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-header-color: #8E99A4; -$roomsublist2-divider-color: $primary-fg-color; +$roomsublist-divider-color: $primary-fg-color; -$roomtile2-preview-color: #A9B2BC; -$roomtile2-default-badge-bg-color: #61708b; -$roomtile2-selected-bg-color: rgba(141, 151, 165, 0.2); +$roomtile-preview-color: #A9B2BC; +$roomtile-default-badge-bg-color: #61708b; +$roomtile-selected-bg-color: rgba(141, 151, 165, 0.2); // ******************** diff --git a/res/themes/legacy-dark/css/_legacy-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss index a63743c130..d1cea9d541 100644 --- a/res/themes/legacy-dark/css/_legacy-dark.scss +++ b/res/themes/legacy-dark/css/_legacy-dark.scss @@ -115,11 +115,11 @@ $theme-button-bg-color: #e3e8f0; $roomlist-button-bg-color: #1A1D23; // Buttons include the filter box, explore button, and sublist buttons $roomlist-bg-color: $header-panel-bg-color; -$roomsublist2-divider-color: $primary-fg-color; +$roomsublist-divider-color: $primary-fg-color; -$roomtile2-preview-color: #9e9e9e; -$roomtile2-default-badge-bg-color: #61708b; -$roomtile2-selected-bg-color: #1A1D23; +$roomtile-preview-color: #9e9e9e; +$roomtile-default-badge-bg-color: #61708b; +$roomtile-selected-bg-color: #1A1D23; // ******************** diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss index da3327e08b..e67becee3f 100644 --- a/res/themes/legacy-light/css/_legacy-light.scss +++ b/res/themes/legacy-light/css/_legacy-light.scss @@ -182,11 +182,11 @@ $theme-button-bg-color: #e3e8f0; $roomlist-button-bg-color: #fff; // Buttons include the filter box, explore button, and sublist buttons $roomlist-bg-color: $header-panel-bg-color; $roomlist-header-color: $primary-fg-color; -$roomsublist2-divider-color: $primary-fg-color; +$roomsublist-divider-color: $primary-fg-color; -$roomtile2-preview-color: #9e9e9e; -$roomtile2-default-badge-bg-color: #61708b; -$roomtile2-selected-bg-color: #fff; +$roomtile-preview-color: #9e9e9e; +$roomtile-default-badge-bg-color: #61708b; +$roomtile-selected-bg-color: #fff; $presence-online: $accent-color; $presence-away: #d9b072; diff --git a/res/themes/light-custom/css/_custom.scss b/res/themes/light-custom/css/_custom.scss index 38a9c80d33..b830e86e02 100644 --- a/res/themes/light-custom/css/_custom.scss +++ b/res/themes/light-custom/css/_custom.scss @@ -45,7 +45,7 @@ $authpage-modal-bg-color: var(--timeline-background-color-50pct); //still needs $roomheader-bg-color: var(--timeline-background-color); // // --roomlist-highlights-color -$roomtile2-selected-bg-color: var(--roomlist-highlights-color); +$roomtile-selected-bg-color: var(--roomlist-highlights-color); // // --sidebar-color $interactive-tooltip-bg-color: var(--sidebar-color); @@ -83,16 +83,16 @@ $tab-label-fg-color: var(--timeline-text-color); $authpage-lang-color: var(--timeline-text-color); $roomheader-color: var(--timeline-text-color); // --roomlist-text-secondary-color -$roomtile2-preview-color: var(--roomlist-text-secondary-color); +$roomtile-preview-color: var(--roomlist-text-secondary-color); $roomlist-header-color: var(--roomlist-text-secondary-color); -$roomtile2-default-badge-bg-color: var(--roomlist-text-secondary-color); +$roomtile-default-badge-bg-color: var(--roomlist-text-secondary-color); // // --roomlist-separator-color $input-darker-bg-color: var(--roomlist-separator-color); $panel-divider-color: var(--roomlist-separator-color);// originally #dee1f3, but close enough $primary-hairline-color: var(--roomlist-separator-color);// originally #e5e5e5, but close enough -$roomsublist2-divider-color: var(--roomlist-separator-color); +$roomsublist-divider-color: var(--roomlist-separator-color); // // --timeline-text-secondary-color $authpage-secondary-color: var(--timeline-text-secondary-color); diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index 278b4cdc32..2df6f49e25 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -181,11 +181,11 @@ $theme-button-bg-color: #e3e8f0; $roomlist-button-bg-color: #fff; // Buttons include the filter box, explore button, and sublist buttons $roomlist-bg-color: rgba(245, 245, 245, 0.90); -$roomsublist2-divider-color: $primary-fg-color; +$roomsublist-divider-color: $primary-fg-color; -$roomtile2-preview-color: #737D8C; -$roomtile2-default-badge-bg-color: #61708b; -$roomtile2-selected-bg-color: #FFF; +$roomtile-preview-color: #737D8C; +$roomtile-default-badge-bg-color: #61708b; +$roomtile-selected-bg-color: #FFF; $presence-online: $accent-color; $presence-away: #d9b072;