diff options
| author | Mike L <cl.jeremy@qq.com> | 2020-08-29 01:41:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 19:41:28 -0400 |
| commit | e1eee2d00a11045c3e4fdf673c4a72ac11061ec1 (patch) | |
| tree | 1c6db51934990ca9e15a6ceac77f69e7290f5597 | |
| parent | 7ba6fea0b7cf9b63688b093151e36f3f34cd78cb (diff) | |
| download | gitea-e1eee2d00a11045c3e4fdf673c4a72ac11061ec1.tar.gz gitea-e1eee2d00a11045c3e4fdf673c4a72ac11061ec1.zip | |
Avoid unnecessary system-ui expansion (#12522)
* Avoid unnecessary system-ui expansion (fix #12325)
* extract config to static object
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
| -rw-r--r-- | web_src/less/_base.less | 16 | ||||
| -rw-r--r-- | webpack.config.js | 10 |
2 files changed, 16 insertions, 10 deletions
diff --git a/web_src/less/_base.less b/web_src/less/_base.less index caf108d1be..ddb65a7c26 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -18,7 +18,7 @@ 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" sans-serif; +@default-fonts: -apple-system, BlinkMacSystemFont, system-ui, 'Segoe UI', Roboto, Helvetica, Arial, "Apple Color Emoji", "Segoe UI Emoji", "Noto Color Emoji", "Twemoji Mozilla"; @monospaced-fonts: 'SF Mono', Consolas, Menlo, 'Liberation Mono', Monaco, 'Lucida Console'; .override-fonts(@fonts) { @@ -79,7 +79,7 @@ } } -.override-fonts(@default-fonts); +.override-fonts(@default-fonts, sans-serif;); body { background-color: #ffffff; @@ -90,27 +90,27 @@ body { @ja-fonts: 'Hiragino Kaku Gothic ProN', 'Yu Gothic', 'Source Han Sans JP', 'Noto Sans CJK JP', 'Droid Sans Japanese', 'Meiryo', 'MS PGothic'; :lang(ja) { - .override-fonts(@default-fonts, @ja-fonts;); + .override-fonts(@default-fonts, @ja-fonts, sans-serif;); } @zh-CN-fonts: 'PingFang SC', 'Hiragino Sans GB', 'Source Han Sans CN', 'Source Han Sans SC', 'Noto Sans CJK SC', 'Microsoft YaHei', 'Heiti SC', SimHei; :lang(zh-CN) { - .override-fonts(@default-fonts, @zh-CN-fonts;); + .override-fonts(@default-fonts, @zh-CN-fonts, sans-serif;); } @zh-TW-fonts: 'PingFang TC', 'Hiragino Sans TC', 'Source Han Sans TW', 'Source Han Sans TC', 'Noto Sans CJK TC', 'Microsoft JhengHei', 'Heiti TC', PMingLiU; :lang(zh-TW) { - .override-fonts(@default-fonts, @zh-TW-fonts;); + .override-fonts(@default-fonts, @zh-TW-fonts, sans-serif;); } @zh-HK-fonts: 'PingFang HK', 'Hiragino Sans TC', 'Source Han Sans HK', 'Source Han Sans TC', 'Noto Sans CJK TC', 'Microsoft JhengHei', 'Heiti TC', PMingLiU_HKSCS, PMingLiU; :lang(zh-HK) { - .override-fonts(@default-fonts, @zh-HK-fonts;); + .override-fonts(@default-fonts, @zh-HK-fonts, sans-serif;); } @ko-fonts: 'Apple SD Gothic Neo', 'NanumBarunGothic', 'Malgun Gothic', 'Gulim', 'Dotum', 'Nanum Gothic', 'Source Han Sans KR', 'Noto Sans CJK KR'; :lang(ko) { - .override-fonts(@default-fonts, @ko-fonts;); + .override-fonts(@default-fonts, @ko-fonts, sans-serif;); } img { @@ -1072,7 +1072,7 @@ i.icon.centerlock { .blame-data { display: flex; - font-family: @default-fonts; + font-family: @default-fonts, sans-serif; .blame-message { flex-grow: 2; diff --git a/webpack.config.js b/webpack.config.js index b8c26dacee..67e8a6ffce 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -13,6 +13,12 @@ const {resolve, parse} = require('path'); const {LicenseWebpackPlugin} = require('license-webpack-plugin'); const {SourceMapDevToolPlugin} = require('webpack'); +const postCssPresetEnvConfig = { + features: { + 'system-ui-font-family': false, + } +}; + const glob = (pattern) => fastGlob.sync(pattern, {cwd: __dirname, absolute: true}); const themes = {}; @@ -178,7 +184,7 @@ module.exports = { loader: 'postcss-loader', options: { plugins: () => [ - PostCSSPresetEnv(), + PostCSSPresetEnv(postCssPresetEnvConfig), ], sourceMap: true, }, @@ -204,7 +210,7 @@ module.exports = { loader: 'postcss-loader', options: { plugins: () => [ - PostCSSPresetEnv(), + PostCSSPresetEnv(postCssPresetEnvConfig), ], sourceMap: true, }, |