luckyimnotanigger/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-05-14 05:52:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fonts rework (#12114)

Browse source 
- Use system fonts only for text to avoid FOUT
- Move font-awesome to npm/webpack
- Move NotoColorEmoji to web_src
- Remove presumably unneccesary 'PT Sans Narrow'
- Simplify webpack import exclusions

Fixes: https://github.com/go-gitea/gitea/issues/11818
Fixes: https://github.com/go-gitea/gitea/pull/11814

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
silverwind 2020-07-06 10:56:54 +02:00 • committed by GitHub
parent 9fc9c1de98
commit 62c2c17031
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 21 additions and 954 deletions
Download patch file Download diff file Expand all files Collapse all files

62
web_src/less/_base.less
View file

@ -1,48 +1,3 @@
/* roboto-regular - latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src:
local('Roboto'),
local('Roboto-Regular'),
/* Chrome 26+, Opera 23+, Firefox 39+ */
url('../vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-regular.woff2') format('woff2');
}
/* roboto-italic - latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext */
@font-face {
font-family: 'Roboto';
font-style: italic;
font-weight: 400;
src:
local('Roboto Italic'),
local('Roboto-Italic'),
url('../vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-italic.woff2') format('woff2');
}
/* roboto-700 - latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 700;
src:
local('Roboto Bold'),
local('Roboto-Bold'),
url('../vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700.woff2') format('woff2');
}
/* roboto-700italic - latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext */
@font-face {
font-family: 'Roboto';
font-style: italic;
font-weight: 700;
src:
local('Roboto Bold Italic'),
local('Roboto-BoldItalic'),
url('../vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700italic.woff2') format('woff2');
}
@font-face {
font-family: 'Yu Gothic';
src: local('Yu Gothic Medium');
@ -60,19 +15,19 @@
src:
local('Noto Color Emoji'),
local('Noto-Color-Emoji'),
url('../vendor/assets/noto-color-emoji/NotoColorEmoji.ttf') format('truetype');
url('../fonts/noto-color-emoji/NotoColorEmoji.ttf') format('truetype');
}
@default-fonts: -apple-system, BlinkMacSystemFont, system-ui, 'Segoe UI', Roboto, Helvetica, Arial, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
@default-fonts: -apple-system, BlinkMacSystemFont, system-ui, 'Segoe UI', Roboto, Helvetica, Arial, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" sans-serif;
@monospaced-fonts: 'SF Mono', Consolas, Menlo, 'Liberation Mono', Monaco, 'Lucida Console';
.override-fonts(@fonts) {
textarea {
font-family: @fonts, sans-serif;
font-family: @fonts;
}
.markdown:not(code) {
font-family: @fonts, sans-serif;
font-family: @fonts;
}
/* We're going to just override the semantic fonts here */
@ -81,12 +36,7 @@
h3,
h4,
h5 {
font-family: Roboto, @fonts, sans-serif;
}
.home .hero h1,
.home .hero h2 {
font-family: 'PT Sans Narrow', Roboto, @fonts, sans-serif;
font-family: @fonts;
}
.ui.accordion .title:not(.ui),
@ -125,7 +75,7 @@
.ui.steps .step .title,
.ui.text.container,
.ui.language > .menu > .item& {
font-family: Roboto, @fonts, sans-serif;
font-family: @fonts;
}
}

1
web_src/less/index.less
View file

@ -1,3 +1,4 @@
@import "~font-awesome/css/font-awesome.css";
@import "./vendor/gitGraph.css";
@import "_svg";