Skip to content

Commit 62a1310

Browse files
lunnylunny
authored
Revert "Change --font-weight-bold to --font-weight-semibold and 600 value, introduce new font weight variables (#24827)"
This reverts commit 19993d8.
1 parent da461b5 commit 62a1310

26 files changed

+78
-82
lines changed

‎.stylelintrc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ rules:
9696
property-no-vendor-prefix: null
9797
rule-empty-line-before: null
9898
rule-selector-property-disallowed-list: null
99-
scale-unlimited/declaration-strict-value: [[color, background-color, border-color, font-weight], {ignoreValues: /^(inherit|transparent|unset|initial|currentcolor|none)$/, ignoreFunctions: false}]
99+
scale-unlimited/declaration-strict-value: [[color, background-color, border-color], {ignoreValues: /^(inherit|transparent|unset|initial|currentcolor|none)$/, ignoreFunctions: false}]
100100
selector-attribute-name-disallowed-list: null
101101
selector-attribute-operator-allowed-list: null
102102
selector-attribute-operator-disallowed-list: null

‎templates/repo/diff/box.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
{{svg "octicon-chevron-down" 18}}
9898
{{end}}
9999
</button>
100-
<div class="gt-font-semibold gt-df gt-ac gt-mono">
100+
<div class="gt-bold gt-df gt-ac gt-mono">
101101
{{if $file.IsBin}}
102102
<span class="gt-ml-1 gt-mr-3">
103103
{{$.locale.Tr "repo.diff.bin"}}

‎templates/repo/diff/comments.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<div class="ui top attached header comment-header gt-df gt-ac gt-sb">
1212
<div class="comment-header-left gt-df gt-ac">
1313
{{if .OriginalAuthor}}
14-
<span class="text black gt-font-semibold gt-mr-2">
14+
<span class="text black gt-bold gt-mr-2">
1515
{{svg (MigrationIcon $.root.Repository.GetOriginalURLHostname)}}
1616
{{.OriginalAuthor}}
1717
</span>

‎templates/repo/issue/view_content.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<div class="ui top attached header comment-header gt-df gt-ac gt-sb" role="heading" aria-level="3">
2424
<div class="comment-header-left gt-df gt-ac">
2525
{{if .Issue.OriginalAuthor}}
26-
<span class="text black gt-font-semibold">
26+
<span class="text black gt-bold">
2727
{{svg (MigrationIcon .Repository.GetOriginalURLHostname)}}
2828
{{.Issue.OriginalAuthor}}
2929
</span>

‎templates/repo/issue/view_content/comments.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<div class="ui top attached header comment-header gt-df gt-ac gt-sb" role="heading" aria-level="3">
2828
<div class="comment-header-left gt-df gt-ac">
2929
{{if .OriginalAuthor}}
30-
<span class="text black gt-font-semibold gt-mr-2">
30+
<span class="text black gt-bold gt-mr-2">
3131
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
3232
{{.OriginalAuthor}}
3333
</span>
@@ -420,7 +420,7 @@
420420
{{end}}
421421
<span class="text grey muted-links">
422422
{{if .OriginalAuthor}}
423-
<span class="text black gt-font-semibold">
423+
<span class="text black gt-bold">
424424
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
425425
{{.OriginalAuthor}}
426426
</span>
@@ -548,7 +548,7 @@
548548
{{end}}
549549
<span class="text grey muted-links">
550550
{{if .OriginalAuthor}}
551-
<span class="text black gt-font-semibold">
551+
<span class="text black gt-bold">
552552
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
553553
{{.OriginalAuthor}}
554554
</span>

‎templates/repo/sub_menu.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
{{range .LanguageStats}}
2929
<div class="item gt-df gt-ac gt-jc">
3030
<i class="color-icon gt-mr-3" style="background-color: {{.Color}}"></i>
31-
<span class="gt-font-semibold gt-mr-3">
31+
<span class="gt-bold gt-mr-3">
3232
{{if eq .Language "other"}}
3333
{{$.locale.Tr "repo.language_other"}}
3434
{{else}}

‎templates/shared/user/authorlink.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<a class="author text black gt-font-semibold muted"{{if gt .ID 0}} href="{{.HomeLink}}"{{end}}>{{.GetDisplayName}}</a>
1+
<a class="author text black gt-bold muted"{{if gt .ID 0}} href="{{.HomeLink}}"{{end}}>{{.GetDisplayName}}</a>

‎templates/user/settings/account.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
<div class="ui red message">
138138
<p class="text left">{{svg "octicon-alert"}} {{.locale.Tr "settings.delete_prompt" | Str2html}}</p>
139139
{{if .UserDeleteWithComments}}
140-
<p class="text left gt-font-semibold">{{.locale.Tr "settings.delete_with_all_comments" .UserDeleteWithCommentsMaxTime | Str2html}}</p>
140+
<p class="text left" style="font-weight: bold;">{{.locale.Tr "settings.delete_with_all_comments" .UserDeleteWithCommentsMaxTime | Str2html}}</p>
141141
{{end}}
142142
</div>
143143
<form class="ui form ignore-dirty" id="delete-form" action="{{AppSubUrl}}/user/settings/account/delete" method="post">

‎web_src/css/admin.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
}
3333

3434
.admin dl.admin-dl-horizontal dt {
35-
font-weight: var(--font-weight-semibold);
35+
font-weight: var(--font-weight-bold);
3636
width: 220px;
3737
margin-right: 5px;
3838
overflow: hidden;

‎web_src/css/base.css

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
--fonts-proportional: -apple-system, "Segoe UI", system-ui, Roboto, "Helvetica Neue", Arial;
44
--fonts-monospace: ui-monospace, SFMono-Regular, "SF Mono", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace, var(--fonts-emoji);
55
--fonts-emoji: "Apple Color Emoji", "Segoe UI Emoji", "Noto Color Emoji", "Twemoji Mozilla";
6-
/* font weights - use between 400 and 600 for general purposes */
7-
--font-weight-light: 300;
8-
--font-weight-normal: 400;
9-
--font-weight-medium: 500;
10-
--font-weight-semibold: 600;
6+
/* "font-weight: bold" starts from 700, some fonts do not provide "bolding" for weight 600. */
7+
/* But some users consider "700" is too heavy, so use 601, which is when Segoe UI on Linux */
8+
/* starts bolding. */
9+
--font-weight-bold: 601;
1110
/* backgrounds */
1211
--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>');
1312
--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>');
@@ -220,7 +219,7 @@ h3,
220219
h4,
221220
h5,
222221
h6 {
223-
font-weight: var(--font-weight-semibold);
222+
font-weight: var(--font-weight-bold);
224223
}
225224

226225
body {
@@ -893,7 +892,7 @@ a.label,
893892
.ui.dropdown .menu .active.item {
894893
color: var(--color-text);
895894
background: var(--color-active);
896-
font-weight: var(--font-weight-normal);
895+
font-weight: normal;
897896
}
898897

899898
/* fix misaligned images in webhook dropdown */
@@ -1438,7 +1437,7 @@ img.ui.avatar,
14381437
}
14391438

14401439
.ui.form .ui.button {
1441-
font-weight: var(--font-weight-normal);
1440+
font-weight: normal;
14421441
}
14431442

14441443
.ui.floating.label {
@@ -1496,7 +1495,7 @@ img.ui.avatar,
14961495
}
14971496

14981497
.ui .text.normal {
1499-
font-weight: var(--font-weight-normal);
1498+
font-weight: normal;
15001499
}
15011500

15021501
.ui .text.italic {
@@ -1511,7 +1510,7 @@ img.ui.avatar,
15111510
}
15121511

15131512
.ui .text.thin {
1514-
font-weight: var(--font-weight-normal);
1513+
font-weight: normal;
15151514
}
15161515

15171516
.ui .text.middle {
@@ -1548,7 +1547,7 @@ img.ui.avatar,
15481547
}
15491548

15501549
.ui .normal.header {
1551-
font-weight: var(--font-weight-normal);
1550+
font-weight: normal;
15521551
}
15531552

15541553
.ui .form .autofill-dummy {
@@ -1567,7 +1566,7 @@ img.ui.avatar,
15671566
font-family: var(--fonts-monospace);
15681567
font-size: 13px;
15691568
padding: 6px 10px 4px;
1570-
font-weight: var(--font-weight-normal);
1569+
font-weight: normal;
15711570
margin: 0 6px;
15721571
}
15731572

@@ -1594,7 +1593,7 @@ img.ui.avatar,
15941593

15951594
.ui.inline.delete-button {
15961595
padding: 8px 15px;
1597-
font-weight: var(--font-weight-normal);
1596+
font-weight: normal;
15981597
}
15991598

16001599
.ui .background.red {
@@ -1738,7 +1737,7 @@ img.ui.avatar,
17381737
}
17391738

17401739
.scrolling.menu .item.selected {
1741-
font-weight: var(--font-weight-semibold) !important;
1740+
font-weight: var(--font-weight-bold) !important;
17421741
}
17431742

17441743
.ui.dropdown .scrolling.menu {
@@ -2488,7 +2487,7 @@ a.ui.basic.label:hover {
24882487

24892488
.ui.attached.header .right .button {
24902489
padding: 8px 10px;
2491-
font-weight: var(--font-weight-normal);
2490+
font-weight: normal;
24922491
}
24932492

24942493
/* reduce height of buttons with dropdown icon */
@@ -2536,7 +2535,7 @@ a.ui.basic.label:hover {
25362535
padding: 2.75px;
25372536
border-radius: 1em;
25382537
font-size: 11px;
2539-
font-weight: var(--font-weight-semibold);
2538+
font-weight: 700;
25402539
line-height: .67em;
25412540
}
25422541

@@ -2616,7 +2615,7 @@ table th[data-sortt-desc] .svg {
26162615
font-size: 1.25em;
26172616
line-height: 1;
26182617
font-style: normal !important;
2619-
font-weight: var(--font-weight-normal) !important;
2618+
font-weight: normal !important;
26202619
vertical-align: -0.075em;
26212620
}
26222621

@@ -2723,7 +2722,7 @@ table th[data-sortt-desc] .svg {
27232722
.ellipsis-button {
27242723
padding: 0 5px 8px !important;
27252724
display: inline-block !important;
2726-
font-weight: var(--font-weight-semibold) !important;
2725+
font-weight: var(--font-weight-bold) !important;
27272726
line-height: 6px !important;
27282727
vertical-align: middle !important;
27292728
}

‎web_src/css/chroma/base.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
/* GenericStrong */
4343
.chroma .gs {
44-
font-weight: var(--font-weight-semibold);
44+
font-weight: var(--font-weight-bold);
4545
}
4646

4747
/* GenericUnderline */

‎web_src/css/editor/combomarkdowneditor.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ text-expander .suggestions li {
9191
align-items: center;
9292
cursor: pointer;
9393
padding: 4px 8px;
94-
font-weight: var(--font-weight-medium);
94+
font-weight: 500;
9595
}
9696

9797
text-expander .suggestions li + li {
@@ -115,7 +115,7 @@ text-expander .suggestions li:hover {
115115
}
116116

117117
text-expander .suggestions .fullname {
118-
font-weight: var(--font-weight-normal);
118+
font-weight: normal;
119119
margin-left: 4px;
120120
color: var(--color-text-light-1);
121121
}

‎web_src/css/features/imagediff.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
}
2727

2828
.image-diff-container .diff-side-by-side .side .side-header {
29-
font-weight: var(--font-weight-semibold);
29+
font-weight: var(--font-weight-bold);
3030
}
3131

3232
.image-diff-container .diff-swipe {

‎web_src/css/features/tribute.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
}
1616

1717
.tribute-container li span.fullname {
18-
font-weight: var(--font-weight-normal);
18+
font-weight: normal;
1919
font-size: 0.8rem;
2020
margin-left: 3px;
2121
}

0 commit comments

Comments
 (0)