From b05d1a00adb3ce3fd0bbeb11aea598c378ad6eab Mon Sep 17 00:00:00 2001 From: zjj Date: Mon, 22 May 2023 12:56:46 +0800 Subject: [PATCH] Revert "Change `--font-weight-bold` to `--font-weight-semibold` and 600 value, introduce new font weight variables (#24827)" This reverts commit 19993d8814e227ac0a52b73d36fdb03fbb143c3f. --- .stylelintrc.yaml | 2 +- templates/repo/diff/box.tmpl | 2 +- templates/repo/diff/comments.tmpl | 2 +- templates/repo/issue/view_content.tmpl | 2 +- .../repo/issue/view_content/comments.tmpl | 6 +-- templates/repo/sub_menu.tmpl | 2 +- templates/shared/user/authorlink.tmpl | 2 +- templates/user/settings/account.tmpl | 2 +- web_src/css/admin.css | 2 +- web_src/css/base.css | 35 ++++++++-------- web_src/css/chroma/base.css | 2 +- web_src/css/editor/combomarkdowneditor.css | 4 +- web_src/css/features/imagediff.css | 2 +- web_src/css/features/tribute.css | 2 +- web_src/css/font_i18n.css | 40 +++++++++---------- web_src/css/helpers.css | 7 +--- web_src/css/install.css | 2 +- web_src/css/markup/content.css | 6 +-- web_src/css/modules/card.css | 2 +- web_src/css/modules/comment.css | 2 +- web_src/css/repo.css | 22 +++++----- web_src/css/repo/release-tag.css | 4 +- web_src/css/shared/issuelist.css | 2 +- web_src/css/user.css | 2 +- web_src/js/components/DashboardRepoList.vue | 2 +- web_src/js/components/DiffFileList.vue | 2 +- 26 files changed, 78 insertions(+), 82 deletions(-) diff --git a/.stylelintrc.yaml b/.stylelintrc.yaml index 7dad9d0594bc0..c6289fe26125f 100644 --- a/.stylelintrc.yaml +++ b/.stylelintrc.yaml @@ -96,7 +96,7 @@ rules: property-no-vendor-prefix: null rule-empty-line-before: null rule-selector-property-disallowed-list: null - scale-unlimited/declaration-strict-value: [[color, background-color, border-color, font-weight], {ignoreValues: /^(inherit|transparent|unset|initial|currentcolor|none)$/, ignoreFunctions: false}] + scale-unlimited/declaration-strict-value: [[color, background-color, border-color], {ignoreValues: /^(inherit|transparent|unset|initial|currentcolor|none)$/, ignoreFunctions: false}] selector-attribute-name-disallowed-list: null selector-attribute-operator-allowed-list: null selector-attribute-operator-disallowed-list: null diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 292a7dd2bd33e..740b39dbd5f89 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -97,7 +97,7 @@ {{svg "octicon-chevron-down" 18}} {{end}} -
+
{{if $file.IsBin}} {{$.locale.Tr "repo.diff.bin"}} diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl index 50f0c903aefe9..f30126153307a 100644 --- a/templates/repo/diff/comments.tmpl +++ b/templates/repo/diff/comments.tmpl @@ -11,7 +11,7 @@
{{if .OriginalAuthor}} - + {{svg (MigrationIcon $.root.Repository.GetOriginalURLHostname)}} {{.OriginalAuthor}} diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 3c60eca671dc9..c54b29dcd648c 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -23,7 +23,7 @@
{{if .Issue.OriginalAuthor}} - + {{svg (MigrationIcon .Repository.GetOriginalURLHostname)}} {{.Issue.OriginalAuthor}} diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index b65ebc68a24f5..32ce8bad94762 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -27,7 +27,7 @@
{{if .OriginalAuthor}} - + {{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}} {{.OriginalAuthor}} @@ -420,7 +420,7 @@ {{end}} {{if .OriginalAuthor}} - + {{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}} {{.OriginalAuthor}} @@ -548,7 +548,7 @@ {{end}} {{if .OriginalAuthor}} - + {{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}} {{.OriginalAuthor}} diff --git a/templates/repo/sub_menu.tmpl b/templates/repo/sub_menu.tmpl index bfe5a20b164df..def6beccb9d95 100644 --- a/templates/repo/sub_menu.tmpl +++ b/templates/repo/sub_menu.tmpl @@ -28,7 +28,7 @@ {{range .LanguageStats}}
- + {{if eq .Language "other"}} {{$.locale.Tr "repo.language_other"}} {{else}} diff --git a/templates/shared/user/authorlink.tmpl b/templates/shared/user/authorlink.tmpl index 71cbb8676e68d..4e45fdfd0f2f0 100644 --- a/templates/shared/user/authorlink.tmpl +++ b/templates/shared/user/authorlink.tmpl @@ -1 +1 @@ -{{.GetDisplayName}} +{{.GetDisplayName}} diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl index 97c35fc7dc965..451b0ca0e008a 100644 --- a/templates/user/settings/account.tmpl +++ b/templates/user/settings/account.tmpl @@ -137,7 +137,7 @@

{{svg "octicon-alert"}} {{.locale.Tr "settings.delete_prompt" | Str2html}}

{{if .UserDeleteWithComments}} -

{{.locale.Tr "settings.delete_with_all_comments" .UserDeleteWithCommentsMaxTime | Str2html}}

+

{{.locale.Tr "settings.delete_with_all_comments" .UserDeleteWithCommentsMaxTime | Str2html}}

{{end}}
diff --git a/web_src/css/admin.css b/web_src/css/admin.css index 617462542a33f..e7dc2ec533745 100644 --- a/web_src/css/admin.css +++ b/web_src/css/admin.css @@ -32,7 +32,7 @@ } .admin dl.admin-dl-horizontal dt { - font-weight: var(--font-weight-semibold); + font-weight: var(--font-weight-bold); width: 220px; margin-right: 5px; overflow: hidden; diff --git a/web_src/css/base.css b/web_src/css/base.css index eb12ffef7a6c2..6c6c5381ad73e 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -3,11 +3,10 @@ --fonts-proportional: -apple-system, "Segoe UI", system-ui, Roboto, "Helvetica Neue", Arial; --fonts-monospace: ui-monospace, SFMono-Regular, "SF Mono", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace, var(--fonts-emoji); --fonts-emoji: "Apple Color Emoji", "Segoe UI Emoji", "Noto Color Emoji", "Twemoji Mozilla"; - /* font weights - use between 400 and 600 for general purposes */ - --font-weight-light: 300; - --font-weight-normal: 400; - --font-weight-medium: 500; - --font-weight-semibold: 600; + /* "font-weight: bold" starts from 700, some fonts do not provide "bolding" for weight 600. */ + /* But some users consider "700" is too heavy, so use 601, which is when Segoe UI on Linux */ + /* starts bolding. */ + --font-weight-bold: 601; /* backgrounds */ --checkbox-mask-checked: url('data:image/svg+xml;utf8,'); --checkbox-mask-indeterminate: url('data:image/svg+xml;utf8,'); @@ -219,7 +218,7 @@ h3, h4, h5, h6 { - font-weight: var(--font-weight-semibold); + font-weight: var(--font-weight-bold); } body { @@ -892,7 +891,7 @@ a.label, .ui.dropdown .menu .active.item { color: var(--color-text); background: var(--color-active); - font-weight: var(--font-weight-normal); + font-weight: normal; } /* fix misaligned images in webhook dropdown */ @@ -1437,7 +1436,7 @@ img.ui.avatar, } .ui.form .ui.button { - font-weight: var(--font-weight-normal); + font-weight: normal; } .ui.floating.label { @@ -1495,7 +1494,7 @@ img.ui.avatar, } .ui .text.normal { - font-weight: var(--font-weight-normal); + font-weight: normal; } .ui .text.italic { @@ -1510,7 +1509,7 @@ img.ui.avatar, } .ui .text.thin { - font-weight: var(--font-weight-normal); + font-weight: normal; } .ui .text.middle { @@ -1547,7 +1546,7 @@ img.ui.avatar, } .ui .normal.header { - font-weight: var(--font-weight-normal); + font-weight: normal; } .ui .form .autofill-dummy { @@ -1566,7 +1565,7 @@ img.ui.avatar, font-family: var(--fonts-monospace); font-size: 13px; padding: 6px 10px 4px; - font-weight: var(--font-weight-normal); + font-weight: normal; margin: 0 6px; } @@ -1593,7 +1592,7 @@ img.ui.avatar, .ui.inline.delete-button { padding: 8px 15px; - font-weight: var(--font-weight-normal); + font-weight: normal; } .ui .background.red { @@ -1737,7 +1736,7 @@ img.ui.avatar, } .scrolling.menu .item.selected { - font-weight: var(--font-weight-semibold) !important; + font-weight: var(--font-weight-bold) !important; } .ui.dropdown .scrolling.menu { @@ -2487,7 +2486,7 @@ a.ui.basic.label:hover { .ui.attached.header .right .button { padding: 8px 10px; - font-weight: var(--font-weight-normal); + font-weight: normal; } /* reduce height of buttons with dropdown icon */ @@ -2535,7 +2534,7 @@ a.ui.basic.label:hover { padding: 2.75px; border-radius: 1em; font-size: 11px; - font-weight: var(--font-weight-semibold); + font-weight: 700; line-height: .67em; } @@ -2615,7 +2614,7 @@ table th[data-sortt-desc] .svg { font-size: 1.25em; line-height: 1; font-style: normal !important; - font-weight: var(--font-weight-normal) !important; + font-weight: normal !important; vertical-align: -0.075em; } @@ -2722,7 +2721,7 @@ table th[data-sortt-desc] .svg { .ellipsis-button { padding: 0 5px 8px !important; display: inline-block !important; - font-weight: var(--font-weight-semibold) !important; + font-weight: var(--font-weight-bold) !important; line-height: 6px !important; vertical-align: middle !important; } diff --git a/web_src/css/chroma/base.css b/web_src/css/chroma/base.css index 26d128775f0a2..f1db1993fefe4 100644 --- a/web_src/css/chroma/base.css +++ b/web_src/css/chroma/base.css @@ -41,7 +41,7 @@ /* GenericStrong */ .chroma .gs { - font-weight: var(--font-weight-semibold); + font-weight: var(--font-weight-bold); } /* GenericUnderline */ diff --git a/web_src/css/editor/combomarkdowneditor.css b/web_src/css/editor/combomarkdowneditor.css index cfdf074f8edf0..eb5c5d13b8c5f 100644 --- a/web_src/css/editor/combomarkdowneditor.css +++ b/web_src/css/editor/combomarkdowneditor.css @@ -91,7 +91,7 @@ text-expander .suggestions li { align-items: center; cursor: pointer; padding: 4px 8px; - font-weight: var(--font-weight-medium); + font-weight: 500; } text-expander .suggestions li + li { @@ -115,7 +115,7 @@ text-expander .suggestions li:hover { } text-expander .suggestions .fullname { - font-weight: var(--font-weight-normal); + font-weight: normal; margin-left: 4px; color: var(--color-text-light-1); } diff --git a/web_src/css/features/imagediff.css b/web_src/css/features/imagediff.css index 85d04575d968f..244ec5a96f53b 100644 --- a/web_src/css/features/imagediff.css +++ b/web_src/css/features/imagediff.css @@ -26,7 +26,7 @@ } .image-diff-container .diff-side-by-side .side .side-header { - font-weight: var(--font-weight-semibold); + font-weight: var(--font-weight-bold); } .image-diff-container .diff-swipe { diff --git a/web_src/css/features/tribute.css b/web_src/css/features/tribute.css index 76e3138b65e66..b7b0a255092c1 100644 --- a/web_src/css/features/tribute.css +++ b/web_src/css/features/tribute.css @@ -15,7 +15,7 @@ } .tribute-container li span.fullname { - font-weight: var(--font-weight-normal); + font-weight: normal; font-size: 0.8rem; margin-left: 3px; } diff --git a/web_src/css/font_i18n.css b/web_src/css/font_i18n.css index 187fa292c7609..e3de90653202f 100644 --- a/web_src/css/font_i18n.css +++ b/web_src/css/font_i18n.css @@ -51,7 +51,7 @@ local("SourceHanSans-Light"), local("Yu Gothic Regular"), local("YuGothic Regular"), local("Droid Sans Japanese"), local("Meiryo"), local("MS PGothic"); - font-weight: var(--font-weight-light); + font-weight: 300; unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; } @@ -66,7 +66,7 @@ local("SourceHanSans-Regular"), local("Yu Gothic Medium"), local("YuGothic Medium"), local("Droid Sans Japanese"), local("Meiryo"), local("MS PGothic"); - font-weight: var(--font-weight-normal); + font-weight: 400; unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; } @@ -81,7 +81,7 @@ local("SourceHanSans-Medium"), local("Yu Gothic Medium"), local("YuGothic Medium"), local("Droid Sans Japanese"), local("Meiryo"), local("MS PGothic"); - font-weight: var(--font-weight-medium); + font-weight: 500; unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; } @@ -95,7 +95,7 @@ local("NotoSansCJKJP-Bold"), local("Source Han Sans Bold"), local("SourceHanSans-Bold"), local("Yu Gothic Bold"), local("YuGothic Bold"), local("Droid Sans Japanese"), local("Meiryo Bold"), local("MS PGothic"); - font-weight: var(--font-weight-semibold); + font-weight: 700; unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; } @@ -124,7 +124,7 @@ local("NotoSansCJKSC-Light"), local("HiraginoSansGB-W3"), local("Hiragino Sans GB W3"), local("Microsoft YaHei Light"), local("Heiti SC Light"), local("SimHei"); - font-weight: var(--font-weight-light); + font-weight: 300; unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; } @@ -137,7 +137,7 @@ local("NotoSansCJKSC-Regular"), local("HiraginoSansGB-W3"), local("Hiragino Sans GB W3"), local("Microsoft YaHei"), local("Heiti SC Light"), local("SimHei"); - font-weight: var(--font-weight-normal); + font-weight: 400; unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; } @@ -150,7 +150,7 @@ local("NotoSansCJKSC-Medium"), local("HiraginoSansGB-W3"), local("Hiragino Sans GB W3"), local("Microsoft YaHei"), local("Heiti SC Light"), local("SimHei"); - font-weight: var(--font-weight-medium); + font-weight: 500; unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; } @@ -163,7 +163,7 @@ local("NotoSansCJKSC-Bold"), local("HiraginoSansGB-W6"), local("Hiragino Sans GB W6"), local("Microsoft YaHei Bold"), local("Heiti SC Medium"), local("SimHei"); - font-weight: var(--font-weight-semibold); + font-weight: 700; unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; } @@ -192,7 +192,7 @@ local("NotoSansCJKTC-Light"), local("HiraginoSansTC-W3"), local("Hiragino Sans TC W3"), local("Microsoft JhengHei Light"), local("Heiti TC Light"), local("PMingLiU"); - font-weight: var(--font-weight-light); + font-weight: 300; unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; } @@ -205,7 +205,7 @@ local("NotoSansCJKTC-Regular"), local("HiraginoSansTC-W3"), local("Hiragino Sans TC W3"), local("Microsoft JhengHei"), local("Heiti TC Light"), local("PMingLiU"); - font-weight: var(--font-weight-normal); + font-weight: 400; unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; } @@ -218,7 +218,7 @@ local("NotoSansCJKTC-Medium"), local("HiraginoSansTC-W3"), local("Hiragino Sans TC W3"), local("Microsoft JhengHei"), local("Heiti TC Light"), local("PMingLiU"); - font-weight: var(--font-weight-medium); + font-weight: 500; unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; } @@ -231,7 +231,7 @@ local("NotoSansCJKTC-Bold"), local("HiraginoSansTC-W6"), local("Hiragino Sans TC W6"), local("Microsoft JhengHei Bold"), local("Heiti TC Medium"), local("PMingLiU"); - font-weight: var(--font-weight-semibold); + font-weight: 700; unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; } @@ -262,7 +262,7 @@ local("NotoSansCJKTC-Light"), local("HiraginoSansTC-W3"), local("Hiragino Sans TC W3"), local("Microsoft JhengHei Light"), local("Heiti TC Light"), local("PMingLiU_HKSCS"), local("PMingLiU"); - font-weight: var(--font-weight-light); + font-weight: 300; unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; } @@ -277,7 +277,7 @@ local("NotoSansCJKTC-Regular"), local("HiraginoSansTC-W3"), local("Hiragino Sans TC W3"), local("Microsoft JhengHei"), local("Heiti TC Light"), local("PMingLiU_HKSCS"), local("PMingLiU"); - font-weight: var(--font-weight-normal); + font-weight: 400; unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; } @@ -292,7 +292,7 @@ local("NotoSansCJKTC-Medium"), local("HiraginoSansTC-W3"), local("Hiragino Sans TC W3"), local("Microsoft JhengHei"), local("Heiti TC Light"), local("PMingLiU_HKSCS"), local("PMingLiU"); - font-weight: var(--font-weight-medium); + font-weight: 500; unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; } @@ -307,7 +307,7 @@ local("NotoSansCJKTC-Bold"), local("HiraginoSansTC-W6"), local("Hiragino Sans TC W6"), local("Microsoft JhengHei Bold"), local("Heiti TC Medium"), local("PMingLiU_HKSCS"), local("PMingLiU"); - font-weight: var(--font-weight-semibold); + font-weight: 700; unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; } @@ -335,7 +335,7 @@ local("SourceHanSansK-Light"), local("Noto Sans CJK KR Light"), local("NotoSansCJKKR-Light"), local("NanumBarunGothic Light"), local("Malgun Gothic Semilight"), local("Nanum Gothic"), local("Dotum"); - font-weight: var(--font-weight-light); + font-weight: 300; unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; } @@ -347,7 +347,7 @@ local("SourceHanSansK-Regular"), local("Noto Sans CJK KR Regular"), local("NotoSansCJKKR-Regular"), local("NanumBarunGothic"), local("Malgun Gothic"), local("Nanum Gothic"), local("Dotum"); - font-weight: var(--font-weight-normal); + font-weight: 400; unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; } @@ -359,7 +359,7 @@ local("SourceHanSansK-Medium"), local("Noto Sans CJK KR Medium"), local("NotoSansCJKKR-Medium"), local("NanumBarunGothic"), local("Malgun Gothic"), local("Nanum Gothic"), local("Dotum"); - font-weight: var(--font-weight-medium); + font-weight: 500; unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; } @@ -371,7 +371,7 @@ local("SourceHanSansK-Bold"), local("Noto Sans CJK KR Bold"), local("NotoSansCJKKR-Bold"), local("NanumBarunGothic Bold"), local("Malgun Gothic Bold"), local("Nanum Gothic Bold"), local("Dotum"); - font-weight: var(--font-weight-semibold); + font-weight: 700; unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; } diff --git a/web_src/css/helpers.css b/web_src/css/helpers.css index a415670afea5f..d84fd4ba80c01 100644 --- a/web_src/css/helpers.css +++ b/web_src/css/helpers.css @@ -29,6 +29,8 @@ Gitea's private styles use `g-` prefix. font-size: .95em !important; /* compensate for monospace fonts being usually slightly larger */ } +.gt-bold { font-weight: var(--font-weight-bold) !important; } + .gt-word-break { word-wrap: break-word !important; word-break: break-word; /* compat: Safari */ @@ -84,11 +86,6 @@ Gitea's private styles use `g-` prefix. .gt-float-left { float: left !important; } .gt-float-right { float: right !important; } -.gt-font-light { font-weight: var(--font-weight-light) !important }; -.gt-font-normal { font-weight: var(--font-weight-normal) !important }; -.gt-font-medium { font-weight: var(--font-weight-medium) !important }; -.gt-font-semibold { font-weight: var(--font-weight-semibold) !important }; - .gt-rounded { border-radius: var(--border-radius) !important; } .gt-rounded-top { border-radius: var(--border-radius) var(--border-radius) 0 0 !important; } .gt-rounded-bottom { border-radius: 0 0 var(--border-radius) var(--border-radius) !important; } diff --git a/web_src/css/install.css b/web_src/css/install.css index a65a213fd5e2e..d99805b80f421 100644 --- a/web_src/css/install.css +++ b/web_src/css/install.css @@ -55,7 +55,7 @@ margin: 20px auto; color: var(--color-red); text-align: left; - font-weight: var(--font-weight-semibold); + font-weight: var(--font-weight-bold); } .page-content.install .ui .reinstall-confirm { diff --git a/web_src/css/markup/content.css b/web_src/css/markup/content.css index e300995b31fee..fb1e8ea6300e1 100644 --- a/web_src/css/markup/content.css +++ b/web_src/css/markup/content.css @@ -74,7 +74,7 @@ .markup h6 { margin-top: 24px; margin-bottom: 16px; - font-weight: var(--font-weight-semibold); + font-weight: var(--font-weight-bold); line-height: 1.25; } @@ -252,7 +252,7 @@ margin-top: 16px; font-size: 1em; font-style: italic; - font-weight: var(--font-weight-semibold); + font-weight: var(--font-weight-bold); } .markup dl dd { @@ -284,7 +284,7 @@ } .markup table th { - font-weight: var(--font-weight-semibold); + font-weight: var(--font-weight-bold); } .markup table th, diff --git a/web_src/css/modules/card.css b/web_src/css/modules/card.css index eba14ab334be3..c0f7e83037ca2 100644 --- a/web_src/css/modules/card.css +++ b/web_src/css/modules/card.css @@ -56,7 +56,7 @@ .ui.cards > .card > .content > .header:not(.ui), .ui.card > .content > .header:not(.ui) { - font-weight: var(--font-weight-medium); + font-weight: 500; font-size: 1.28571429em; margin-top: -.21425em; line-height: 1.28571429em; diff --git a/web_src/css/modules/comment.css b/web_src/css/modules/comment.css index ae50bce0ed258..5a90c0852f68f 100644 --- a/web_src/css/modules/comment.css +++ b/web_src/css/modules/comment.css @@ -61,7 +61,7 @@ .ui.comments .comment .author { font-size: 1em; - font-weight: var(--font-weight-medium); + font-weight: 500; } .ui.comments .comment a.author { diff --git a/web_src/css/repo.css b/web_src/css/repo.css index dbf9bf79bd561..ddcc258be971a 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -230,7 +230,7 @@ .repository.file.list #repo-files-table thead th { padding-top: 8px; padding-bottom: 5px; - font-weight: var(--font-weight-normal); + font-weight: normal; } .repository.file.list #repo-files-table thead .ui.avatar { @@ -627,7 +627,7 @@ align-items: center; flex: 1; width: 100%; - font-weight: var(--font-weight-normal); + font-weight: 300; font-size: 32px; line-height: 40px; margin: 0; @@ -1305,7 +1305,7 @@ } .repository.commits .header .search input { - font-weight: var(--font-weight-normal); + font-weight: normal; padding: 5px 10px; } @@ -1533,7 +1533,7 @@ } .repository .data-table th { - font-weight: var(--font-weight-semibold); + font-weight: var(--font-weight-bold); background: var(--color-box-header); border-top: 0; } @@ -1880,7 +1880,7 @@ } .repository.quickstart .guide .item small { - font-weight: var(--font-weight-normal); + font-weight: normal; } .repository.quickstart .guide .clone.button:first-child { @@ -1991,7 +1991,7 @@ } .repository.settings.branches .branch-protection .status-check-matched-mark { - font-weight: var(--font-weight-semibold); + font-weight: var(--font-weight-bold); font-style: italic; } @@ -2185,7 +2185,7 @@ border-radius: 0; margin: 0; font-size: 14px; - font-weight: var(--font-weight-normal); + font-weight: normal; border-color: var(--color-secondary) !important; background: var(--color-reaction-bg); } @@ -2347,7 +2347,7 @@ .user-cards .list .item .name { margin-top: 0; margin-bottom: 0; - font-weight: var(--font-weight-normal); + font-weight: normal; } .user-cards .list .item .meta { @@ -2465,7 +2465,7 @@ border: none !important; background: var(--color-box-header); border-bottom: 1px solid var(--color-secondary) !important; - font-weight: var(--font-weight-normal) !important; + font-weight: normal !important; padding: 0.5rem 1rem; margin: 0 !important; position: relative; @@ -2828,7 +2828,7 @@ tbody.commit-list { } #repo-topics .repo-topic { - font-weight: var(--font-weight-normal); + font-weight: normal; cursor: pointer; margin: 2px; } @@ -2933,7 +2933,7 @@ tbody.commit-list { } .resolved-placeholder { - font-weight: var(--font-weight-normal) !important; + font-weight: normal !important; border: 1px solid var(--color-secondary) !important; border-radius: var(--border-radius) !important; margin: 4px !important; diff --git a/web_src/css/repo/release-tag.css b/web_src/css/repo/release-tag.css index e786e5ff59538..700ac46c210a1 100644 --- a/web_src/css/repo/release-tag.css +++ b/web_src/css/repo/release-tag.css @@ -6,7 +6,7 @@ .repository.releases #release-list .release-list-title { font-size: 2rem; - font-weight: var(--font-weight-normal); + font-weight: normal; margin-top: -4px; margin-bottom: 0; } @@ -87,7 +87,7 @@ .repository.tags #tags-table .release-tag-name { font-size: 18px; - font-weight: var(--font-weight-normal); + font-weight: normal; } .repository.new.release .target { diff --git a/web_src/css/shared/issuelist.css b/web_src/css/shared/issuelist.css index 89e1135ce9875..db0d4cfbb9ad0 100644 --- a/web_src/css/shared/issuelist.css +++ b/web_src/css/shared/issuelist.css @@ -33,7 +33,7 @@ color: var(--color-text); font-size: 16px; min-width: 0; - font-weight: var(--font-weight-semibold); + font-weight: var(--font-weight-bold); } .issue.list > .item .issue-item-top-row a.index { diff --git a/web_src/css/user.css b/web_src/css/user.css index 252e595f3bf12..a7106599dfe7d 100644 --- a/web_src/css/user.css +++ b/web_src/css/user.css @@ -1,6 +1,6 @@ .user.profile .ui.card .header { display: block; - font-weight: var(--font-weight-semibold); + font-weight: var(--font-weight-bold); font-size: 1.3rem; margin-top: -0.2rem; line-height: 1.3rem; diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue index 0fd22ca9b69c3..a434eee436e7a 100644 --- a/web_src/js/components/DashboardRepoList.vue +++ b/web_src/js/components/DashboardRepoList.vue @@ -74,7 +74,7 @@
-
{{ repo.full_name }}
+
{{ repo.full_name }}
diff --git a/web_src/js/components/DiffFileList.vue b/web_src/js/components/DiffFileList.vue index 8ab76168921a2..780f5e6c28526 100644 --- a/web_src/js/components/DiffFileList.vue +++ b/web_src/js/components/DiffFileList.vue @@ -1,7 +1,7 @@