Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Color cleanup number 10 #7132

Merged
merged 15 commits into from
Nov 16, 2021
Merged

Color cleanup number 10 #7132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
00e0dc4
Remove $blockquote-fg-color
SimonBrandner Nov 13, 2021
f2775e1
Use $background for $widget-body-bg-color
SimonBrandner Nov 13, 2021
43a5622
Use $system for $menu-bg-color
SimonBrandner Nov 13, 2021
e31b056
Use $header-panel-text-primary-color as #91A1C0
SimonBrandner Nov 13, 2021
48405ba
$composer-e2e-icon-color -> $header-panel-text-primary-color
SimonBrandner Nov 13, 2021
216fdf5
$header-divider-color -> $header-panel-text-primary-color
SimonBrandner Nov 13, 2021
8b1143c
Remove $groupFilterPanel-button-color
SimonBrandner Nov 13, 2021
43a585e
$groupheader-button-color -> $header-panel-text-primary-color
SimonBrandner Nov 13, 2021
8a2d3fc
$rightpanel-button-color -> $header-panel-text-primary-color
SimonBrandner Nov 13, 2021
f3b58e6
Use $accent-alt for $input-focused-border-color
SimonBrandner Nov 13, 2021
0691997
$tab-label-active-icon-bg-color -> $tab-label-active-fg-color
SimonBrandner Nov 13, 2021
1951010
Use $background for $button-primary-fg-color
SimonBrandner Nov 13, 2021
355a52b
Use $background for $togglesw-ball-color
SimonBrandner Nov 13, 2021
54595ab
Use $background for $lightbox-fg-color
SimonBrandner Nov 13, 2021
3b4b122
Use $muted-fg-color instead of #61708b
SimonBrandner Nov 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion res/css/structures/_GroupView.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ limitations under the License.
position: absolute;
height: 20px;
width: 20px;
background-color: $groupheader-button-color;
background-color: $header-panel-text-primary-color;
mask-repeat: no-repeat;
mask-size: contain;
}
Expand Down
2 changes: 1 addition & 1 deletion res/css/structures/_HeaderButtons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ limitations under the License.

.mx_HeaderButtons::before {
content: "";
background-color: $header-divider-color;
background-color: $header-panel-text-primary-color;
opacity: 0.5;
margin: 6px 8px;
border-radius: 1px;
Expand Down
2 changes: 1 addition & 1 deletion res/css/structures/_RightPanel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ $pulse-color: $alert;
margin: 11px auto 29px auto;
height: 42px;
width: 42px;
background-color: $rightpanel-button-color;
background-color: $header-panel-text-primary-color;
mask-repeat: no-repeat;
mask-size: contain;
mask-position: center;
Expand Down
2 changes: 1 addition & 1 deletion res/css/structures/_TabbedView.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ limitations under the License.
}

.mx_TabbedView_tabLabel_active .mx_TabbedView_maskedIcon::before {
background-color: $tab-label-active-icon-bg-color;
background-color: $tab-label-active-fg-color;
}

.mx_TabbedView_maskedIcon {
Expand Down
2 changes: 1 addition & 1 deletion res/css/views/messages/_CreateEvent.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.

.mx_CreateEvent {
&::before {
background-color: $composer-e2e-icon-color;
background-color: $header-panel-text-primary-color;
mask-image: url('$(res)/img/element-icons/chat-bubbles.svg');
}
}
2 changes: 1 addition & 1 deletion res/css/views/messages/_MJitsiWidgetEvent.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.

.mx_MJitsiWidgetEvent {
&::before {
background-color: $composer-e2e-icon-color; // XXX: Variable abuse
background-color: $header-panel-text-primary-color; // XXX: Variable abuse
mask-image: url('$(res)/img/element-icons/call/video-call.svg');
}
}
2 changes: 1 addition & 1 deletion res/css/views/messages/_common_CryptoEvent.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ limitations under the License.

&.mx_cryptoEvent_icon::after {
mask-image: url('$(res)/img/e2e/normal.svg');
background-color: $composer-e2e-icon-color;
background-color: $header-panel-text-primary-color;
}

&.mx_cryptoEvent_icon_verified::after {
Expand Down
2 changes: 1 addition & 1 deletion res/css/views/right_panel/_BaseCard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ limitations under the License.
left: 0;
mask-repeat: no-repeat;
mask-position: center;
background-color: $rightpanel-button-color;
background-color: $header-panel-text-primary-color;
}
}

Expand Down
2 changes: 1 addition & 1 deletion res/css/views/right_panel/_UserInfo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ limitations under the License.
mask-image: url('$(res)/img/minimise.svg');
mask-repeat: no-repeat;
mask-position: 7px center;
background-color: $rightpanel-button-color;
background-color: $header-panel-text-primary-color;
}
}

Expand Down
2 changes: 1 addition & 1 deletion res/css/views/rooms/_E2EIcon.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ limitations under the License.

.mx_E2EIcon_normal::after {
mask-image: url('$(res)/img/e2e/normal.svg');
background-color: $composer-e2e-icon-color;
background-color: $header-panel-text-primary-color;
}

.mx_E2EIcon_verified::after {
Expand Down
2 changes: 1 addition & 1 deletion res/css/views/rooms/_EntityTile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ limitations under the License.
mask-repeat: no-repeat;
width: 16px;
height: 16px;
background-color: $rightpanel-button-color;
background-color: $header-panel-text-primary-color;
}

.mx_EntityTile .mx_PresenceLabel {
Expand Down
2 changes: 1 addition & 1 deletion res/css/views/rooms/_EventTile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ $left-gutter: 64px;
.mx_EventTile_e2eIcon_normal {
&::after {
mask-image: url('$(res)/img/e2e/normal.svg');
background-color: $composer-e2e-icon-color;
background-color: $header-panel-text-primary-color;
}
opacity: 1;
}
Expand Down
2 changes: 1 addition & 1 deletion res/css/views/rooms/_MemberInfo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ limitations under the License.
mask-image: url('$(res)/img/minimise.svg');
mask-repeat: no-repeat;
mask-position: 16px center;
background-color: $rightpanel-button-color;
background-color: $header-panel-text-primary-color;
}

.mx_MemberInfo_name h2 {
Expand Down
7 changes: 0 additions & 7 deletions res/css/views/rooms/_MessageComposer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,6 @@ limitations under the License.
animation: 0.2s visualbell;
}

.mx_MessageComposer_input blockquote {
color: $blockquote-fg-color;
margin: 0 0 16px;
padding: 0 15px;
border-left: 4px solid $blockquote-bar-color;
}

.mx_MessageComposer_input pre {
background-color: $rte-code-bg-color;
border-radius: 3px;
Expand Down
7 changes: 0 additions & 7 deletions res/themes/dark/css/_dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,6 @@ $h3-color: $primary-content;
$focus-bg-color: $room-highlight-color;
$roomtopic-color: $text-secondary-color;
$light-fg-color: $header-panel-text-secondary-color;
$composer-e2e-icon-color: $header-panel-text-primary-color;
$header-divider-color: $header-panel-text-primary-color;
$groupFilterPanel-button-color: $header-panel-text-primary-color;
$groupheader-button-color: $header-panel-text-primary-color;
$rightpanel-button-color: $header-panel-text-primary-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;
Expand All @@ -79,7 +74,6 @@ $input-border-color: rgba(231, 231, 231, 0.2);
$input-darker-bg-color: #181b21;
$input-darker-fg-color: #61708b;
$input-lighter-bg-color: #f2f5f8;
$input-focused-border-color: #238cf5;
// ********************

// Menu
Expand Down Expand Up @@ -122,7 +116,6 @@ $widget-body-bg-color: rgba(141, 151, 165, 0.2);
// ********************
$tab-label-fg-color: $primary-content;
$tab-label-active-fg-color: $primary-content;
$tab-label-active-icon-bg-color: $primary-content;
// ********************

// Buttons
Expand Down
7 changes: 0 additions & 7 deletions res/themes/legacy-dark/css/_legacy-dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,9 @@ $settings-subsection-fg-color: $text-secondary-color;
$topleftmenu-color: $text-primary-color;
$roomheader-addroom-bg-color: #3c4556;
$roomheader-addroom-fg-color: $text-primary-color;
$groupFilterPanel-button-color: $header-panel-text-primary-color;
$groupheader-button-color: $header-panel-text-primary-color;
$rightpanel-button-color: $header-panel-text-primary-color;
$icon-button-color: $header-panel-text-primary-color;
$roomtopic-color: $text-secondary-color;

$header-divider-color: $header-panel-text-primary-color;
$composer-e2e-icon-color: $header-panel-text-primary-color;

// Legacy theme backports
$accent: #0DBD8B;
$alert: #FF5B55;
Expand Down Expand Up @@ -143,7 +137,6 @@ $event-timestamp-color: $text-secondary-color;
// Tabbed views
$tab-label-fg-color: $text-primary-color;
$tab-label-active-fg-color: $text-primary-color;
$tab-label-active-icon-bg-color: $text-primary-color;

// Buttons
$button-primary-fg-color: #ffffff;
Expand Down
10 changes: 2 additions & 8 deletions res/themes/legacy-light/css/_legacy-light.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ $neutral-badge-color: #dbdbdb;
$preview-widget-bar-color: #ddd;

$blockquote-bar-color: #ddd;
$blockquote-fg-color: #777;

$settings-grey-fg-color: #a2a2a2;
$settings-profile-overlay-placeholder-fg-color: #2e2f32;
Expand All @@ -124,19 +123,15 @@ $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;

$topleftmenu-color: #212121;
$roomheader-bg-color: $primary-bg-color;
$roomheader-addroom-bg-color: #91a1c0;
$roomheader-addroom-fg-color: $accent-fg-color;
$groupFilterPanel-button-color: #91a1c0;
$groupheader-button-color: #91a1c0;
$rightpanel-button-color: #91a1c0;
$icon-button-color: #91a1c0;
$roomtopic-color: #9e9e9e;

$composer-e2e-icon-color: #91a1c0;
$header-divider-color: #91a1c0;

// ********************

$theme-button-bg-color: #e3e8f0;
Expand Down Expand Up @@ -223,7 +218,6 @@ $lightbox-border-color: #ffffff;
// Tabbed views
$tab-label-fg-color: #45474a;
$tab-label-active-fg-color: #ffffff;
$tab-label-active-icon-bg-color: $tab-label-active-fg-color;

// Buttons
$button-primary-fg-color: #ffffff;
Expand Down
2 changes: 0 additions & 2 deletions res/themes/light-custom/css/_custom.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,6 @@ $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 #777777
$blockquote-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);
Expand Down
26 changes: 10 additions & 16 deletions res/themes/light/css/_light.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ $icon-button-color: $quaternary-content;

// Colors that aren't in Figma - we need to get rid of these
// ********************
$header-panel-text-primary-color: #91A1C0;
$muted-fg-color: #61708b;
$light-fg-color: #747474;
$focus-bg-color: #dddddd;
Expand All @@ -72,12 +73,7 @@ $strong-input-border-color: #c7c7c7;
$neutral-badge-color: #dbdbdb;
$preview-widget-bar-color: #ddd;
$topleftmenu-color: #212121;
$groupFilterPanel-button-color: #91A1C0;
$groupheader-button-color: #91A1C0;
$rightpanel-button-color: #91A1C0;
$roomtopic-color: #9e9e9e;
$composer-e2e-icon-color: #91A1C0;
$header-divider-color: #91A1C0;
$groupFilterPanel-bg-color: rgba(232, 232, 232, 0.77);
$progressbar-bg-color: rgba(141, 151, 165, 0.2);
$panel-gradient: rgba(242, 245, 248, 0), rgba(242, 245, 248, 1);
Expand All @@ -91,7 +87,6 @@ $memberstatus-placeholder-color: $muted-fg-color;
// Blockquote
// ********************
$blockquote-bar-color: #ddd;
$blockquote-fg-color: #777;
// ********************

// Tooltip
Expand All @@ -103,13 +98,13 @@ $tooltip-timeline-fg-color: $background;
// Widget
// ********************
$widget-menu-bar-bg-color: $secondary-accent-color;
$widget-body-bg-color: #FFF;
$widget-body-bg-color: $background;
// ********************

// Menu
// ********************
$menu-border-color: #e7e7e7;
$menu-bg-color: #fff;
$menu-bg-color: $system;
$menu-box-shadow-color: rgba(118, 131, 156, 0.6);
$menu-selected-color: #f5f8fa;
// ********************
Expand All @@ -119,7 +114,7 @@ $menu-selected-color: #f5f8fa;
$settings-grey-fg-color: #a2a2a2;
$settings-profile-overlay-placeholder-fg-color: #2e2f32;
$settings-profile-button-bg-color: #e7e7e7;
$settings-subsection-fg-color: #61708b;
$settings-subsection-fg-color: $muted-fg-color;
// ********************

// RoomHeader
Expand Down Expand Up @@ -150,7 +145,7 @@ $input-border-color: #e7e7e7;
$input-darker-bg-color: $quinary-content;
$input-darker-fg-color: #9fa9ba;
$input-lighter-bg-color: #f2f5f8;
$input-focused-border-color: #238cf5;
$input-focused-border-color: $accent-alt;
// ********************

// Dialog
Expand All @@ -173,7 +168,7 @@ $imagebody-giflabel-color: rgba(255, 255, 255, 1);
$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%);
$roomtile-default-badge-bg-color: #61708b;
$roomtile-default-badge-bg-color: $muted-fg-color;
// ********************

// e2e
Expand All @@ -188,12 +183,11 @@ $e2e-warning-color: #ba6363;
// ********************
$tab-label-fg-color: #45474a;
$tab-label-active-fg-color: $background;
$tab-label-active-icon-bg-color: $tab-label-active-fg-color;
// ********************

// Buttons
// ********************
$button-primary-fg-color: #ffffff;
$button-primary-fg-color: $background;
$button-secondary-bg-color: $accent-fg-color;
$button-danger-fg-color: $background;
$button-danger-disabled-fg-color: $background;
Expand All @@ -203,7 +197,7 @@ $button-danger-disabled-bg-color: #f5b6bb; // TODO: Verify color
// Toggle switch
// ********************
$togglesw-off-color: #c1c9d6;
$togglesw-ball-color: #fff;
$togglesw-ball-color: $background;
// ********************

// Authpage
Expand All @@ -213,7 +207,7 @@ $authpage-modal-bg-color: rgba(245, 245, 245, 0.90);
$authpage-focus-bg-color: #dddddd;
$authpage-lang-color: #4e5054;
$authpage-primary-color: #232f32;
$authpage-secondary-color: #61708b;
$authpage-secondary-color: $muted-fg-color;
// ********************

// Message action bar
Expand Down Expand Up @@ -251,7 +245,7 @@ $eventbubble-reply-color: $quaternary-content;

// Lightbox
// ********************
$lightbox-fg-color: #ffffff;
$lightbox-fg-color: $background;
$lightbox-background-bg-color: #000;
$lightbox-background-bg-opacity: 0.95;
// ********************
Expand Down