Skip to content

Commit 8c2685c

Browse files
wxiaoguangwxiaoguang
committed
improve
1 parent ad8ff73 commit 8c2685c

File tree

8 files changed

+78
-76
lines changed

8 files changed

+78
-76
lines changed

‎templates/devtest/gitea-ui.tmpl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,10 @@
121121
<h1>SVG alignment</h1>
122122
<div class="flex-text-block">{{svg "octicon-alert"}} {{svg "octicon-x"}} text (block)</div>
123123
<div><div class="flex-text-inline">{{svg "octicon-alert"}} {{svg "octicon-x"}} text</div> (inline)</div>
124+
<div class="flex-items-block">
125+
<div class="item">{{svg "octicon-alert"}} flex every line</div>
126+
<div class="item">{{svg "octicon-alert"}} flex every item</div>
127+
</div>
124128
<div><button class="ui red button">{{svg "octicon-alert" 24}} {{svg "octicon-x" 24}} text</button></div>
125129
<div>
126130
<div class="ui dropdown" style="border: 1px red dashed" data-tooltip-content="border for demo purpose only">
@@ -166,8 +170,8 @@
166170
</div>
167171
<div class="ui buttons">
168172
<button class="ui button">Button with Dropdown</button>
169-
<div class="ui floating dropdown icon button">
170-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
173+
<div class="ui dropdown button icon">
174+
{{svg "octicon-triangle-down"}}
171175
<div class="menu">
172176
<div class="item">item</div>
173177
</div>

‎templates/repo/commits_list_small.tmpl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
<div class="singular-commit" id="{{$tag}}">
77
<span class="badge badge-commit">{{svg "octicon-git-commit"}}</span>
88
{{if .User}}
9-
<a href="{{.User.HomeLink}}">
10-
{{avatar $.root.Context .User}}
11-
</a>
9+
<a class="avatar" href="{{.User.HomeLink}}">{{avatar $.root.Context .User}}</a>
1210
{{else}}
1311
{{avatarByEmail $.root.Context .Author.Email .Author.Name}}
1412
{{end}}

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

Lines changed: 48 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
<div class="content">
2323
{{template "repo/pulls/status" .}}
2424
{{$showGeneralMergeForm := false}}
25-
<div class="ui attached merge-section segment {{if not $.LatestCommitStatus}}no-header{{end}}">
25+
<div class="ui attached merge-section segment {{if not $.LatestCommitStatus}}no-header{{end}} flex-items-block">
2626
{{if .Issue.PullRequest.HasMerged}}
2727
{{if .IsPullBranchDeletable}}
2828
<div class="item item-section text gt-f1">
2929
<div class="item-section-left">
3030
<h3 class="gt-mb-3">
31-
{{$.locale.Tr "repo.pulls.merged_success"}}
31+
{{$.locale.Tr "repo.pulls.merged_success"}}
3232
</h3>
3333
<div class="merge-section-info">
3434
{{$.locale.Tr "repo.pulls.merged_info_text" (printf "<code>%s</code>" (.HeadTarget | Escape)) | Str2html}}
@@ -58,93 +58,91 @@
5858
{{end}}
5959
</div>
6060
{{else if .IsPullFilesConflicted}}
61-
<div class="item text">
61+
<div class="item">
6262
{{svg "octicon-x"}}
6363
{{$.locale.Tr "repo.pulls.files_conflicted"}}
64-
<ul>
65-
{{range .ConflictedFiles}}
66-
<li>{{.}}</li>
67-
{{end}}
68-
</ul>
6964
</div>
65+
<ul>
66+
{{range .ConflictedFiles}}
67+
<li>{{.}}</li>
68+
{{end}}
69+
</ul>
7070
{{else if .IsPullRequestBroken}}
7171
<div class="item">
72-
<i class="icon icon-octicon">{{svg "octicon-x"}}</i>
72+
{{svg "octicon-x"}}
7373
{{$.locale.Tr "repo.pulls.data_broken"}}
7474
</div>
7575
{{else if .IsPullWorkInProgress}}
76-
<div class="item toggle-wip gt-df gt-ac gt-sb" data-title="{{.Issue.Title}}" data-wip-prefix="{{(.WorkInProgressPrefix|Escape)}}" data-update-url="{{.Issue.Link}}/title">
77-
<div>
78-
<i class="icon icon-octicon">{{svg "octicon-x"}}</i>
76+
<div class="item toggle-wip" data-title="{{.Issue.Title}}" data-wip-prefix="{{(.WorkInProgressPrefix|Escape)}}" data-update-url="{{.Issue.Link}}/title">
77+
<div class="item-section-left flex-text-inline gt-f1">
78+
{{svg "octicon-x"}}
7979
{{$.locale.Tr "repo.pulls.cannot_merge_work_in_progress"}}
8080
</div>
81-
<div>
82-
{{if or .HasIssuesOrPullsWritePermission .IsIssuePoster}}
83-
<button class="ui compact button">
84-
{{$.locale.Tr "repo.pulls.remove_prefix" (.WorkInProgressPrefix|Escape) | Safe}}
85-
</button>
86-
{{end}}
87-
</div>
81+
{{if or .HasIssuesOrPullsWritePermission .IsIssuePoster}}
82+
<button class="ui compact button">
83+
{{$.locale.Tr "repo.pulls.remove_prefix" (.WorkInProgressPrefix|Escape) | Safe}}
84+
</button>
85+
{{end}}
8886
</div>
8987
{{template "repo/issue/view_content/update_branch_by_merge" $}}
9088
{{else if .Issue.PullRequest.IsChecking}}
9189
<div class="item">
92-
<i class="icon icon-octicon">{{svg "octicon-sync"}}</i>
90+
{{svg "octicon-sync"}}
9391
{{$.locale.Tr "repo.pulls.is_checking"}}
9492
</div>
9593
{{else if .Issue.PullRequest.IsAncestor}}
9694
<div class="item">
97-
<i class="icon icon-octicon">{{svg "octicon-alert"}}</i>
95+
{{svg "octicon-alert"}}
9896
{{$.locale.Tr "repo.pulls.is_ancestor"}}
9997
</div>
10098
{{else if or .Issue.PullRequest.CanAutoMerge .Issue.PullRequest.IsEmpty}}
10199
{{if .IsBlockedByApprovals}}
102100
<div class="item">
103-
<i class="icon icon-octicon">{{svg "octicon-x"}}</i>
104-
{{$.locale.Tr "repo.pulls.blocked_by_approvals" .GrantedApprovals .ProtectedBranch.RequiredApprovals}}
101+
{{svg "octicon-x"}}
102+
{{$.locale.Tr "repo.pulls.blocked_by_approvals" .GrantedApprovals .ProtectedBranch.RequiredApprovals}}
105103
</div>
106104
{{else if .IsBlockedByRejection}}
107105
<div class="item">
108-
<i class="icon icon-octicon">{{svg "octicon-x"}}</i>
106+
{{svg "octicon-x"}}
109107
{{$.locale.Tr "repo.pulls.blocked_by_rejection"}}
110108
</div>
111109
{{else if .IsBlockedByOfficialReviewRequests}}
112110
<div class="item">
113-
<i class="icon icon-octicon">{{svg "octicon-x"}}</i>
111+
{{svg "octicon-x"}}
114112
{{$.locale.Tr "repo.pulls.blocked_by_official_review_requests"}}
115113
</div>
116114
{{else if .IsBlockedByOutdatedBranch}}
117115
<div class="item">
118-
<i class="icon icon-octicon">{{svg "octicon-x"}}</i>
119-
{{$.locale.Tr "repo.pulls.blocked_by_outdated_branch"}}
116+
{{svg "octicon-x"}}
117+
{{$.locale.Tr "repo.pulls.blocked_by_outdated_branch"}}
120118
</div>
121119
{{else if .IsBlockedByChangedProtectedFiles}}
122120
<div class="item">
123-
<i class="icon icon-octicon">{{svg "octicon-x"}}</i>
121+
{{svg "octicon-x"}}
124122
{{$.locale.TrN $.ChangedProtectedFilesNum "repo.pulls.blocked_by_changed_protected_files_1" "repo.pulls.blocked_by_changed_protected_files_n" | Safe}}
125-
<ul>
126-
{{range .ChangedProtectedFiles}}
127-
<li>{{.}}</li>
128-
{{end}}
129-
</ul>
130123
</div>
124+
<ul>
125+
{{range .ChangedProtectedFiles}}
126+
<li>{{.}}</li>
127+
{{end}}
128+
</ul>
131129
{{else if and .EnableStatusCheck (or .RequiredStatusCheckState.IsError .RequiredStatusCheckState.IsFailure)}}
132130
<div class="item">
133-
<i class="icon icon-octicon">{{svg "octicon-x"}}</i>
131+
{{svg "octicon-x"}}
134132
{{$.locale.Tr "repo.pulls.required_status_check_failed"}}
135133
</div>
136134
{{else if and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess)}}
137135
<div class="item">
138-
<i class="icon icon-octicon">{{svg "octicon-x"}}</i>
136+
{{svg "octicon-x"}}
139137
{{$.locale.Tr "repo.pulls.required_status_check_missing"}}
140138
</div>
141139
{{else if and .AllowMerge .RequireSigned (not .WillSign)}}
142140
<div class="item">
143-
<i class="icon icon-octicon">{{svg "octicon-x"}}</i>
141+
{{svg "octicon-x"}}
144142
{{$.locale.Tr "repo.pulls.require_signed_wont_sign"}}
145143
</div>
146144
<div class="item">
147-
<i class="icon icon-octicon">{{svg "octicon-unlock"}}</i>
145+
{{svg "octicon-unlock"}}
148146
{{$.locale.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason)}}
149147
</div>
150148
{{end}}
@@ -158,23 +156,23 @@
158156
{{if $canMergeNow}}
159157
{{if $notAllOverridableChecksOk}}
160158
<div class="item">
161-
<i class="icon icon-octicon">{{svg "octicon-dot-fill"}}</i>
159+
{{svg "octicon-dot-fill"}}
162160
{{$.locale.Tr "repo.pulls.required_status_check_administrator"}}
163161
</div>
164162
{{else}}
165163
<div class="item">
166-
<i class="icon icon-octicon">{{svg "octicon-check"}}</i>
164+
{{svg "octicon-check"}}
167165
{{$.locale.Tr "repo.pulls.can_auto_merge_desc"}}
168166
</div>
169167
{{end}}
170168
{{if .WillSign}}
171169
<div class="item">
172-
<i class="icon icon-octicon">{{svg "octicon-lock" 16 "text green"}}</i>
170+
{{svg "octicon-lock" 16 "text green"}}
173171
{{$.locale.Tr "repo.signing.will_sign" .SigningKey}}
174172
</div>
175173
{{else if .IsSigned}}
176174
<div class="item">
177-
<i class="icon icon-octicon">{{svg "octicon-unlock"}}</i>
175+
{{svg "octicon-unlock"}}
178176
{{$.locale.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason)}}
179177
</div>
180178
{{end}}
@@ -184,7 +182,7 @@
184182
<div class="ui divider"></div>
185183

186184
<div class="item">
187-
<i class="icon icon-octicon">{{svg "octicon-alert"}}</i>
185+
{{svg "octicon-alert"}}
188186
{{$.locale.Tr "repo.pulls.is_empty"}}
189187
</div>
190188
{{end}}
@@ -315,19 +313,19 @@
315313
</div>
316314
{{else if .IsBlockedByOutdatedBranch}}
317315
<div class="item text red">
318-
<i class="icon icon-octicon">{{svg "octicon-x"}}</i>
319-
{{$.locale.Tr "repo.pulls.blocked_by_outdated_branch"}}
316+
{{svg "octicon-x"}}
317+
{{$.locale.Tr "repo.pulls.blocked_by_outdated_branch"}}
320318
</div>
321319
{{else if .IsBlockedByChangedProtectedFiles}}
322320
<div class="item text red">
323-
<i class="icon icon-octicon">{{svg "octicon-x"}}</i>
321+
{{svg "octicon-x"}}
324322
{{$.locale.TrN $.ChangedProtectedFilesNum "repo.pulls.blocked_by_changed_protected_files_1" "repo.pulls.blocked_by_changed_protected_files_n" | Safe}}
325-
<ul>
326-
{{range .ChangedProtectedFiles}}
327-
<li>{{.}}</li>
328-
{{end}}
329-
</ul>
330323
</div>
324+
<ul>
325+
{{range .ChangedProtectedFiles}}
326+
<li>{{.}}</li>
327+
{{end}}
328+
</ul>
331329
{{else if and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess)}}
332330
<div class="item text red">
333331
{{svg "octicon-x"}}

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{{if and (gt $.Issue.PullRequest.CommitsBehind 0) (not $.Issue.IsClosed) (not $.Issue.PullRequest.IsChecking) (not $.IsPullFilesConflicted) (not $.IsPullRequestBroken)}}
22
<div class="ui divider"></div>
33
<div class="item item-section">
4-
<div class="item-section-left">
5-
<i class="icon icon-octicon">{{svg "octicon-alert"}}</i>
4+
<div class="item-section-left flex-text-inline">
5+
{{svg "octicon-alert"}}
66
{{$.locale.Tr "repo.pulls.outdated_with_base_branch"}}
77
</div>
88
<div class="item-section-right">
@@ -14,9 +14,8 @@
1414
{{$.locale.Tr "repo.pulls.update_branch"}}
1515
</span>
1616
</button>
17-
18-
<div class="ui dropdown icon button no-text">
19-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
17+
<div class="ui dropdown icon button">
18+
{{svg "octicon-triangle-down"}}
2019
<div class="menu">
2120
<a class="item active selected" data-do="{{$.Link}}/update">{{$.locale.Tr "repo.pulls.update_branch"}}</a>
2221
<a class="item" data-do="{{$.Link}}/update?style=rebase">{{$.locale.Tr "repo.pulls.update_branch_rebase"}}</a>

‎web_src/css/base.css

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2284,13 +2284,18 @@ table th[data-sortt-desc] .svg {
22842284
}
22852285

22862286
.ui.dropdown {
2287-
/* the dropdown doesn't have default line-height, use this to make the dropdown icon align with plain dropdown */
2288-
line-height: 1em;
2287+
line-height: 1em; /* the dropdown doesn't have default line-height, use this to make the dropdown icon align with plain dropdown */
22892288
}
22902289

2290+
/* dropdown has some kinds of icons:
2291+
- "> .dropdown.icon": the arrow for opening the dropdown
2292+
- "> .remove.icon": the "x" icon for clearing the dropdown, only used in selection dropdown
2293+
- "> .ui.label > .delete.icon": the "x" icon for removing a label item in multiple selection dropdown
2294+
*/
2295+
2296+
/* Gitea uses SVG images instead of Fomantic builtin "<i>" font icons, so we need to reset the icon styles */
22912297
.ui.ui.dropdown > .icon.icon {
2292-
/* plain dropdown and button dropdown use flex layout for icons */
2293-
position: initial;
2298+
position: initial; /* plain dropdown and button dropdown use flex layout for icons */
22942299
padding: 0;
22952300
margin: 0;
22962301
height: auto;
@@ -2302,8 +2307,7 @@ table th[data-sortt-desc] .svg {
23022307

23032308
.ui.ui.button.dropdown > .icon.icon,
23042309
.ui.ui.selection.dropdown > .icon.icon {
2305-
/* selection dropdown uses absolute layout for icons */
2306-
position: absolute;
2310+
position: absolute; /* selection dropdown uses absolute layout for icons */
23072311
top: 50%;
23082312
transform: translateY(-50%);
23092313
}
@@ -2313,15 +2317,12 @@ table th[data-sortt-desc] .svg {
23132317
}
23142318

23152319
.ui.ui.dropdown > .remove.icon {
2316-
right: 2em; /* clear the dropdown, only used in selection dropdown, it's beside the "dropdown icon arrow" */
2317-
}
2318-
2319-
.ui.ui.buttons .floating.dropdown.icon.button {
2320-
padding-right: 1em;
2320+
right: 2em;
23212321
}
23222322

23232323
.ui.ui.button,
23242324
.ui.ui.dropdown,
2325+
.flex-items-inline > .item,
23252326
.flex-text-inline {
23262327
display: inline-flex;
23272328
align-items: center;
@@ -2330,6 +2331,7 @@ table th[data-sortt-desc] .svg {
23302331
vertical-align: middle;
23312332
}
23322333

2334+
.flex-items-block > .item,
23332335
.flex-text-block {
23342336
display: flex;
23352337
align-items: center;

‎web_src/css/modules/button.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
color: var(--color-text);
2525
}
2626

27-
.ui.button.no-text .icon {
28-
margin: 0 !important;
29-
}
30-
3127
.delete-button,
3228
.delete-button:hover {
3329
color: var(--color-red);

‎web_src/css/repo.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -850,6 +850,11 @@
850850
padding-top: 0;
851851
}
852852

853+
.repository.view.issue .comment-list .timeline-item.commits-list .ui.avatar,
854+
.repository.view.issue .comment-list .timeline-item.event .ui.avatar {
855+
margin-right: 0.25em;
856+
}
857+
853858
.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit {
854859
line-height: 34px; /* this must be same as .badge height, to avoid overflow */
855860
clear: both; /* reset the "float right shabox", in the future, use flexbox instead */

‎web_src/js/components/PullRequestMergeForm.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
</template>
7373
</span>
7474
</button>
75-
<div class="ui dropdown icon button no-text" @click.stop="showMergeStyleMenu = !showMergeStyleMenu" v-if="mergeStyleAllowedCount>1">
75+
<div class="ui dropdown icon button" @click.stop="showMergeStyleMenu = !showMergeStyleMenu" v-if="mergeStyleAllowedCount>1">
7676
<svg-icon name="octicon-triangle-down" :size="14"/>
7777
<div class="menu" :class="{'show':showMergeStyleMenu}">
7878
<template v-for="msd in mergeForm.mergeStyles">

0 commit comments

Comments
 (0)