diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2023-08-26 07:35:10 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-26 01:35:10 +0200 |
| commit | 576644d81555cfcd7c865d444285cad64cc0b9ec (patch) | |
| tree | a5a90985c2477c96abeab09d19f3ed12e463caef /templates/repo | |
| parent | 8b5c081d766bc7be725b07a8abfb2d8f39c45fd3 (diff) | |
| download | gitea-576644d81555cfcd7c865d444285cad64cc0b9ec.tar.gz gitea-576644d81555cfcd7c865d444285cad64cc0b9ec.zip | |
Simplify helper CSS classes and avoid abuse (#26728)
Removed CSS helper classes (some of them are not useful while some of
them are abused often)
* `gt-db`: in most cases it could be replaced by `gt-df` and the flex
layout should be encouraged. Other cases: either it does need the
`gt-df` (eg: by using `div` directly) or it is an abuse (eg: the warning
message in a form)
* `gt-di`: it doesn't seem useful, or it could be replaced by `gt-dib`
in most cases.
* `gt-dif`: not useful, it could be replaced by `flex-text-inline` or
`gt-df`
* `gt-js`: never used
* All `<i class="icon gt-df gt-ac gt-jc">` could be written as `<i
class="icon">`
## Some UI samples
### Admin Notice
### Admin Stacktrace
### Org Home
### Org Team Repo
### Release List
### User Setting Application Token Scope
Co-authored-by: Giteabot <teabot@gitea.io>
Diffstat (limited to 'templates/repo')
| -rw-r--r-- | templates/repo/home.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/issue/filters.tmpl | 10 | ||||
| -rw-r--r-- | templates/repo/issue/labels/labels_selector_field.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/issue/milestone/select_menu.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/issue/new_form.tmpl | 4 | ||||
| -rw-r--r-- | templates/repo/issue/view_content/pull_merge_instruction.tmpl | 4 | ||||
| -rw-r--r-- | templates/repo/issue/view_content/sidebar.tmpl | 6 | ||||
| -rw-r--r-- | templates/repo/release/list.tmpl | 6 | ||||
| -rw-r--r-- | templates/repo/settings/options.tmpl | 2 |
9 files changed, 19 insertions, 19 deletions
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 7eb4ba4636..202c8b8ff3 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -18,7 +18,7 @@ <div class="ui small action input{{if .CodeIndexerUnavailable}} disabled left icon{{end}}"{{if .CodeIndexerUnavailable}} data-tooltip-content="{{.locale.Tr "repo.search.code_search_unavailable"}}"{{end}}> <input name="q" value="{{.Keyword}}"{{if .CodeIndexerUnavailable}} disabled{{end}} placeholder="{{.locale.Tr "repo.search.search_repo"}}"> {{if .CodeIndexerUnavailable}} - <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-alert"}}</i> + <i class="icon">{{svg "octicon-alert"}}</i> {{end}} <button class="ui small icon button"{{if .CodeIndexerUnavailable}} disabled{{end}} type="submit"> {{svg "octicon-search"}} diff --git a/templates/repo/issue/filters.tmpl b/templates/repo/issue/filters.tmpl index 799509328f..b482e471e1 100644 --- a/templates/repo/issue/filters.tmpl +++ b/templates/repo/issue/filters.tmpl @@ -15,7 +15,7 @@ </span> <div class="menu"> <div class="ui icon search input"> - <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> + <i class="icon">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_label"}}"> </div> <span class="info">{{.locale.Tr "repo.issues.filter_label_exclude" | Safe}}</span> @@ -43,7 +43,7 @@ </span> <div class="menu"> <div class="ui icon search input"> - <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> + <i class="icon">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_milestone"}}"> </div> <div class="divider"></div> @@ -81,7 +81,7 @@ </span> <div class="menu"> <div class="ui icon search input"> - <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> + <i class="icon">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_project"}}"> </div> <a class="{{if not .ProjectID}}active selected {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_project_all"}}</a> @@ -123,7 +123,7 @@ </span> <div class="menu"> <div class="ui icon search input"> - <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> + <i class="icon">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_poster"}}"> </div> <a class="item" data-value="0">{{.locale.Tr "repo.issues.filter_poster_no_select"}}</a> @@ -138,7 +138,7 @@ </span> <div class="menu"> <div class="ui icon search input"> - <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> + <i class="icon">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_assignee"}}"> </div> <a class="{{if not .AssigneeID}}active selected {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_assginee_no_select"}}</a> diff --git a/templates/repo/issue/labels/labels_selector_field.tmpl b/templates/repo/issue/labels/labels_selector_field.tmpl index c509cf37c6..bdec96e6ac 100644 --- a/templates/repo/issue/labels/labels_selector_field.tmpl +++ b/templates/repo/issue/labels/labels_selector_field.tmpl @@ -8,7 +8,7 @@ <div class="filter menu" {{if .Issue}}data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/labels"{{else}}data-id="#label_ids"{{end}}> {{if or .Labels .OrgLabels}} <div class="ui icon search input"> - <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> + <i class="icon">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_labels"}}"> </div> {{end}} diff --git a/templates/repo/issue/milestone/select_menu.tmpl b/templates/repo/issue/milestone/select_menu.tmpl index 497313e75d..df9b324465 100644 --- a/templates/repo/issue/milestone/select_menu.tmpl +++ b/templates/repo/issue/milestone/select_menu.tmpl @@ -1,6 +1,6 @@ {{if or .OpenMilestones .ClosedMilestones}} <div class="ui icon search input"> - <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> + <i class="icon">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_milestones"}}"> </div> <div class="divider"></div> diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 272693e63e..ae43d70c4a 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -95,7 +95,7 @@ <div class="menu"> {{if or .OpenProjects .ClosedProjects}} <div class="ui icon search input"> - <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> + <i class="icon">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_projects"}}"> </div> {{end}} @@ -152,7 +152,7 @@ </span> <div class="filter menu" data-id="#assignee_ids"> <div class="ui icon search input"> - <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> + <i class="icon">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_assignees"}}"> </div> <div class="no-select item">{{.locale.Tr "repo.issues.new.clear_assignees"}}</div> diff --git a/templates/repo/issue/view_content/pull_merge_instruction.tmpl b/templates/repo/issue/view_content/pull_merge_instruction.tmpl index d2b3913274..71e3fc12bc 100644 --- a/templates/repo/issue/view_content/pull_merge_instruction.tmpl +++ b/templates/repo/issue/view_content/pull_merge_instruction.tmpl @@ -1,7 +1,7 @@ <div class="divider"></div> <div class="instruct-toggle"> {{$.locale.Tr "repo.pulls.merge_instruction_hint" | Safe}} </div> <div class="instruct-content gt-mt-3 gt-hidden"> - <div><h3 class="gt-di">{{$.locale.Tr "step1"}} </h3>{{$.locale.Tr "repo.pulls.merge_instruction_step1_desc"}}</div> + <div><h3 class="gt-dib">{{$.locale.Tr "step1"}}</h3> {{$.locale.Tr "repo.pulls.merge_instruction_step1_desc"}}</div> <div class="ui secondary segment"> {{if eq $.Issue.PullRequest.Flow 0}} <div>git checkout -b {{if ne $.Issue.PullRequest.HeadRepo.ID $.Issue.PullRequest.BaseRepo.ID}}{{$.Issue.PullRequest.HeadRepo.OwnerName}}-{{end}}{{$.Issue.PullRequest.HeadBranch}} {{$.Issue.PullRequest.BaseBranch}}</div> @@ -10,7 +10,7 @@ <div>git fetch origin {{$.Issue.PullRequest.GetGitRefName}}:{{$.Issue.PullRequest.HeadBranch}}</div> {{end}} </div> - <div><h3 class="gt-di">{{$.locale.Tr "step2"}} </h3>{{$.locale.Tr "repo.pulls.merge_instruction_step2_desc"}}</div> + <div><h3 class="gt-dib">{{$.locale.Tr "step2"}}</h3> {{$.locale.Tr "repo.pulls.merge_instruction_step2_desc"}}</div> <div class="ui secondary segment"> <div>git checkout {{$.Issue.PullRequest.BaseBranch}}</div> <div>git merge --no-ff {{if ne $.Issue.PullRequest.HeadRepo.ID $.Issue.PullRequest.BaseRepo.ID}}{{$.Issue.PullRequest.HeadRepo.OwnerName}}-{{end}}{{$.Issue.PullRequest.HeadBranch}}</div> diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 70aa8e53c0..c150a9cdcd 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -12,7 +12,7 @@ <div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/request_review"> {{if .Reviewers}} <div class="ui icon search input"> - <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> + <i class="icon">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_reviewers"}}"> </div> {{end}} @@ -162,7 +162,7 @@ <div class="menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/projects"> {{if or .OpenProjects .ClosedProjects}} <div class="ui icon search input"> - <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> + <i class="icon">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_projects"}}"> </div> {{end}} @@ -215,7 +215,7 @@ </a> <div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/assignee"> <div class="ui icon search input"> - <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i> + <i class="icon">{{svg "octicon-search" 16}}</i> <input type="text" placeholder="{{.locale.Tr "repo.issues.filter_assignees"}}"> </div> <div class="no-select item">{{.locale.Tr "repo.issues.new.clear_assignees"}}</div> diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index f326fb3272..c7f50c611a 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -8,10 +8,10 @@ {{range $idx, $release := .Releases}} <li class="ui grid"> <div class="ui four wide column meta"> - <a class="gt-db muted" href="{{if not .Sha1}}#{{else}}{{$.RepoLink}}/src/tag/{{.TagName | PathEscapeSegments}}{{end}}" rel="nofollow">{{svg "octicon-tag" 16 "gt-mr-2"}}{{.TagName}}</a> + <a class="muted" href="{{if not .Sha1}}#{{else}}{{$.RepoLink}}/src/tag/{{.TagName | PathEscapeSegments}}{{end}}" rel="nofollow">{{svg "octicon-tag" 16 "gt-mr-2"}}{{.TagName}}</a> {{if .Sha1}} - <a class="gt-mono muted gt-db gt-mt-4 gt-pt-1" href="{{$.RepoLink}}/src/commit/{{.Sha1}}" rel="nofollow">{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .Sha1}}</a> - {{template "repo/branch_dropdown" dict "root" $ "release" . "ContainerClasses" "gt-mt-4"}} + <a class="muted gt-mono" href="{{$.RepoLink}}/src/commit/{{.Sha1}}" rel="nofollow">{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .Sha1}}</a> + {{template "repo/branch_dropdown" dict "root" $ "release" .}} {{end}} </div> <div class="ui twelve wide column detail"> diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 48d918fdc6..012368fb94 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -116,7 +116,7 @@ <tbody> <tr> <td colspan="4"> - <span class="text red gt-db gt-py-4 gt-border-secondary-bottom">{{$.locale.Tr "repo.settings.mirror_settings.direction.pull"}}: {{$.locale.Tr "error.occurred"}}</span> + <div class="text red gt-py-4 gt-border-secondary-bottom">{{$.locale.Tr "repo.settings.mirror_settings.direction.pull"}}: {{$.locale.Tr "error.occurred"}}</div> </td> </tr> </tbody> |