Avoid unnecessary system-ui expansion (fix #12325)

go-gitea · Aug 18, 2020 · 394f247 · 394f247
1 parent 61a1729
commit 394f247
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/web_src/less/_base.less b/web_src/less/_base.less
@@ -18,16 +18,17 @@
         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;
+@emoji-fonts: "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
 @monospaced-fonts: 'SF Mono', Consolas, Menlo, 'Liberation Mono', Monaco, 'Lucida Console';
 
 .override-fonts(@fonts) {
     textarea {
-        font-family: @fonts;
+        font-family: @fonts, sans-serif, @emoji-fonts;
     }
 
     .markdown:not(code) {
-        font-family: @fonts;
+        font-family: @fonts, sans-serif, @emoji-fonts;
     }
 
     /* We're going to just override the semantic fonts here */
@@ -36,7 +37,7 @@
     h3,
     h4,
     h5 {
-        font-family: @fonts;
+        font-family: @fonts, sans-serif, @emoji-fonts;
     }
 
     .ui.accordion .title:not(.ui),
@@ -75,7 +76,7 @@
     .ui.steps .step .title,
     .ui.text.container,
     .ui.language > .menu > .item& {
-        font-family: @fonts;
+        font-family: @fonts, sans-serif, @emoji-fonts;
     }
 }
 

diff --git a/webpack.config.js b/webpack.config.js
@@ -4,7 +4,11 @@ const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const FixStyleOnlyEntriesPlugin = require('webpack-fix-style-only-entries');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
-const PostCSSPresetEnv = require('postcss-preset-env');
+const PostCSSPresetEnv = () => require('postcss-preset-env')({
+  features: {
+    'system-ui-font-family': false,
+  }
+});
 const TerserPlugin = require('terser-webpack-plugin');
 const VueLoaderPlugin = require('vue-loader/lib/plugin');
 const {statSync} = require('fs');