Skip to content

Commit ac6db5e

Browse files
zjjhotzjjhot
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: cleanup repo details icons/labels (go-gitea#27644) Improve dropdown button alignment and fix hover bug (go-gitea#27632)
2 parents 6454a58 + 0271114 commit ac6db5e

File tree

8 files changed

+40
-61
lines changed

8 files changed

+40
-61
lines changed

‎options/locale/locale_en-US.ini‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,10 +1030,8 @@ transfer.no_permission_to_reject = You do not have permission to reject this tra
10301030

10311031
desc.private = Private
10321032
desc.public = Public
1033-
desc.private_template = Private template
1034-
desc.public_template = Template
1033+
desc.template = Template
10351034
desc.internal = Internal
1036-
desc.internal_template = Internal template
10371035
desc.archived = Archived
10381036

10391037
template.items = Template Items

‎templates/admin/repo/list.tmpl‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -55,29 +55,22 @@
5555
<td>
5656
<a href="{{.Link}}">{{.Name}}</a>
5757
{{if .IsArchived}}
58-
<span class="ui basic mini label">{{ctx.Locale.Tr "repo.desc.archived"}}</span>
58+
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.archived"}}</span>
5959
{{end}}
60-
{{if .IsTemplate}}
61-
{{if .IsPrivate}}
62-
<span class="ui basic mini label">{{ctx.Locale.Tr "repo.desc.private_template"}}</span>
63-
{{else}}
64-
{{if .Owner.Visibility.IsPrivate}}
65-
<span class="ui basic mini label">{{ctx.Locale.Tr "repo.desc.internal_template"}}</span>
66-
{{end}}
67-
{{end}}
60+
{{if .IsPrivate}}
61+
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private"}}</span>
6862
{{else}}
69-
{{if .IsPrivate}}
70-
<span class="ui basic mini label">{{ctx.Locale.Tr "repo.desc.private"}}</span>
71-
{{else}}
72-
{{if .Owner.Visibility.IsPrivate}}
73-
<span class="ui basic mini label">{{ctx.Locale.Tr "repo.desc.internal"}}</span>
74-
{{end}}
63+
{{if .Owner.Visibility.IsPrivate}}
64+
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal"}}</span>
7565
{{end}}
7666
{{end}}
77-
{{if .IsFork}}
78-
{{svg "octicon-repo-forked"}}
79-
{{else if .IsMirror}}
67+
{{if .IsTemplate}}
68+
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.template"}}</span>
69+
{{end}}
70+
{{if .IsMirror}}
8071
{{svg "octicon-mirror"}}
72+
{{else if .IsFork}}
73+
{{svg "octicon-repo-forked"}}
8174
{{end}}
8275
</td>
8376
<td>{{.NumWatches}}</td>

‎templates/devtest/gitea-ui.tmpl‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,15 @@
250250
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
251251
</div>
252252
</div>
253+
254+
<div>
255+
<hr>
256+
<div class="ui tiny button">Button align with ...</div>
257+
<div class="ui dropdown tiny button">
258+
<span class="text">... Dropdown Button</span>
259+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
260+
</div>
261+
</div>
253262
</div>
254263

255264
<div>

‎templates/explore/repo_list.tmpl‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,17 @@
1414
{{if .IsArchived}}
1515
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.archived"}}</span>
1616
{{end}}
17-
{{if .IsTemplate}}
18-
{{if .IsPrivate}}
19-
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private_template"}}</span>
20-
{{else}}
21-
{{if .Owner.Visibility.IsPrivate}}
22-
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal_template"}}</span>
23-
{{end}}
24-
{{end}}
17+
{{if .IsPrivate}}
18+
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private"}}</span>
2519
{{else}}
26-
{{if .IsPrivate}}
27-
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private"}}</span>
28-
{{else}}
29-
{{if .Owner.Visibility.IsPrivate}}
30-
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal"}}</span>
31-
{{end}}
20+
{{if .Owner.Visibility.IsPrivate}}
21+
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal"}}</span>
3222
{{end}}
3323
{{end}}
24+
{{if .IsTemplate}}
25+
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.template"}}</span>
26+
{{end}}
3427
</span>
35-
{{if .IsFork}}
36-
<span data-tooltip-content="{{ctx.Locale.Tr "repo.fork"}}">{{svg "octicon-repo-forked"}}</span>
37-
{{else if .IsMirror}}
38-
<span data-tooltip-content="{{ctx.Locale.Tr "mirror"}}">{{svg "octicon-mirror"}}</span>
39-
{{end}}
4028
</div>
4129
<div class="flex-item-trailing">
4230
{{if .PrimaryLanguage}}

‎templates/repo/header.tmpl‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,18 @@
1111
<div class="gt-mx-2">/</div>
1212
<a href="{{$.RepoLink}}">{{.Name}}</a>
1313
<div class="labels gt-df gt-ac gt-fw">
14-
{{if .IsTemplate}}
15-
{{if .IsPrivate}}
16-
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private_template"}}</span>
17-
{{else}}
18-
{{if .Owner.Visibility.IsPrivate}}
19-
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal_template"}}</span>
20-
{{end}}
21-
{{end}}
14+
{{if .IsArchived}}
15+
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.archived"}}</span>
16+
{{end}}
17+
{{if .IsPrivate}}
18+
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private"}}</span>
2219
{{else}}
23-
{{if .IsPrivate}}
24-
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private"}}</span>
25-
{{else}}
26-
{{if .Owner.Visibility.IsPrivate}}
27-
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal"}}</span>
28-
{{end}}
20+
{{if .Owner.Visibility.IsPrivate}}
21+
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal"}}</span>
2922
{{end}}
3023
{{end}}
31-
{{if .IsArchived}}
32-
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.archived"}}</span>
24+
{{if .IsTemplate}}
25+
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.template"}}</span>
3326
{{end}}
3427
</div>
3528
{{if $.EnableFeed}}

‎templates/repo/icon.tmpl‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{{$avatarLink := (.RelAvatarLink ctx)}}
22
{{if $avatarLink}}
33
<img class="ui avatar gt-vm" src="{{$avatarLink}}" width="32" height="32" alt="{{.FullName}}">
4-
{{else if $.IsTemplate}}
5-
{{svg "octicon-repo-template" 32}}
6-
{{else if $.IsPrivate}}
7-
{{svg "octicon-lock" 32}}
84
{{else if $.IsMirror}}
95
{{svg "octicon-mirror" 32}}
106
{{else if $.IsFork}}

‎web_src/css/base.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1952,7 +1952,7 @@ table th[data-sortt-desc] .svg {
19521952
height: 15px;
19531953
}
19541954

1955-
.ui.dropdown {
1955+
.ui.dropdown:not(.button) {
19561956
line-height: var(--line-height-default); /* the dropdown doesn't have default line-height, use this to make the dropdown icon align with plain dropdown */
19571957
}
19581958

‎web_src/css/modules/button.css‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,13 @@ It needs some tricks to tweak the left/right borders with active state */
128128
.ui.primary.button:focus,
129129
.ui.primary.buttons .button:focus {
130130
background: var(--color-primary);
131+
color: var(--color-primary-contrast);
131132
}
132133

133134
.ui.primary.button:hover,
134135
.ui.primary.buttons .button:hover {
135136
background: var(--color-primary-hover);
137+
color: var(--color-primary-contrast);
136138
}
137139

138140
.ui.primary.button:active,

0 commit comments

Comments
 (0)