Skip to content

Commit 72da884

Browse files
silverwindsilverwind
committed
Merge remote-tracking branch 'origin/main' into twgap
* origin/main: Dont show expansion for empty actions steps (go-gitea#29977) Remove fomantic header module (go-gitea#30033)
2 parents 4d704ae + 5bd0773 commit 72da884

File tree

8 files changed

+191
-835
lines changed

8 files changed

+191
-835
lines changed

‎templates/repo/diff/box.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@
110110
{{$isExpandable := or (gt $file.Addition 0) (gt $file.Deletion 0) $file.IsBin}}
111111
{{$isReviewFile := and $.IsSigned $.PageIsPullFiles (not $.IsArchived) $.IsShowingAllCommits}}
112112
<div class="diff-file-box diff-box file-content {{TabSizeClass $.Editorconfig $file.Name}} gt-mt-0" id="diff-{{$file.NameHash}}" data-old-filename="{{$file.OldName}}" data-new-filename="{{$file.Name}}" {{if or ($file.ShouldBeHidden) (not $isExpandable)}}data-folded="true"{{end}}>
113-
<h4 class="diff-file-header sticky-2nd-row ui top attached normal header tw-flex tw-items-center tw-justify-between tw-flex-wrap">
114-
<div class="diff-file-name tw-flex tw-items-center tw-gap-1 tw-flex-wrap">
113+
<h4 class="diff-file-header sticky-2nd-row ui top attached header tw-font-normal tw-flex tw-items-center tw-justify-between tw-flex-wrap">
114+
<div class="diff-file-name tw-flex tw-items-center tw-gap-2 tw-flex-wrap">
115115
<button class="fold-file btn interact-bg gt-p-2{{if not $isExpandable}} tw-invisible{{end}}">
116116
{{if $file.ShouldBeHidden}}
117117
{{svg "octicon-chevron-right" 18}}
@@ -218,7 +218,7 @@
218218

219219
{{if .Diff.IsIncomplete}}
220220
<div class="diff-file-box diff-box file-content gt-mt-3" id="diff-incomplete">
221-
<h4 class="ui top attached normal header tw-flex tw-items-center tw-justify-between">
221+
<h4 class="ui top attached header tw-font-normal tw-flex tw-items-center tw-justify-between">
222222
{{ctx.Locale.Tr "repo.diff.too_many_files"}}
223223
<a class="ui basic tiny button" id="diff-show-more-files" data-href="?skip-to={{.Diff.End}}&file-only=true">{{ctx.Locale.Tr "repo.diff.show_more"}}</a>
224224
</h4>

‎templates/shared/search/code/results.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
{{range $result := .SearchResults}}
1313
{{$repo := or $.Repo (index $.RepoMaps .RepoID)}}
1414
<div class="diff-file-box diff-box file-content non-diff-file-content repo-search-result">
15-
<h4 class="ui top attached normal header tw-flex tw-flex-wrap">
15+
<h4 class="ui top attached header tw-font-normal tw-flex tw-flex-wrap">
1616
{{if not $.Repo}}
1717
<span class="file tw-flex-1">
1818
<a rel="nofollow" href="{{$repo.Link}}">{{$repo.FullName}}</a>

‎web_src/css/base.css

Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -297,10 +297,6 @@ a.label,
297297
background-color: var(--color-markup-code-block);
298298
}
299299

300-
.ui.dividing.header {
301-
border-bottom-color: var(--color-secondary);
302-
}
303-
304300
/* fix Fomantic's line-height cutting off "g" on Windows Chrome with Segoe UI */
305301
.ui.input > input {
306302
line-height: var(--line-height-default);
@@ -576,22 +572,10 @@ ol.ui.list li,
576572
visibility: visible !important;
577573
}
578574

579-
.ui.error.header {
580-
background: var(--color-error-bg) !important;
581-
color: var(--color-error-text) !important;
582-
border-color: var(--color-error-border) !important;
583-
}
584-
585575
.ui.error.segment {
586576
border-color: var(--color-error-border) !important;
587577
}
588578

589-
.ui.warning.header {
590-
background: var(--color-warning-bg) !important;
591-
color: var(--color-warning-text) !important;
592-
border-color: var(--color-warning-border) !important;
593-
}
594-
595579
.ui.warning.segment {
596580
border-color: var(--color-warning-border) !important;
597581
}
@@ -1085,10 +1069,6 @@ input:-webkit-autofill:active,
10851069
margin-bottom: 0;
10861070
}
10871071

1088-
.ui .normal.header {
1089-
font-weight: var(--font-weight-normal);
1090-
}
1091-
10921072
.ui .form .autofill-dummy {
10931073
position: absolute;
10941074
width: 1px;
@@ -1246,17 +1226,6 @@ input:-webkit-autofill:active,
12461226
margin-right: 0;
12471227
}
12481228

1249-
.ui.icon.header svg {
1250-
width: 3em;
1251-
height: 3em;
1252-
float: none;
1253-
display: block;
1254-
line-height: var(--line-height-default);
1255-
padding: 0;
1256-
margin: 0 auto 0.5rem;
1257-
opacity: 1;
1258-
}
1259-
12601229
.ui.floating.dropdown .overflow.menu .scrolling.menu.items {
12611230
border-radius: 0 !important;
12621231
box-shadow: none !important;
@@ -1284,11 +1253,6 @@ input:-webkit-autofill:active,
12841253
border-radius: var(--border-radius);
12851254
}
12861255

1287-
.attention-header {
1288-
padding: 0.5em 0.75em !important;
1289-
color: var(--color-text) !important;
1290-
}
1291-
12921256
.attention-icon {
12931257
margin: 2px 6px 0 0;
12941258
}
@@ -1758,35 +1722,6 @@ a.ui.basic.label:hover {
17581722
color: var(--color-text-light);
17591723
}
17601724

1761-
.ui.attached.header {
1762-
position: relative;
1763-
background: var(--color-box-header);
1764-
border-color: var(--color-secondary);
1765-
}
1766-
1767-
/* fix misaligned right buttons on box headers */
1768-
.ui.attached.header > .ui.right {
1769-
position: absolute;
1770-
right: 0.78571429rem;
1771-
top: 0;
1772-
bottom: 0;
1773-
display: flex;
1774-
align-items: center;
1775-
gap: 0.25em;
1776-
}
1777-
1778-
/* the default ".ui.attached.header > .ui.right" is only able to contain "tiny" buttons, other buttons are too large */
1779-
.ui.attached.header > .ui.right .ui.tiny.button {
1780-
padding: 6px 10px;
1781-
font-weight: var(--font-weight-normal);
1782-
}
1783-
1784-
/* if a .top.attached.header is followed by a .segment, add some margin */
1785-
.ui.segments + .ui.top.attached.header,
1786-
.ui.attached.segment + .ui.top.attached.header {
1787-
margin-top: 1rem;
1788-
}
1789-
17901725
.rss-icon {
17911726
display: inline-flex;
17921727
color: var(--color-text-light-1);
@@ -1842,11 +1777,6 @@ table th[data-sortt-desc] .svg {
18421777
background: var(--color-secondary-dark-1) !important;
18431778
}
18441779

1845-
/* https://github.com/go-gitea/gitea/pull/11486 */
1846-
.ui.sub.header {
1847-
text-transform: none;
1848-
}
1849-
18501780
.ui.tabular.menu {
18511781
border-color: var(--color-secondary);
18521782
}
@@ -1897,22 +1827,6 @@ table th[data-sortt-desc] .svg {
18971827
height: 0;
18981828
}
18991829

1900-
.ui.header {
1901-
color: var(--color-text);
1902-
}
1903-
1904-
.ui.header .ui.label {
1905-
margin-left: 0.25rem;
1906-
}
1907-
1908-
.ui.header > .ui.label.compact {
1909-
margin-top: inherit;
1910-
}
1911-
1912-
.ui.header .sub.header {
1913-
color: var(--color-text-light-1);
1914-
}
1915-
19161830
.flash-error details code,
19171831
.flash-warning details code {
19181832
display: block;

‎web_src/css/index.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
@import "./modules/svg.css";
1515
@import "./modules/flexcontainer.css";
1616
@import "./modules/message.css";
17+
@import "./modules/header.css";
1718

1819
@import "./shared/flex-list.css";
1920
@import "./shared/milestone.css";

‎web_src/css/modules/header.css

Lines changed: 171 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,171 @@
1+
/* based on Fomantic UI header module, with just the parts extracted that we use. If you find any
2+
unused rules here after refactoring, please remove them. */
3+
4+
.ui.header {
5+
color: var(--color-text);
6+
border: none;
7+
margin: calc(2rem - 0.1428571428571429em) 0 1rem;
8+
padding: 0;
9+
font-family: var(--fonts-regular);
10+
font-weight: var(--font-weight-medium);
11+
line-height: 1.28571429;
12+
text-transform: none;
13+
}
14+
15+
.ui.header:first-child {
16+
margin-top: -0.14285714em;
17+
}
18+
19+
.ui.header:last-child {
20+
margin-bottom: 0;
21+
}
22+
23+
.ui.header .ui.label {
24+
margin-left: 0.25rem;
25+
vertical-align: middle;
26+
}
27+
28+
.ui.header > .ui.label.compact {
29+
margin-top: inherit;
30+
}
31+
32+
.ui.header .sub.header {
33+
display: block;
34+
font-weight: var(--font-weight-normal);
35+
padding: 0;
36+
margin: 0;
37+
font-size: 1rem;
38+
line-height: 1.2;
39+
color: var(--color-text-light-1);
40+
}
41+
42+
.ui.header > i.icon {
43+
display: table-cell;
44+
opacity: 1;
45+
font-size: 1.5em;
46+
padding-top: 0;
47+
vertical-align: middle;
48+
}
49+
50+
.ui.header > i.icon:only-child {
51+
display: inline-block;
52+
padding: 0;
53+
margin-right: 0.75rem;
54+
}
55+
56+
.ui.header + p {
57+
margin-top: 0;
58+
}
59+
60+
h2.ui.header {
61+
font-size: 1.71428571rem;
62+
}
63+
h2.ui.header .sub.header {
64+
font-size: 1.14285714rem;
65+
}
66+
67+
h4.ui.header {
68+
font-size: 1.07142857rem;
69+
}
70+
h4.ui.header .sub.header {
71+
font-size: 1rem;
72+
}
73+
74+
.ui.sub.header {
75+
padding: 0;
76+
margin-bottom: 0.14285714rem;
77+
font-weight: var(--font-weight-normal);
78+
font-size: 0.85714286em;
79+
}
80+
81+
.ui.icon.header svg {
82+
width: 3em;
83+
height: 3em;
84+
float: none;
85+
display: block;
86+
line-height: var(--line-height-default);
87+
padding: 0;
88+
margin: 0 auto 0.5rem;
89+
opacity: 1;
90+
}
91+
92+
.ui.header:not(h1,h2,h3,h4,h5,h6) {
93+
font-size: 1.28571429em;
94+
}
95+
96+
.ui.attached.header {
97+
position: relative;
98+
background: var(--color-box-header);
99+
padding: 0.78571429rem 1rem;
100+
margin: 0 -1px;
101+
border-radius: 0;
102+
border: 1px solid var(--color-secondary);
103+
}
104+
105+
.ui.attached:not(.top).header {
106+
border-top: none;
107+
}
108+
109+
.ui.top.attached.header {
110+
border-radius: 0.28571429rem 0.28571429rem 0 0;
111+
}
112+
113+
.ui.bottom.attached.header {
114+
border-radius: 0 0 0.28571429rem 0.28571429rem;
115+
}
116+
117+
.ui.attached.header:not(h1,h2,h3,h4,h5,h6) {
118+
font-size: 1em;
119+
}
120+
121+
/* fix misaligned right buttons on box headers */
122+
.ui.attached.header > .ui.right {
123+
position: absolute;
124+
right: 0.78571429rem;
125+
top: 0;
126+
bottom: 0;
127+
display: flex;
128+
align-items: center;
129+
gap: 0.25em;
130+
}
131+
132+
/* the default ".ui.attached.header > .ui.right" is only able to contain "tiny" buttons, other buttons are too large */
133+
.ui.attached.header > .ui.right .ui.tiny.button {
134+
padding: 6px 10px;
135+
font-weight: var(--font-weight-normal);
136+
}
137+
138+
/* if a .top.attached.header is followed by a .segment, add some margin */
139+
.ui.segments + .ui.top.attached.header,
140+
.ui.attached.segment + .ui.top.attached.header {
141+
margin-top: 1rem;
142+
}
143+
144+
.ui.dividing.header {
145+
border-bottom-color: var(--color-secondary);
146+
}
147+
148+
.ui.dividing.header .sub.header {
149+
padding-bottom: 0.21428571rem;
150+
}
151+
152+
.ui.dividing.header i.icon {
153+
margin-bottom: 0;
154+
}
155+
156+
.ui.error.header {
157+
background: var(--color-error-bg) !important;
158+
color: var(--color-error-text) !important;
159+
border-color: var(--color-error-border) !important;
160+
}
161+
162+
.ui.warning.header {
163+
background: var(--color-warning-bg) !important;
164+
color: var(--color-warning-text) !important;
165+
border-color: var(--color-warning-border) !important;
166+
}
167+
168+
.attention-header {
169+
padding: 0.5em 0.75em !important;
170+
color: var(--color-text) !important;
171+
}

0 commit comments

Comments
 (0)