From 5f82011b7cfbefa17a74b1630108f8a400c3945e Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 26 Apr 2023 07:51:54 +0800 Subject: [PATCH] Add --font-weight-bold and set previous bold to 601 (#24307) (#24331) Backport #24307 Fix #24305 According to MDN, "bold" starts from 700, some fonts do not provide "bolding" for weight 600 Manually backport, no CSS conflict. --- web_src/css/admin.css | 2 +- web_src/css/base.css | 10 +++++++--- web_src/css/chroma/base.css | 2 +- web_src/css/features/imagediff.css | 2 +- web_src/css/helpers.css | 2 +- web_src/css/install.css | 2 +- web_src/css/markup/content.css | 6 +++--- web_src/css/repository.css | 2 +- web_src/css/shared/issuelist.css | 2 +- web_src/css/user.css | 2 +- 10 files changed, 18 insertions(+), 14 deletions(-) diff --git a/web_src/css/admin.css b/web_src/css/admin.css index 00ed675e2d..a07a63b11e 100644 --- a/web_src/css/admin.css +++ b/web_src/css/admin.css @@ -59,7 +59,7 @@ } .admin dl.admin-dl-horizontal dt { - font-weight: 600; + font-weight: var(--font-weight-bold); float: left; width: 285px; clear: left; diff --git a/web_src/css/base.css b/web_src/css/base.css index 1f674df9a5..d1b322d527 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -3,6 +3,10 @@ --fonts-proportional: -apple-system, "Segoe UI", system-ui, "Roboto", "Helvetica Neue", "Arial"; --fonts-monospace: "SFMono-Regular", "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-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,'); @@ -211,7 +215,7 @@ h3, h4, h5, h6 { - font-weight: 600; + font-weight: var(--font-weight-bold); } body { @@ -1792,7 +1796,7 @@ img.ui.avatar, } .scrolling.menu .item.selected { - font-weight: 600 !important; + font-weight: var(--font-weight-bold) !important; } .ui.dropdown .scrolling.menu { @@ -2787,7 +2791,7 @@ table th[data-sortt-desc] .svg { .ellipsis-button { padding: 0 5px 8px !important; display: inline-block !important; - font-weight: 600 !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 bfd49db7a4..f1db1993fe 100644 --- a/web_src/css/chroma/base.css +++ b/web_src/css/chroma/base.css @@ -41,7 +41,7 @@ /* GenericStrong */ .chroma .gs { - font-weight: 600; + font-weight: var(--font-weight-bold); } /* GenericUnderline */ diff --git a/web_src/css/features/imagediff.css b/web_src/css/features/imagediff.css index f796bc19ae..244ec5a96f 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: bold; + font-weight: var(--font-weight-bold); } .image-diff-container .diff-swipe { diff --git a/web_src/css/helpers.css b/web_src/css/helpers.css index 1c02de2d7a..4be20d640c 100644 --- a/web_src/css/helpers.css +++ b/web_src/css/helpers.css @@ -29,7 +29,7 @@ font-size: .9em !important; /* compensate for monospace fonts being usually slightly larger */ } -.gt-bold { font-weight: 600 !important; } +.gt-bold { font-weight: var(--font-weight-bold) !important; } .gt-word-break { word-wrap: break-word !important; diff --git a/web_src/css/install.css b/web_src/css/install.css index b936ba66fd..d99805b80f 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: bold; + 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 96ef5bde12..5246ed5eeb 100644 --- a/web_src/css/markup/content.css +++ b/web_src/css/markup/content.css @@ -78,7 +78,7 @@ .markup h6 { margin-top: 24px; margin-bottom: 16px; - font-weight: 600; + font-weight: var(--font-weight-bold); line-height: 1.25; } @@ -256,7 +256,7 @@ margin-top: 16px; font-size: 1em; font-style: italic; - font-weight: 600; + font-weight: var(--font-weight-bold); } .markup dl dd { @@ -288,7 +288,7 @@ } .markup table th { - font-weight: 600; + font-weight: var(--font-weight-bold); } .markup table th, diff --git a/web_src/css/repository.css b/web_src/css/repository.css index 0ac254b371..81b69c07bb 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -1566,7 +1566,7 @@ } .repository .data-table th { - font-weight: 600; + font-weight: var(--font-weight-bold); background: var(--color-box-header); border-top: 0; } diff --git a/web_src/css/shared/issuelist.css b/web_src/css/shared/issuelist.css index 6e2cc737e7..4c7b912fb0 100644 --- a/web_src/css/shared/issuelist.css +++ b/web_src/css/shared/issuelist.css @@ -37,7 +37,7 @@ color: var(--color-text); font-size: 16px; min-width: 0; - font-weight: 600; + 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 26d5da476d..b437513f58 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: 600; + font-weight: var(--font-weight-bold); font-size: 1.3rem; margin-top: -0.2rem; line-height: 1.3rem;