OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

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 <7t3chguy@gmail.com>
pull/28788/head^2
Matthew Hodgson 2022-05-09 07:55:28 +01:00 committed by GitHub
parent cd8bdc1f54
commit aa8e3dbfb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/css/views/beta/_BetaCard.scss
View File

@ -119,7 +119,7 @@ limitations under the License.
font-size: 12px; font-size: 12px;
font-weight: $font-semi-bold; font-weight: $font-semi-bold;
line-height: 15px; line-height: 15px;
color: #FFFFFF; color: $button-primary-fg-color;
display: inline-block; display: inline-block;
vertical-align: text-bottom; vertical-align: text-bottom;
word-break: keep-all; // avoid multiple lines on CJK language word-break: keep-all; // avoid multiple lines on CJK language

55
res/themes/legacy-light/css/_fonts.scss
View File

@ -12,6 +12,11 @@
* and it's better to rely on the browser's built-in obliquing behaviour. * 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. /* the 'src' links are relative to the bundle.css, which is in a subdirectory.
*/ */
@font-face { @font-face {
@ -32,53 +37,3 @@
font-weight: 700; font-weight: 700;
src: url('$(res)/fonts/Nunito/Nunito-Bold.ttf') format('truetype'); 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');
}
*/