Rename remaining SCSS variables to remove 2 suffix

This commit is contained in:
Travis Ralston 2020-07-17 16:18:15 -06:00
parent 0e054c05c2
commit 361d524e7e
8 changed files with 26 additions and 26 deletions

View file

@ -27,7 +27,7 @@ limitations under the License.
// ^- The count is an element floating within that. // ^- The count is an element floating within that.
&.mx_NotificationBadge_visible { &.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 // Create a flexbox to order the count a bit easier
display: flex; display: flex;

View file

@ -245,7 +245,7 @@ limitations under the License.
cursor: pointer; cursor: pointer;
font-size: $font-13px; font-size: $font-13px;
line-height: $font-18px; line-height: $font-18px;
color: $roomtile2-preview-color; color: $roomtile-preview-color;
// Update the render() function for RoomSublist if these change // Update the render() function for RoomSublist if these change
// Update the ListLayout class for minVisibleTiles if these change. // Update the ListLayout class for minVisibleTiles if these change.
@ -265,7 +265,7 @@ limitations under the License.
mask-position: center; mask-position: center;
mask-size: contain; mask-size: contain;
mask-repeat: no-repeat; mask-repeat: no-repeat;
background: $roomtile2-preview-color; background: $roomtile-preview-color;
} }
.mx_RoomSublist_showMoreButtonChevron { .mx_RoomSublist_showMoreButtonChevron {
@ -375,7 +375,7 @@ limitations under the License.
margin-top: 16px; margin-top: 16px;
margin-bottom: 16px; margin-bottom: 16px;
margin-right: 16px; // additional 16px margin-right: 16px; // additional 16px
border: 1px solid $roomsublist2-divider-color; border: 1px solid $roomsublist-divider-color;
opacity: 0.1; opacity: 0.1;
} }

View file

@ -26,7 +26,7 @@ limitations under the License.
&:hover, &:hover,
&:focus-within, &:focus-within,
&.mx_RoomTile_hasMenuOpen { &.mx_RoomTile_hasMenuOpen {
background-color: $roomtile2-selected-bg-color; background-color: $roomtile-selected-bg-color;
border-radius: 8px; border-radius: 8px;
} }
@ -67,7 +67,7 @@ limitations under the License.
.mx_RoomTile_messagePreview { .mx_RoomTile_messagePreview {
font-size: $font-13px; font-size: $font-13px;
line-height: $font-18px; line-height: $font-18px;
color: $roomtile2-preview-color; color: $roomtile-preview-color;
} }
.mx_RoomTile_nameWithPreview { .mx_RoomTile_nameWithPreview {

View file

@ -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-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(33, 38, 44, 0.90);
$roomlist-header-color: #8E99A4; $roomlist-header-color: #8E99A4;
$roomsublist2-divider-color: $primary-fg-color; $roomsublist-divider-color: $primary-fg-color;
$roomtile2-preview-color: #A9B2BC; $roomtile-preview-color: #A9B2BC;
$roomtile2-default-badge-bg-color: #61708b; $roomtile-default-badge-bg-color: #61708b;
$roomtile2-selected-bg-color: rgba(141, 151, 165, 0.2); $roomtile-selected-bg-color: rgba(141, 151, 165, 0.2);
// ******************** // ********************

View file

@ -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-button-bg-color: #1A1D23; // Buttons include the filter box, explore button, and sublist buttons
$roomlist-bg-color: $header-panel-bg-color; $roomlist-bg-color: $header-panel-bg-color;
$roomsublist2-divider-color: $primary-fg-color; $roomsublist-divider-color: $primary-fg-color;
$roomtile2-preview-color: #9e9e9e; $roomtile-preview-color: #9e9e9e;
$roomtile2-default-badge-bg-color: #61708b; $roomtile-default-badge-bg-color: #61708b;
$roomtile2-selected-bg-color: #1A1D23; $roomtile-selected-bg-color: #1A1D23;
// ******************** // ********************

View file

@ -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-button-bg-color: #fff; // Buttons include the filter box, explore button, and sublist buttons
$roomlist-bg-color: $header-panel-bg-color; $roomlist-bg-color: $header-panel-bg-color;
$roomlist-header-color: $primary-fg-color; $roomlist-header-color: $primary-fg-color;
$roomsublist2-divider-color: $primary-fg-color; $roomsublist-divider-color: $primary-fg-color;
$roomtile2-preview-color: #9e9e9e; $roomtile-preview-color: #9e9e9e;
$roomtile2-default-badge-bg-color: #61708b; $roomtile-default-badge-bg-color: #61708b;
$roomtile2-selected-bg-color: #fff; $roomtile-selected-bg-color: #fff;
$presence-online: $accent-color; $presence-online: $accent-color;
$presence-away: #d9b072; $presence-away: #d9b072;

View file

@ -45,7 +45,7 @@ $authpage-modal-bg-color: var(--timeline-background-color-50pct); //still needs
$roomheader-bg-color: var(--timeline-background-color); $roomheader-bg-color: var(--timeline-background-color);
// //
// --roomlist-highlights-color // --roomlist-highlights-color
$roomtile2-selected-bg-color: var(--roomlist-highlights-color); $roomtile-selected-bg-color: var(--roomlist-highlights-color);
// //
// --sidebar-color // --sidebar-color
$interactive-tooltip-bg-color: var(--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); $authpage-lang-color: var(--timeline-text-color);
$roomheader-color: var(--timeline-text-color); $roomheader-color: var(--timeline-text-color);
// --roomlist-text-secondary-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); $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 // --roomlist-separator-color
$input-darker-bg-color: var(--roomlist-separator-color); $input-darker-bg-color: var(--roomlist-separator-color);
$panel-divider-color: var(--roomlist-separator-color);// originally #dee1f3, but close enough $panel-divider-color: var(--roomlist-separator-color);// originally #dee1f3, but close enough
$primary-hairline-color: var(--roomlist-separator-color);// originally #e5e5e5, 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 // --timeline-text-secondary-color
$authpage-secondary-color: var(--timeline-text-secondary-color); $authpage-secondary-color: var(--timeline-text-secondary-color);

View file

@ -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-button-bg-color: #fff; // Buttons include the filter box, explore button, and sublist buttons
$roomlist-bg-color: rgba(245, 245, 245, 0.90); $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; $roomtile-preview-color: #737D8C;
$roomtile2-default-badge-bg-color: #61708b; $roomtile-default-badge-bg-color: #61708b;
$roomtile2-selected-bg-color: #FFF; $roomtile-selected-bg-color: #FFF;
$presence-online: $accent-color; $presence-online: $accent-color;
$presence-away: #d9b072; $presence-away: #d9b072;