Skip to content

Commit 64e0672

Browse files
silverwindsilverwind
authored
Fix @font-face overrides (#24855)
Fixes: #24850 Not sure how to do it for asian fonts only, so let's revert to previous value for now. ### Before <img width="414" alt="Screenshot 2023-05-22 at 10 34 10" src="https://github.com/go-gitea/gitea/assets/115237/749f1556-a5cf-48fe-8b10-8dc447221657"> ### After <img width="416" alt="Screenshot 2023-05-22 at 10 34 04" src="https://github.com/go-gitea/gitea/assets/115237/a0a315bb-d95f-4d03-863e-0534f665ca71">
1 parent 979f080 commit 64e0672

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

‎.stylelintrc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ignoreFiles:
55
- "**/*.go"
66

77
overrides:
8-
- files: ["**/chroma/*", "**/codemirror/*", "**/standalone/*", "**/console.css"]
8+
- files: ["**/chroma/*", "**/codemirror/*", "**/standalone/*", "**/console.css", "font_i18n.css"]
99
rules:
1010
scale-unlimited/declaration-strict-value: null
1111
- files: ["**/chroma/*", "**/codemirror/*"]

‎web_src/css/font_i18n.css

+20-20
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
local("SourceHanSans-Light"), local("Yu Gothic Regular"),
5252
local("YuGothic Regular"), local("Droid Sans Japanese"), local("Meiryo"),
5353
local("MS PGothic");
54-
font-weight: var(--font-weight-light);
54+
font-weight: 300;
5555
unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF,
5656
U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????;
5757
}
@@ -66,7 +66,7 @@
6666
local("SourceHanSans-Regular"), local("Yu Gothic Medium"),
6767
local("YuGothic Medium"), local("Droid Sans Japanese"), local("Meiryo"),
6868
local("MS PGothic");
69-
font-weight: var(--font-weight-normal);
69+
font-weight: 400;
7070
unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF,
7171
U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????;
7272
}
@@ -81,7 +81,7 @@
8181
local("SourceHanSans-Medium"), local("Yu Gothic Medium"),
8282
local("YuGothic Medium"), local("Droid Sans Japanese"), local("Meiryo"),
8383
local("MS PGothic");
84-
font-weight: var(--font-weight-medium);
84+
font-weight: 500;
8585
unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF,
8686
U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????;
8787
}
@@ -95,7 +95,7 @@
9595
local("NotoSansCJKJP-Bold"), local("Source Han Sans Bold"),
9696
local("SourceHanSans-Bold"), local("Yu Gothic Bold"), local("YuGothic Bold"),
9797
local("Droid Sans Japanese"), local("Meiryo Bold"), local("MS PGothic");
98-
font-weight: var(--font-weight-semibold);
98+
font-weight: 600;
9999
unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF,
100100
U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????;
101101
}
@@ -124,7 +124,7 @@
124124
local("NotoSansCJKSC-Light"), local("HiraginoSansGB-W3"),
125125
local("Hiragino Sans GB W3"), local("Microsoft YaHei Light"),
126126
local("Heiti SC Light"), local("SimHei");
127-
font-weight: var(--font-weight-light);
127+
font-weight: 300;
128128
unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF,
129129
U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????;
130130
}
@@ -137,7 +137,7 @@
137137
local("NotoSansCJKSC-Regular"), local("HiraginoSansGB-W3"),
138138
local("Hiragino Sans GB W3"), local("Microsoft YaHei"),
139139
local("Heiti SC Light"), local("SimHei");
140-
font-weight: var(--font-weight-normal);
140+
font-weight: 400;
141141
unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF,
142142
U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????;
143143
}
@@ -150,7 +150,7 @@
150150
local("NotoSansCJKSC-Medium"), local("HiraginoSansGB-W3"),
151151
local("Hiragino Sans GB W3"), local("Microsoft YaHei"),
152152
local("Heiti SC Light"), local("SimHei");
153-
font-weight: var(--font-weight-medium);
153+
font-weight: 500;
154154
unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF,
155155
U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????;
156156
}
@@ -163,7 +163,7 @@
163163
local("NotoSansCJKSC-Bold"), local("HiraginoSansGB-W6"),
164164
local("Hiragino Sans GB W6"), local("Microsoft YaHei Bold"),
165165
local("Heiti SC Medium"), local("SimHei");
166-
font-weight: var(--font-weight-semibold);
166+
font-weight: 600;
167167
unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF,
168168
U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????;
169169
}
@@ -192,7 +192,7 @@
192192
local("NotoSansCJKTC-Light"), local("HiraginoSansTC-W3"),
193193
local("Hiragino Sans TC W3"), local("Microsoft JhengHei Light"),
194194
local("Heiti TC Light"), local("PMingLiU");
195-
font-weight: var(--font-weight-light);
195+
font-weight: 300;
196196
unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF,
197197
U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????;
198198
}
@@ -205,7 +205,7 @@
205205
local("NotoSansCJKTC-Regular"), local("HiraginoSansTC-W3"),
206206
local("Hiragino Sans TC W3"), local("Microsoft JhengHei"),
207207
local("Heiti TC Light"), local("PMingLiU");
208-
font-weight: var(--font-weight-normal);
208+
font-weight: 400;
209209
unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF,
210210
U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????;
211211
}
@@ -218,7 +218,7 @@
218218
local("NotoSansCJKTC-Medium"), local("HiraginoSansTC-W3"),
219219
local("Hiragino Sans TC W3"), local("Microsoft JhengHei"),
220220
local("Heiti TC Light"), local("PMingLiU");
221-
font-weight: var(--font-weight-medium);
221+
font-weight: 500;
222222
unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF,
223223
U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????;
224224
}
@@ -231,7 +231,7 @@
231231
local("NotoSansCJKTC-Bold"), local("HiraginoSansTC-W6"),
232232
local("Hiragino Sans TC W6"), local("Microsoft JhengHei Bold"),
233233
local("Heiti TC Medium"), local("PMingLiU");
234-
font-weight: var(--font-weight-semibold);
234+
font-weight: 600;
235235
unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF,
236236
U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????;
237237
}
@@ -262,7 +262,7 @@
262262
local("NotoSansCJKTC-Light"), local("HiraginoSansTC-W3"),
263263
local("Hiragino Sans TC W3"), local("Microsoft JhengHei Light"),
264264
local("Heiti TC Light"), local("PMingLiU_HKSCS"), local("PMingLiU");
265-
font-weight: var(--font-weight-light);
265+
font-weight: 300;
266266
unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF,
267267
U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????;
268268
}
@@ -277,7 +277,7 @@
277277
local("NotoSansCJKTC-Regular"), local("HiraginoSansTC-W3"),
278278
local("Hiragino Sans TC W3"), local("Microsoft JhengHei"),
279279
local("Heiti TC Light"), local("PMingLiU_HKSCS"), local("PMingLiU");
280-
font-weight: var(--font-weight-normal);
280+
font-weight: 400;
281281
unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF,
282282
U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????;
283283
}
@@ -292,7 +292,7 @@
292292
local("NotoSansCJKTC-Medium"), local("HiraginoSansTC-W3"),
293293
local("Hiragino Sans TC W3"), local("Microsoft JhengHei"),
294294
local("Heiti TC Light"), local("PMingLiU_HKSCS"), local("PMingLiU");
295-
font-weight: var(--font-weight-medium);
295+
font-weight: 500;
296296
unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF,
297297
U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????;
298298
}
@@ -307,7 +307,7 @@
307307
local("NotoSansCJKTC-Bold"), local("HiraginoSansTC-W6"),
308308
local("Hiragino Sans TC W6"), local("Microsoft JhengHei Bold"),
309309
local("Heiti TC Medium"), local("PMingLiU_HKSCS"), local("PMingLiU");
310-
font-weight: var(--font-weight-semibold);
310+
font-weight: 600;
311311
unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF,
312312
U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????;
313313
}
@@ -335,7 +335,7 @@
335335
local("SourceHanSansK-Light"), local("Noto Sans CJK KR Light"),
336336
local("NotoSansCJKKR-Light"), local("NanumBarunGothic Light"),
337337
local("Malgun Gothic Semilight"), local("Nanum Gothic"), local("Dotum");
338-
font-weight: var(--font-weight-light);
338+
font-weight: 300;
339339
unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF,
340340
U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????;
341341
}
@@ -347,7 +347,7 @@
347347
local("SourceHanSansK-Regular"), local("Noto Sans CJK KR Regular"),
348348
local("NotoSansCJKKR-Regular"), local("NanumBarunGothic"),
349349
local("Malgun Gothic"), local("Nanum Gothic"), local("Dotum");
350-
font-weight: var(--font-weight-normal);
350+
font-weight: 400;
351351
unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF,
352352
U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????;
353353
}
@@ -359,7 +359,7 @@
359359
local("SourceHanSansK-Medium"), local("Noto Sans CJK KR Medium"),
360360
local("NotoSansCJKKR-Medium"), local("NanumBarunGothic"),
361361
local("Malgun Gothic"), local("Nanum Gothic"), local("Dotum");
362-
font-weight: var(--font-weight-medium);
362+
font-weight: 500;
363363
unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF,
364364
U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????;
365365
}
@@ -371,7 +371,7 @@
371371
local("SourceHanSansK-Bold"), local("Noto Sans CJK KR Bold"),
372372
local("NotoSansCJKKR-Bold"), local("NanumBarunGothic Bold"),
373373
local("Malgun Gothic Bold"), local("Nanum Gothic Bold"), local("Dotum");
374-
font-weight: var(--font-weight-semibold);
374+
font-weight: 600;
375375
unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF,
376376
U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????;
377377
}

0 commit comments

Comments
 (0)