sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Task/colors 11 (#7211)

Browse Source
This commit is contained in:
Šimon Brandner
2021-11-29 12:52:09 +00:00
committed by GitHub
parent 6d3865bdd5
commit 9db0ebb7f5
28 changed files with 66 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/themes/dark/css/_dark.scss
+11 -15
View File
@@ -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) {
res/themes/legacy-dark/css/_legacy-dark.scss
+1 -6
View File
@@ -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%);
res/themes/legacy-light/css/_legacy-light.scss
+6 -17
View File
@@ -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;
res/themes/light-custom/css/_custom.scss
-4
View File
@@ -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
res/themes/light-high-contrast/css/_light-high-contrast.scss
+2 -4
View File
@@ -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 {
res/themes/light/css/_light.scss
+14 -22
View File
@@ -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);