diff --git a/res/themes/dark-custom/css/dark-custom.scss b/res/themes/dark-custom/css/dark-custom.scss
index 03ceef45c6..a5fed6a320 100644
--- a/res/themes/dark-custom/css/dark-custom.scss
+++ b/res/themes/dark-custom/css/dark-custom.scss
@@ -1,7 +1,7 @@
@import "../../../../res/css/_font-sizes.scss";
-@import "../../light/css/_paths.scss";
-@import "../../light/css/_fonts.scss";
-@import "../../light/css/_light.scss";
-@import "../../dark/css/_dark.scss";
+@import "../../legacy-light/css/_paths.scss";
+@import "../../legacy-light/css/_fonts.scss";
+@import "../../legacy-light/css/_legacy-light.scss";
+@import "../../legacy-dark/css/_legacy-dark.scss";
@import "../../light-custom/css/_custom.scss";
@import "../../../../res/css/_components.scss";
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index a6a85edfe1..c2edbe24a4 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -1,14 +1,14 @@
// unified palette
// try to use these colors when possible
$bg-color: #181b21;
-$base-color: #15171b;
-$base-text-color: #edf3ff;
+$base-color: #15191E;
+$base-text-color: #ffffff;
$header-panel-bg-color: #22262e;
$header-panel-border-color: #000000;
-$header-panel-text-primary-color: #a1b2d1;
+$header-panel-text-primary-color: #B9BEC6;
$header-panel-text-secondary-color: #c8c8cd;
-$text-primary-color: #edf3ff;
-$text-secondary-color: #a1b2d1;
+$text-primary-color: #ffffff;
+$text-secondary-color: #B9BEC6;
$search-bg-color: #181b21;
$search-placeholder-color: #61708b;
$room-highlight-color: #343a46;
@@ -35,8 +35,8 @@ $info-plinth-fg-color: #888;
$preview-bar-bg-color: $header-panel-bg-color;
-$tagpanel-bg-color: $base-color;
-$inverted-bg-color: $tagpanel-bg-color;
+$tagpanel-bg-color: rgba(38, 39, 43, 0.82);
+$inverted-bg-color: $base-color;
// used by AddressSelector
$selected-color: $room-highlight-color;
@@ -45,7 +45,7 @@ $selected-color: $room-highlight-color;
$event-selected-color: $header-panel-bg-color;
// used for the hairline dividers in RoomView
-$primary-hairline-color: $header-panel-border-color;
+$primary-hairline-color: transparent;
// used for the border of input text fields
$input-border-color: #e7e7e7;
@@ -92,7 +92,8 @@ $settings-subsection-fg-color: $text-secondary-color;
$topleftmenu-color: $text-primary-color;
$roomheader-color: $text-primary-color;
-$roomheader-addroom-bg-color: #3c4556; // $search-placeholder-color at 0.5 opacity
+$roomheader-bg-color: rgba(21, 25, 30, 0.6);
+$roomheader-addroom-bg-color: rgba(92, 100, 112, 0.3);
$roomheader-addroom-fg-color: $text-primary-color;
$tagpanel-button-color: $header-panel-text-primary-color;
$roomheader-button-color: $header-panel-text-primary-color;
@@ -112,14 +113,15 @@ $composer-e2e-icon-color: $header-panel-text-primary-color;
$theme-button-bg-color: #e3e8f0;
-$roomlist2-button-bg-color: #1A1D23; // Buttons include the filter box, explore button, and sublist buttons
-$roomlist2-bg-color: $header-panel-bg-color;
+$roomlist2-button-bg-color: rgba(141, 151, 165, 0.2); // Buttons include the filter box, explore button, and sublist buttons
+$roomlist2-bg-color: rgba(33, 38, 44, 0.90);
+$roomlist2-header-color: #8E99A4;
$roomsublist2-divider-color: $primary-fg-color;
-$roomtile2-preview-color: #9e9e9e;
+$roomtile2-preview-color: #A9B2BC;
$roomtile2-default-badge-bg-color: #61708b;
-$roomtile2-selected-bg-color: #1A1D23;
+$roomtile2-selected-bg-color: rgba(141, 151, 165, 0.2);
// ********************
@@ -131,7 +133,7 @@ $roomtile-focused-bg-color: $room-highlight-color;
$roomtile-transparent-focused-color: rgba(0, 0, 0, 0.1);
-$panel-divider-color: $header-panel-border-color;
+$panel-divider-color: transparent;
$widget-menu-bar-bg-color: $header-panel-bg-color;
@@ -203,6 +205,10 @@ $user-tile-hover-bg-color: $header-panel-bg-color;
// Appearance tab colors
$appearance-tab-border-color: $room-highlight-color;
+// blur amounts for left left panel (only for element theme, used in _mods.scss)
+$roomlist-background-blur-amount: 60px;
+$tagpanel-background-blur-amount: 30px;
+
// ***** Mixins! *****
@define-mixin mx_DialogButton {
diff --git a/res/themes/dark/css/dark.scss b/res/themes/dark/css/dark.scss
index d81db4595f..6d9dc7352c 100644
--- a/res/themes/dark/css/dark.scss
+++ b/res/themes/dark/css/dark.scss
@@ -2,5 +2,10 @@
@import "../../light/css/_paths.scss";
@import "../../light/css/_fonts.scss";
@import "../../light/css/_light.scss";
+// important this goes before _mods,
+// as $tagpanel-background-blur-amount and
+// $roomlist-background-blur-amount
+// are overridden in _dark.scss
@import "_dark.scss";
+@import "../../light/css/_mods.scss";
@import "../../../../res/css/_components.scss";
diff --git a/res/themes/element-dark/css/element-dark.scss b/res/themes/element-dark/css/element-dark.scss
deleted file mode 100644
index 35b31a9078..0000000000
--- a/res/themes/element-dark/css/element-dark.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-@import "../../../../res/css/_font-sizes.scss";
-@import "../../element/css/_paths.scss";
-@import "../../element/css/_fonts.scss";
-@import "../../element/css/_element.scss";
-// important this goes before _mods,
-// as $tagpanel-background-blur-amount and
-// $roomlist-background-blur-amount
-// are overridden in _element-dark.scss
-@import "_element-dark.scss";
-@import "../../element/css/_mods.scss";
-@import "../../../../res/css/_components.scss";
diff --git a/res/themes/element-dark/css/_element-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss
similarity index 89%
rename from res/themes/element-dark/css/_element-dark.scss
rename to res/themes/legacy-dark/css/_legacy-dark.scss
index c2edbe24a4..a6a85edfe1 100644
--- a/res/themes/element-dark/css/_element-dark.scss
+++ b/res/themes/legacy-dark/css/_legacy-dark.scss
@@ -1,14 +1,14 @@
// unified palette
// try to use these colors when possible
$bg-color: #181b21;
-$base-color: #15191E;
-$base-text-color: #ffffff;
+$base-color: #15171b;
+$base-text-color: #edf3ff;
$header-panel-bg-color: #22262e;
$header-panel-border-color: #000000;
-$header-panel-text-primary-color: #B9BEC6;
+$header-panel-text-primary-color: #a1b2d1;
$header-panel-text-secondary-color: #c8c8cd;
-$text-primary-color: #ffffff;
-$text-secondary-color: #B9BEC6;
+$text-primary-color: #edf3ff;
+$text-secondary-color: #a1b2d1;
$search-bg-color: #181b21;
$search-placeholder-color: #61708b;
$room-highlight-color: #343a46;
@@ -35,8 +35,8 @@ $info-plinth-fg-color: #888;
$preview-bar-bg-color: $header-panel-bg-color;
-$tagpanel-bg-color: rgba(38, 39, 43, 0.82);
-$inverted-bg-color: $base-color;
+$tagpanel-bg-color: $base-color;
+$inverted-bg-color: $tagpanel-bg-color;
// used by AddressSelector
$selected-color: $room-highlight-color;
@@ -45,7 +45,7 @@ $selected-color: $room-highlight-color;
$event-selected-color: $header-panel-bg-color;
// used for the hairline dividers in RoomView
-$primary-hairline-color: transparent;
+$primary-hairline-color: $header-panel-border-color;
// used for the border of input text fields
$input-border-color: #e7e7e7;
@@ -92,8 +92,7 @@ $settings-subsection-fg-color: $text-secondary-color;
$topleftmenu-color: $text-primary-color;
$roomheader-color: $text-primary-color;
-$roomheader-bg-color: rgba(21, 25, 30, 0.6);
-$roomheader-addroom-bg-color: rgba(92, 100, 112, 0.3);
+$roomheader-addroom-bg-color: #3c4556; // $search-placeholder-color at 0.5 opacity
$roomheader-addroom-fg-color: $text-primary-color;
$tagpanel-button-color: $header-panel-text-primary-color;
$roomheader-button-color: $header-panel-text-primary-color;
@@ -113,15 +112,14 @@ $composer-e2e-icon-color: $header-panel-text-primary-color;
$theme-button-bg-color: #e3e8f0;
+$roomlist2-button-bg-color: #1A1D23; // Buttons include the filter box, explore button, and sublist buttons
+$roomlist2-bg-color: $header-panel-bg-color;
-$roomlist2-button-bg-color: rgba(141, 151, 165, 0.2); // Buttons include the filter box, explore button, and sublist buttons
-$roomlist2-bg-color: rgba(33, 38, 44, 0.90);
-$roomlist2-header-color: #8E99A4;
$roomsublist2-divider-color: $primary-fg-color;
-$roomtile2-preview-color: #A9B2BC;
+$roomtile2-preview-color: #9e9e9e;
$roomtile2-default-badge-bg-color: #61708b;
-$roomtile2-selected-bg-color: rgba(141, 151, 165, 0.2);
+$roomtile2-selected-bg-color: #1A1D23;
// ********************
@@ -133,7 +131,7 @@ $roomtile-focused-bg-color: $room-highlight-color;
$roomtile-transparent-focused-color: rgba(0, 0, 0, 0.1);
-$panel-divider-color: transparent;
+$panel-divider-color: $header-panel-border-color;
$widget-menu-bar-bg-color: $header-panel-bg-color;
@@ -205,10 +203,6 @@ $user-tile-hover-bg-color: $header-panel-bg-color;
// Appearance tab colors
$appearance-tab-border-color: $room-highlight-color;
-// blur amounts for left left panel (only for element theme, used in _mods.scss)
-$roomlist-background-blur-amount: 60px;
-$tagpanel-background-blur-amount: 30px;
-
// ***** Mixins! *****
@define-mixin mx_DialogButton {
diff --git a/res/themes/legacy-dark/css/legacy-dark.scss b/res/themes/legacy-dark/css/legacy-dark.scss
new file mode 100644
index 0000000000..2a4d432d26
--- /dev/null
+++ b/res/themes/legacy-dark/css/legacy-dark.scss
@@ -0,0 +1,6 @@
+@import "../../../../res/css/_font-sizes.scss";
+@import "../../legacy-light/css/_paths.scss";
+@import "../../legacy-light/css/_fonts.scss";
+@import "../../legacy-light/css/_legacy-light.scss";
+@import "_legacy-dark.scss";
+@import "../../../../res/css/_components.scss";
diff --git a/res/themes/element/css/_fonts.scss b/res/themes/legacy-light/css/_fonts.scss
similarity index 58%
rename from res/themes/element/css/_fonts.scss
rename to res/themes/legacy-light/css/_fonts.scss
index 4f133bb015..1bc9b5a4a3 100644
--- a/res/themes/element/css/_fonts.scss
+++ b/res/themes/legacy-light/css/_fonts.scss
@@ -14,73 +14,23 @@
/* the 'src' links are relative to the bundle.css, which is in a subdirectory.
*/
-
@font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 400;
- font-display: swap;
- src: url("$(res)/fonts/Inter/Inter-Regular.woff2?v=3.13") format("woff2"),
- url("$(res)/fonts/Inter/Inter-Regular.woff?v=3.13") format("woff");
+ font-family: 'Nunito';
+ font-style: normal;
+ font-weight: 400;
+ src: url('$(res)/fonts/Nunito/Nunito-Regular.ttf') format('truetype');
}
@font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 400;
- font-display: swap;
- src: url("$(res)/fonts/Inter/Inter-Italic.woff2?v=3.13") format("woff2"),
- url("$(res)/fonts/Inter/Inter-Italic.woff?v=3.13") format("woff");
-}
-
-@font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 500;
- font-display: swap;
- src: url("$(res)/fonts/Inter/Inter-Medium.woff2?v=3.13") format("woff2"),
- url("$(res)/fonts/Inter/Inter-Medium.woff?v=3.13") format("woff");
+ font-family: 'Nunito';
+ font-style: normal;
+ font-weight: 600;
+ src: url('$(res)/fonts/Nunito/Nunito-SemiBold.ttf') format('truetype');
}
@font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 500;
- font-display: swap;
- src: url("$(res)/fonts/Inter/Inter-MediumItalic.woff2?v=3.13") format("woff2"),
- url("$(res)/fonts/Inter/Inter-MediumItalic.woff?v=3.13") format("woff");
-}
-
-@font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 600;
- font-display: swap;
- src: url("$(res)/fonts/Inter/Inter-SemiBold.woff2?v=3.13") format("woff2"),
- url("$(res)/fonts/Inter/Inter-SemiBold.woff?v=3.13") format("woff");
-}
-@font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 600;
- font-display: swap;
- src: url("$(res)/fonts/Inter/Inter-SemiBoldItalic.woff2?v=3.13") format("woff2"),
- url("$(res)/fonts/Inter/Inter-SemiBoldItalic.woff?v=3.13") format("woff");
-}
-
-@font-face {
- font-family: 'Inter';
- font-style: normal;
- font-weight: 700;
- font-display: swap;
- src: url("$(res)/fonts/Inter/Inter-Bold.woff2?v=3.13") format("woff2"),
- url("$(res)/fonts/Inter/Inter-Bold.woff?v=3.13") format("woff");
-}
-@font-face {
- font-family: 'Inter';
- font-style: italic;
- font-weight: 700;
- font-display: swap;
- src: url("$(res)/fonts/Inter/Inter-BoldItalic.woff2?v=3.13") format("woff2"),
- url("$(res)/fonts/Inter/Inter-BoldItalic.woff?v=3.13") format("woff");
+ font-family: 'Nunito';
+ font-style: normal;
+ font-weight: 700;
+ src: url('$(res)/fonts/Nunito/Nunito-Bold.ttf') format('truetype');
}
/* latin-ext */
@@ -131,4 +81,4 @@
font-family: "Twemoji Mozilla";
src: url('$(res)/fonts/Twemoji_Mozilla/TwemojiMozilla.woff2') format('woff2');
}
-*/
+*/
\ No newline at end of file
diff --git a/res/themes/element/css/_element.scss b/res/themes/legacy-light/css/_legacy-light.scss
similarity index 89%
rename from res/themes/element/css/_element.scss
rename to res/themes/legacy-light/css/_legacy-light.scss
index 109f970932..991abdefff 100644
--- a/res/themes/element/css/_element.scss
+++ b/res/themes/legacy-light/css/_legacy-light.scss
@@ -8,7 +8,7 @@
/* Noto Color Emoji contains digits, in fixed-width, therefore causing
digits in flowed text to stand out.
TODO: Consider putting all emoji fonts to the end rather than the front. */
-$font-family: Inter, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Arial, Helvetica, Sans-Serif, 'Noto Color Emoji';
+$font-family: Nunito, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Arial, Helvetica, Sans-Serif, 'Noto Color Emoji';
$monospace-font-family: Inconsolata, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Courier, monospace, 'Noto Color Emoji';
@@ -18,12 +18,11 @@ $accent-color: #03b381;
$accent-bg-color: rgba(3, 179, 129, 0.16);
$notice-primary-color: #ff4b55;
$notice-primary-bg-color: rgba(255, 75, 85, 0.16);
-$primary-fg-color: #2e2f32;
-$roomlist2-header-color: $primary-fg-color;
-$notice-secondary-color: $roomlist2-header-color;
+$notice-secondary-color: #61708b;
$header-panel-bg-color: #f3f8fd;
// typical text (dark-on-white in light skin)
+$primary-fg-color: #2e2f32;
$primary-bg-color: #ffffff;
$muted-fg-color: #61708b; // Commonly used in headings and relevant alt text
@@ -37,7 +36,7 @@ $focus-bg-color: #dddddd;
$accent-fg-color: #ffffff;
$accent-color-50pct: rgba(3, 179, 129, 0.5); //#03b381 in rgb
$accent-color-darker: #92caad;
-$accent-color-alt: #238CF5;
+$accent-color-alt: #238cf5;
$selection-fg-color: $primary-bg-color;
@@ -47,8 +46,8 @@ $focus-brightness: 105%;
$warning-color: $notice-primary-color; // red
$orange-warning-color: #ff8d13; // used for true warnings
// background colour for warnings
-$warning-bg-color: #DF2A8B;
-$info-bg-color: #2A9EDF;
+$warning-bg-color: #df2a8b;
+$info-bg-color: #2a9edf;
$mention-user-pill-bg-color: $warning-color;
$other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
@@ -66,13 +65,14 @@ $preview-bar-bg-color: #f7f7f7;
$secondary-accent-color: #f2f5f8;
$tertiary-accent-color: #d3efe1;
-$tagpanel-bg-color: rgba(232, 232, 232, 0.77);
+$tagpanel-bg-color: #27303a;
+$inverted-bg-color: $tagpanel-bg-color;
// used by RoomDirectory permissions
$plinth-bg-color: $secondary-accent-color;
// used by RoomDropTarget
-$droptarget-bg-color: rgba(255,255,255,0.5);
+$droptarget-bg-color: rgba(255, 255, 255, 0.5);
// used by AddressSelector
$selected-color: $secondary-accent-color;
@@ -81,7 +81,7 @@ $selected-color: $secondary-accent-color;
$event-selected-color: $header-panel-bg-color;
// used for the hairline dividers in RoomView
-$primary-hairline-color: transparent;
+$primary-hairline-color: #e5e5e5;
// used for the border of input text fields
$input-border-color: #e7e7e7;
@@ -159,18 +159,18 @@ $rte-group-pill-color: #aaa;
$topleftmenu-color: #212121;
$roomheader-color: #45474a;
$roomheader-bg-color: $primary-bg-color;
-$roomheader-addroom-bg-color: rgba(92, 100, 112, 0.2);
-$roomheader-addroom-fg-color: #5c6470;
-$tagpanel-button-color: #91A1C0;
-$roomheader-button-color: #91A1C0;
-$groupheader-button-color: #91A1C0;
-$rightpanel-button-color: #91A1C0;
-$composer-button-color: #91A1C0;
+$roomheader-addroom-bg-color: #91a1c0;
+$roomheader-addroom-fg-color: $accent-fg-color;
+$tagpanel-button-color: #91a1c0;
+$roomheader-button-color: #91a1c0;
+$groupheader-button-color: #91a1c0;
+$rightpanel-button-color: #91a1c0;
+$composer-button-color: #91a1c0;
$roomtopic-color: #9e9e9e;
$eventtile-meta-color: $roomtopic-color;
-$composer-e2e-icon-color: #91A1C0;
-$header-divider-color: #91A1C0;
+$composer-e2e-icon-color: #91a1c0;
+$header-divider-color: #91a1c0;
// ********************
@@ -180,16 +180,17 @@ $header-divider-color: #91A1C0;
$theme-button-bg-color: #e3e8f0;
$roomlist2-button-bg-color: #fff; // Buttons include the filter box, explore button, and sublist buttons
-$roomlist2-bg-color: rgba(245, 245, 245, 0.90);
+$roomlist2-bg-color: $header-panel-bg-color;
+$roomlist2-header-color: $primary-fg-color;
$roomsublist2-divider-color: $primary-fg-color;
$roomtile2-preview-color: #9e9e9e;
$roomtile2-default-badge-bg-color: #61708b;
-$roomtile2-selected-bg-color: #FFF;
+$roomtile2-selected-bg-color: #fff;
$presence-online: $accent-color;
-$presence-away: orange; // TODO: Get color
-$presence-offline: #E3E8F0;
+$presence-away: #d9b072;
+$presence-offline: #e3e8f0;
// ********************
@@ -216,7 +217,7 @@ $roomsublist-label-fg-color: $roomtile-name-color;
$roomsublist-label-bg-color: $tertiary-accent-color;
$roomsublist-chevron-color: $accent-color;
-$panel-divider-color: transparent;
+$panel-divider-color: #dee1f3;
// ********************
@@ -317,8 +318,7 @@ $reaction-row-button-selected-border-color: $accent-color;
$kbd-border-color: $reaction-row-button-border-color;
-$inverted-bg-color: #27303a;
-$tooltip-timeline-bg-color: $inverted-bg-color;
+$tooltip-timeline-bg-color: $tagpanel-bg-color;
$tooltip-timeline-fg-color: #ffffff;
$interactive-tooltip-bg-color: #27303a;
@@ -331,11 +331,6 @@ $user-tile-hover-bg-color: $header-panel-bg-color;
// FontSlider colors
$appearance-tab-border-color: $input-darker-bg-color;
-// blur amounts for left left panel (only for element theme, used in _mods.scss)
-$roomlist-background-blur-amount: 40px;
-$tagpanel-background-blur-amount: 20px;
-
-
// ***** Mixins! *****
@define-mixin mx_DialogButton {
diff --git a/res/themes/element/css/_paths.scss b/res/themes/legacy-light/css/_paths.scss
similarity index 100%
rename from res/themes/element/css/_paths.scss
rename to res/themes/legacy-light/css/_paths.scss
diff --git a/res/themes/element/css/element.scss b/res/themes/legacy-light/css/legacy-light.scss
similarity index 75%
rename from res/themes/element/css/element.scss
rename to res/themes/legacy-light/css/legacy-light.scss
index e806a4a436..e39a1765f3 100644
--- a/res/themes/element/css/element.scss
+++ b/res/themes/legacy-light/css/legacy-light.scss
@@ -1,6 +1,5 @@
@import "../../../../res/css/_font-sizes.scss";
@import "_paths.scss";
@import "_fonts.scss";
-@import "_element.scss";
-@import "_mods.scss";
+@import "_legacy-light.scss";
@import "../../../../res/css/_components.scss";
diff --git a/res/themes/light-custom/css/light-custom.scss b/res/themes/light-custom/css/light-custom.scss
index 4f80647eba..6e9d0ff736 100644
--- a/res/themes/light-custom/css/light-custom.scss
+++ b/res/themes/light-custom/css/light-custom.scss
@@ -1,6 +1,6 @@
@import "../../../../res/css/_font-sizes.scss";
-@import "../../light/css/_paths.scss";
-@import "../../light/css/_fonts.scss";
-@import "../../light/css/_light.scss";
+@import "../../legacy-light/css/_paths.scss";
+@import "../../legacy-light/css/_fonts.scss";
+@import "../../legacy-light/css/_legacy-light.scss";
@import "_custom.scss";
@import "../../../../res/css/_components.scss";
diff --git a/res/themes/light/css/_fonts.scss b/res/themes/light/css/_fonts.scss
index 1bc9b5a4a3..4f133bb015 100644
--- a/res/themes/light/css/_fonts.scss
+++ b/res/themes/light/css/_fonts.scss
@@ -14,23 +14,73 @@
/* the 'src' links are relative to the bundle.css, which is in a subdirectory.
*/
+
@font-face {
- font-family: 'Nunito';
- font-style: normal;
- font-weight: 400;
- src: url('$(res)/fonts/Nunito/Nunito-Regular.ttf') format('truetype');
+ font-family: 'Inter';
+ font-style: normal;
+ font-weight: 400;
+ font-display: swap;
+ src: url("$(res)/fonts/Inter/Inter-Regular.woff2?v=3.13") format("woff2"),
+ url("$(res)/fonts/Inter/Inter-Regular.woff?v=3.13") format("woff");
}
@font-face {
- font-family: 'Nunito';
- font-style: normal;
- font-weight: 600;
- src: url('$(res)/fonts/Nunito/Nunito-SemiBold.ttf') format('truetype');
+ font-family: 'Inter';
+ font-style: italic;
+ font-weight: 400;
+ font-display: swap;
+ src: url("$(res)/fonts/Inter/Inter-Italic.woff2?v=3.13") format("woff2"),
+ url("$(res)/fonts/Inter/Inter-Italic.woff?v=3.13") format("woff");
+}
+
+@font-face {
+ font-family: 'Inter';
+ font-style: normal;
+ font-weight: 500;
+ font-display: swap;
+ src: url("$(res)/fonts/Inter/Inter-Medium.woff2?v=3.13") format("woff2"),
+ url("$(res)/fonts/Inter/Inter-Medium.woff?v=3.13") format("woff");
}
@font-face {
- font-family: 'Nunito';
- font-style: normal;
- font-weight: 700;
- src: url('$(res)/fonts/Nunito/Nunito-Bold.ttf') format('truetype');
+ font-family: 'Inter';
+ font-style: italic;
+ font-weight: 500;
+ font-display: swap;
+ src: url("$(res)/fonts/Inter/Inter-MediumItalic.woff2?v=3.13") format("woff2"),
+ url("$(res)/fonts/Inter/Inter-MediumItalic.woff?v=3.13") format("woff");
+}
+
+@font-face {
+ font-family: 'Inter';
+ font-style: normal;
+ font-weight: 600;
+ font-display: swap;
+ src: url("$(res)/fonts/Inter/Inter-SemiBold.woff2?v=3.13") format("woff2"),
+ url("$(res)/fonts/Inter/Inter-SemiBold.woff?v=3.13") format("woff");
+}
+@font-face {
+ font-family: 'Inter';
+ font-style: italic;
+ font-weight: 600;
+ font-display: swap;
+ src: url("$(res)/fonts/Inter/Inter-SemiBoldItalic.woff2?v=3.13") format("woff2"),
+ url("$(res)/fonts/Inter/Inter-SemiBoldItalic.woff?v=3.13") format("woff");
+}
+
+@font-face {
+ font-family: 'Inter';
+ font-style: normal;
+ font-weight: 700;
+ font-display: swap;
+ src: url("$(res)/fonts/Inter/Inter-Bold.woff2?v=3.13") format("woff2"),
+ url("$(res)/fonts/Inter/Inter-Bold.woff?v=3.13") format("woff");
+}
+@font-face {
+ font-family: 'Inter';
+ font-style: italic;
+ font-weight: 700;
+ font-display: swap;
+ src: url("$(res)/fonts/Inter/Inter-BoldItalic.woff2?v=3.13") format("woff2"),
+ url("$(res)/fonts/Inter/Inter-BoldItalic.woff?v=3.13") format("woff");
}
/* latin-ext */
@@ -81,4 +131,4 @@
font-family: "Twemoji Mozilla";
src: url('$(res)/fonts/Twemoji_Mozilla/TwemojiMozilla.woff2') format('woff2');
}
-*/
\ No newline at end of file
+*/
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 991abdefff..109f970932 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -8,7 +8,7 @@
/* Noto Color Emoji contains digits, in fixed-width, therefore causing
digits in flowed text to stand out.
TODO: Consider putting all emoji fonts to the end rather than the front. */
-$font-family: Nunito, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Arial, Helvetica, Sans-Serif, 'Noto Color Emoji';
+$font-family: Inter, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Arial, Helvetica, Sans-Serif, 'Noto Color Emoji';
$monospace-font-family: Inconsolata, Twemoji, 'Apple Color Emoji', 'Segoe UI Emoji', Courier, monospace, 'Noto Color Emoji';
@@ -18,11 +18,12 @@ $accent-color: #03b381;
$accent-bg-color: rgba(3, 179, 129, 0.16);
$notice-primary-color: #ff4b55;
$notice-primary-bg-color: rgba(255, 75, 85, 0.16);
-$notice-secondary-color: #61708b;
+$primary-fg-color: #2e2f32;
+$roomlist2-header-color: $primary-fg-color;
+$notice-secondary-color: $roomlist2-header-color;
$header-panel-bg-color: #f3f8fd;
// typical text (dark-on-white in light skin)
-$primary-fg-color: #2e2f32;
$primary-bg-color: #ffffff;
$muted-fg-color: #61708b; // Commonly used in headings and relevant alt text
@@ -36,7 +37,7 @@ $focus-bg-color: #dddddd;
$accent-fg-color: #ffffff;
$accent-color-50pct: rgba(3, 179, 129, 0.5); //#03b381 in rgb
$accent-color-darker: #92caad;
-$accent-color-alt: #238cf5;
+$accent-color-alt: #238CF5;
$selection-fg-color: $primary-bg-color;
@@ -46,8 +47,8 @@ $focus-brightness: 105%;
$warning-color: $notice-primary-color; // red
$orange-warning-color: #ff8d13; // used for true warnings
// background colour for warnings
-$warning-bg-color: #df2a8b;
-$info-bg-color: #2a9edf;
+$warning-bg-color: #DF2A8B;
+$info-bg-color: #2A9EDF;
$mention-user-pill-bg-color: $warning-color;
$other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
@@ -65,14 +66,13 @@ $preview-bar-bg-color: #f7f7f7;
$secondary-accent-color: #f2f5f8;
$tertiary-accent-color: #d3efe1;
-$tagpanel-bg-color: #27303a;
-$inverted-bg-color: $tagpanel-bg-color;
+$tagpanel-bg-color: rgba(232, 232, 232, 0.77);
// used by RoomDirectory permissions
$plinth-bg-color: $secondary-accent-color;
// used by RoomDropTarget
-$droptarget-bg-color: rgba(255, 255, 255, 0.5);
+$droptarget-bg-color: rgba(255,255,255,0.5);
// used by AddressSelector
$selected-color: $secondary-accent-color;
@@ -81,7 +81,7 @@ $selected-color: $secondary-accent-color;
$event-selected-color: $header-panel-bg-color;
// used for the hairline dividers in RoomView
-$primary-hairline-color: #e5e5e5;
+$primary-hairline-color: transparent;
// used for the border of input text fields
$input-border-color: #e7e7e7;
@@ -159,18 +159,18 @@ $rte-group-pill-color: #aaa;
$topleftmenu-color: #212121;
$roomheader-color: #45474a;
$roomheader-bg-color: $primary-bg-color;
-$roomheader-addroom-bg-color: #91a1c0;
-$roomheader-addroom-fg-color: $accent-fg-color;
-$tagpanel-button-color: #91a1c0;
-$roomheader-button-color: #91a1c0;
-$groupheader-button-color: #91a1c0;
-$rightpanel-button-color: #91a1c0;
-$composer-button-color: #91a1c0;
+$roomheader-addroom-bg-color: rgba(92, 100, 112, 0.2);
+$roomheader-addroom-fg-color: #5c6470;
+$tagpanel-button-color: #91A1C0;
+$roomheader-button-color: #91A1C0;
+$groupheader-button-color: #91A1C0;
+$rightpanel-button-color: #91A1C0;
+$composer-button-color: #91A1C0;
$roomtopic-color: #9e9e9e;
$eventtile-meta-color: $roomtopic-color;
-$composer-e2e-icon-color: #91a1c0;
-$header-divider-color: #91a1c0;
+$composer-e2e-icon-color: #91A1C0;
+$header-divider-color: #91A1C0;
// ********************
@@ -180,17 +180,16 @@ $header-divider-color: #91a1c0;
$theme-button-bg-color: #e3e8f0;
$roomlist2-button-bg-color: #fff; // Buttons include the filter box, explore button, and sublist buttons
-$roomlist2-bg-color: $header-panel-bg-color;
-$roomlist2-header-color: $primary-fg-color;
+$roomlist2-bg-color: rgba(245, 245, 245, 0.90);
$roomsublist2-divider-color: $primary-fg-color;
$roomtile2-preview-color: #9e9e9e;
$roomtile2-default-badge-bg-color: #61708b;
-$roomtile2-selected-bg-color: #fff;
+$roomtile2-selected-bg-color: #FFF;
$presence-online: $accent-color;
-$presence-away: #d9b072;
-$presence-offline: #e3e8f0;
+$presence-away: orange; // TODO: Get color
+$presence-offline: #E3E8F0;
// ********************
@@ -217,7 +216,7 @@ $roomsublist-label-fg-color: $roomtile-name-color;
$roomsublist-label-bg-color: $tertiary-accent-color;
$roomsublist-chevron-color: $accent-color;
-$panel-divider-color: #dee1f3;
+$panel-divider-color: transparent;
// ********************
@@ -318,7 +317,8 @@ $reaction-row-button-selected-border-color: $accent-color;
$kbd-border-color: $reaction-row-button-border-color;
-$tooltip-timeline-bg-color: $tagpanel-bg-color;
+$inverted-bg-color: #27303a;
+$tooltip-timeline-bg-color: $inverted-bg-color;
$tooltip-timeline-fg-color: #ffffff;
$interactive-tooltip-bg-color: #27303a;
@@ -331,6 +331,11 @@ $user-tile-hover-bg-color: $header-panel-bg-color;
// FontSlider colors
$appearance-tab-border-color: $input-darker-bg-color;
+// blur amounts for left left panel (only for element theme, used in _mods.scss)
+$roomlist-background-blur-amount: 40px;
+$tagpanel-background-blur-amount: 20px;
+
+
// ***** Mixins! *****
@define-mixin mx_DialogButton {
diff --git a/res/themes/element/css/_mods.scss b/res/themes/light/css/_mods.scss
similarity index 100%
rename from res/themes/element/css/_mods.scss
rename to res/themes/light/css/_mods.scss
diff --git a/res/themes/light/css/light.scss b/res/themes/light/css/light.scss
index 4f48557648..f31ce5c139 100644
--- a/res/themes/light/css/light.scss
+++ b/res/themes/light/css/light.scss
@@ -2,4 +2,5 @@
@import "_paths.scss";
@import "_fonts.scss";
@import "_light.scss";
+@import "_mods.scss";
@import "../../../../res/css/_components.scss";