From ec981aba18eee3a8eaa44d0f6429c6fc1f146691 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 24 Apr 2022 13:38:53 -0400 Subject: [PATCH 1/4] include Inter natively on legacy & custom themes --- res/themes/legacy-light/css/_fonts.scss | 55 +++---------------------- 1 file changed, 5 insertions(+), 50 deletions(-) diff --git a/res/themes/legacy-light/css/_fonts.scss b/res/themes/legacy-light/css/_fonts.scss index 1bc9b5a4a33..807d8673ba1 100644 --- a/res/themes/legacy-light/css/_fonts.scss +++ b/res/themes/legacy-light/css/_fonts.scss @@ -12,6 +12,11 @@ * and it's better to rely on the browser's built-in obliquing behaviour. */ +// Grab the other fonts from the current theme, so we can override to Inter +// in custom fonts if needed. +@import "../../light/css/_fonts.scss"; + +// Nunito as the default, for old time's sake on legacy themes. /* the 'src' links are relative to the bundle.css, which is in a subdirectory. */ @font-face { @@ -32,53 +37,3 @@ font-weight: 700; src: url('$(res)/fonts/Nunito/Nunito-Bold.ttf') format('truetype'); } - -/* latin-ext */ -@font-face { - font-family: 'Inconsolata'; - font-style: normal; - font-weight: 400; - src: local('Inconsolata Regular'), local('Inconsolata-Regular'), url('$(res)/fonts/Inconsolata/QldKNThLqRwH-OJ1UHjlKGlX5qhExfHwNJU.woff2') format('woff2'); - unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; -} -/* latin */ -@font-face { - font-family: 'Inconsolata'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Inconsolata Regular'), local('Inconsolata-Regular'), url('$(res)/fonts/Inconsolata/QldKNThLqRwH-OJ1UHjlKGlZ5qhExfHw.woff2') format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} -/* latin-ext */ -@font-face { - font-family: 'Inconsolata'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Inconsolata Bold'), local('Inconsolata-Bold'), url('$(res)/fonts/Inconsolata/QldXNThLqRwH-OJ1UHjlKGHiw71n5_zaDpwm80E.woff2') format('woff2'); - unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; -} -/* latin */ -@font-face { - font-family: 'Inconsolata'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Inconsolata Bold'), local('Inconsolata-Bold'), url('$(res)/fonts/Inconsolata/QldXNThLqRwH-OJ1UHjlKGHiw71p5_zaDpwm.woff2') format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} - -/* a COLR/CPAL version of Twemoji used for consistent cross-browser emoji - * taken from https://github.com/mozilla/twemoji-colr - * using the fix from https://github.com/mozilla/twemoji-colr/issues/50 to - * work on macOS - */ -/* -// except we now load it dynamically via FontManager to handle browsers -// which can't render COLR/CPAL still -@font-face { - font-family: "Twemoji Mozilla"; - src: url('$(res)/fonts/Twemoji_Mozilla/TwemojiMozilla.woff2') format('woff2'); -} -*/ \ No newline at end of file From cd5a01c74d4ee80e1029ebafd53b5a811a93ebde Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 24 Apr 2022 13:39:09 -0400 Subject: [PATCH 2/4] fix theming of beta button --- res/css/views/beta/_BetaCard.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/css/views/beta/_BetaCard.scss b/res/css/views/beta/_BetaCard.scss index 658e43f051b..01a0ae395bb 100644 --- a/res/css/views/beta/_BetaCard.scss +++ b/res/css/views/beta/_BetaCard.scss @@ -119,7 +119,7 @@ limitations under the License. font-size: 12px; font-weight: $font-semi-bold; line-height: 15px; - color: #FFFFFF; + color: $background; display: inline-block; vertical-align: text-bottom; word-break: keep-all; // avoid multiple lines on CJK language From 113d9f18fd212c94166d7c929c90eec71a5091db Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 24 Apr 2022 17:56:00 -0400 Subject: [PATCH 3/4] fix beta pill skinning properly --- res/css/views/beta/_BetaCard.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/css/views/beta/_BetaCard.scss b/res/css/views/beta/_BetaCard.scss index 01a0ae395bb..6b81dc8b92e 100644 --- a/res/css/views/beta/_BetaCard.scss +++ b/res/css/views/beta/_BetaCard.scss @@ -112,14 +112,14 @@ limitations under the License. } .mx_BetaCard_betaPill { - background-color: $accent-alt; + background-color: $accent; padding: 4px 10px; border-radius: 8px; text-transform: uppercase; font-size: 12px; font-weight: $font-semi-bold; line-height: 15px; - color: $background; + color: $button-primary-fg-color; display: inline-block; vertical-align: text-bottom; word-break: keep-all; // avoid multiple lines on CJK language From eec265a191f0be5e1a44920f3d0a37154ef14f7a Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 24 Apr 2022 17:58:05 -0400 Subject: [PATCH 4/4] switch back to accent-alt for beta pills --- res/css/views/beta/_BetaCard.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/css/views/beta/_BetaCard.scss b/res/css/views/beta/_BetaCard.scss index 6b81dc8b92e..d54dd4a4c82 100644 --- a/res/css/views/beta/_BetaCard.scss +++ b/res/css/views/beta/_BetaCard.scss @@ -112,7 +112,7 @@ limitations under the License. } .mx_BetaCard_betaPill { - background-color: $accent; + background-color: $accent-alt; padding: 4px 10px; border-radius: 8px; text-transform: uppercase;