Skip to content

Commit

Permalink
Add --font-weight-bold and set previous bold to 601 (#24307) (#24331)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
wxiaoguang authored Apr 25, 2023
1 parent 1bbbeb2 commit 5f82011
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 14 deletions.
2 changes: 1 addition & 1 deletion web_src/css/admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 7 additions & 3 deletions web_src/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -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,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-1 -1 18 18" width="16" height="16"><path fill-rule="evenodd" d="M13.78 4.22a.75.75 0 010 1.06l-7.25 7.25a.75.75 0 01-1.06 0L2.22 9.28a.75.75 0 011.06-1.06L6 10.94l6.72-6.72a.75.75 0 011.06 0z"></path></svg>');
--checkbox-mask-indeterminate: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><path fill-rule="evenodd" d="M2 7.75A.75.75 0 012.75 7h10a.75.75 0 010 1.5h-10A.75.75 0 012 7.75z"></path></svg>');
Expand Down Expand Up @@ -211,7 +215,7 @@ h3,
h4,
h5,
h6 {
font-weight: 600;
font-weight: var(--font-weight-bold);
}

body {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion web_src/css/chroma/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

/* GenericStrong */
.chroma .gs {
font-weight: 600;
font-weight: var(--font-weight-bold);
}

/* GenericUnderline */
Expand Down
2 changes: 1 addition & 1 deletion web_src/css/features/imagediff.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion web_src/css/helpers.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion web_src/css/install.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions web_src/css/markup/content.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -288,7 +288,7 @@
}

.markup table th {
font-weight: 600;
font-weight: var(--font-weight-bold);
}

.markup table th,
Expand Down
2 changes: 1 addition & 1 deletion web_src/css/repository.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion web_src/css/shared/issuelist.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion web_src/css/user.css
Original file line number Diff line number Diff line change
@@ -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;
Expand Down

0 comments on commit 5f82011

Please sign in to comment.