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

Commit aa8e3db

Browse files
ara4nt3chguy
andauthored
Support Inter on custom themes (#8399)
* include Inter natively on legacy & custom themes * fix theming of beta button * fix beta pill skinning properly * switch back to accent-alt for beta pills Co-authored-by: Michael Telatynski <[email protected]>
1 parent cd8bdc1 commit aa8e3db

File tree

2 files changed

+6
-51
lines changed

2 files changed

+6
-51
lines changed

res/css/views/beta/_BetaCard.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ limitations under the License.
119119
font-size: 12px;
120120
font-weight: $font-semi-bold;
121121
line-height: 15px;
122-
color: #FFFFFF;
122+
color: $button-primary-fg-color;
123123
display: inline-block;
124124
vertical-align: text-bottom;
125125
word-break: keep-all; // avoid multiple lines on CJK language

res/themes/legacy-light/css/_fonts.scss

Lines changed: 5 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
* and it's better to rely on the browser's built-in obliquing behaviour.
1313
*/
1414

15+
// Grab the other fonts from the current theme, so we can override to Inter
16+
// in custom fonts if needed.
17+
@import "../../light/css/_fonts.scss";
18+
19+
// Nunito as the default, for old time's sake on legacy themes.
1520
/* the 'src' links are relative to the bundle.css, which is in a subdirectory.
1621
*/
1722
@font-face {
@@ -32,53 +37,3 @@
3237
font-weight: 700;
3338
src: url('$(res)/fonts/Nunito/Nunito-Bold.ttf') format('truetype');
3439
}
35-
36-
/* latin-ext */
37-
@font-face {
38-
font-family: 'Inconsolata';
39-
font-style: normal;
40-
font-weight: 400;
41-
src: local('Inconsolata Regular'), local('Inconsolata-Regular'), url('$(res)/fonts/Inconsolata/QldKNThLqRwH-OJ1UHjlKGlX5qhExfHwNJU.woff2') format('woff2');
42-
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;
43-
}
44-
/* latin */
45-
@font-face {
46-
font-family: 'Inconsolata';
47-
font-style: normal;
48-
font-weight: 400;
49-
font-display: swap;
50-
src: local('Inconsolata Regular'), local('Inconsolata-Regular'), url('$(res)/fonts/Inconsolata/QldKNThLqRwH-OJ1UHjlKGlZ5qhExfHw.woff2') format('woff2');
51-
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;
52-
}
53-
/* latin-ext */
54-
@font-face {
55-
font-family: 'Inconsolata';
56-
font-style: normal;
57-
font-weight: 700;
58-
font-display: swap;
59-
src: local('Inconsolata Bold'), local('Inconsolata-Bold'), url('$(res)/fonts/Inconsolata/QldXNThLqRwH-OJ1UHjlKGHiw71n5_zaDpwm80E.woff2') format('woff2');
60-
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;
61-
}
62-
/* latin */
63-
@font-face {
64-
font-family: 'Inconsolata';
65-
font-style: normal;
66-
font-weight: 700;
67-
font-display: swap;
68-
src: local('Inconsolata Bold'), local('Inconsolata-Bold'), url('$(res)/fonts/Inconsolata/QldXNThLqRwH-OJ1UHjlKGHiw71p5_zaDpwm.woff2') format('woff2');
69-
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;
70-
}
71-
72-
/* a COLR/CPAL version of Twemoji used for consistent cross-browser emoji
73-
* taken from https://github.com/mozilla/twemoji-colr
74-
* using the fix from https://github.com/mozilla/twemoji-colr/issues/50 to
75-
* work on macOS
76-
*/
77-
/*
78-
// except we now load it dynamically via FontManager to handle browsers
79-
// which can't render COLR/CPAL still
80-
@font-face {
81-
font-family: "Twemoji Mozilla";
82-
src: url('$(res)/fonts/Twemoji_Mozilla/TwemojiMozilla.woff2') format('woff2');
83-
}
84-
*/

0 commit comments

Comments
 (0)