From bde014e46d044f54653d1d035730b8904676684a Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Wed, 16 Apr 2025 16:14:10 +0800 Subject: [PATCH] Fix button alignments and remove unnecessary styles (#34206) Co-authored-by: wxiaoguang --- templates/devtest/gitea-ui.tmpl | 18 +-- templates/repo/clone_panel.tmpl | 2 +- templates/repo/diff/box.tmpl | 2 +- templates/repo/diff/conversation.tmpl | 16 +-- templates/repo/graph.tmpl | 4 +- templates/repo/graph/commits.tmpl | 6 +- templates/repo/header.tmpl | 10 +- .../repo/issue/view_content/conversation.tmpl | 8 +- templates/repo/release/new.tmpl | 2 +- templates/repo/release_tag_header.tmpl | 2 +- templates/repo/star_unstar.tmpl | 2 +- templates/repo/watch_unwatch.tmpl | 2 +- templates/shared/actions/runner_list.tmpl | 2 +- web_src/css/base.css | 13 ++- web_src/css/features/gitgraph.css | 1 + web_src/css/modules/button.css | 103 +++++++----------- web_src/css/repo.css | 13 +-- web_src/css/repo/clone.css | 3 +- web_src/css/repo/header.css | 44 -------- web_src/css/repo/list-header.css | 5 +- web_src/js/components/DiffCommitSelector.vue | 2 +- .../js/components/RepoBranchTagSelector.vue | 4 +- 22 files changed, 98 insertions(+), 166 deletions(-) diff --git a/templates/devtest/gitea-ui.tmpl b/templates/devtest/gitea-ui.tmpl index 5b40268761..7a435cc433 100644 --- a/templates/devtest/gitea-ui.tmpl +++ b/templates/devtest/gitea-ui.tmpl @@ -9,16 +9,16 @@ silenced

Button

-
- Style: - - - - + ".ui.button" styles: +
+ + + +
-
- State: - +
+ +
    diff --git a/templates/repo/clone_panel.tmpl b/templates/repo/clone_panel.tmpl index 0e3c13eaa2..e23bc8a19a 100644 --- a/templates/repo/clone_panel.tmpl +++ b/templates/repo/clone_panel.tmpl @@ -1,4 +1,4 @@ -
{{if and $.CanMarkConversation $hasReview (not $isReviewPending)}} - {{end}} {{if and $.SignedUserID (not $.Repository.IsArchived)}} - {{end}}
diff --git a/templates/repo/graph.tmpl b/templates/repo/graph.tmpl index 9eb4bd4ecb..93cb5903cf 100644 --- a/templates/repo/graph.tmpl +++ b/templates/repo/graph.tmpl @@ -45,8 +45,8 @@ {{end}}
- - + +
diff --git a/templates/repo/graph/commits.tmpl b/templates/repo/graph/commits.tmpl index 55a91ac195..630c4579ea 100644 --- a/templates/repo/graph/commits.tmpl +++ b/templates/repo/graph/commits.tmpl @@ -17,18 +17,18 @@ {{if eq $refGroup "pull"}} {{if or (not $.HidePRRefs) (SliceUtils.Contains $.SelectedBranches .Name)}} - + {{svg "octicon-git-pull-request"}} #{{.ShortName}} {{end}} {{else if eq $refGroup "tags"}} {{- template "repo/tag/name" dict "RepoLink" $.Repository.Link "TagName" .ShortName -}} {{else if eq $refGroup "remotes"}} - + {{svg "octicon-cross-reference"}} {{.ShortName}} {{else if eq $refGroup "heads"}} - + {{svg "octicon-git-branch"}} {{.ShortName}} {{else}} diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index c7c53b4f5d..929f41b93f 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -38,20 +38,20 @@ {{if not (or .IsBeingCreated .IsBroken)}} -
+
{{if $.RepoTransfer}}
{{$.CsrfTokenHtml}} -
-
{{$.CsrfTokenHtml}} -
-
diff --git a/templates/repo/issue/view_content/conversation.tmpl b/templates/repo/issue/view_content/conversation.tmpl index 32e9811335..6eb0e21953 100644 --- a/templates/repo/issue/view_content/conversation.tmpl +++ b/templates/repo/issue/view_content/conversation.tmpl @@ -109,7 +109,7 @@
{{end}}
-
+
{{if $resolved}}
@@ -118,7 +118,7 @@
{{end}}
-
+
{{if and $.CanMarkConversation $hasReview (not $isReviewPending)}} {{end}} {{if and $.SignedUserID (not $.Repository.IsArchived)}} - {{end}}
diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index 8b6aa252af..f61a8ef9e7 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -100,7 +100,7 @@
{{ctx.Locale.Tr "repo.release.prerelease_helper"}}
-
+
{{if .PageIsEditRelease}} {{ctx.Locale.Tr "repo.release.cancel"}} diff --git a/templates/repo/release_tag_header.tmpl b/templates/repo/release_tag_header.tmpl index fb17cf44c4..12acf4bfeb 100644 --- a/templates/repo/release_tag_header.tmpl +++ b/templates/repo/release_tag_header.tmpl @@ -2,7 +2,7 @@ {{$canReadCode := $.Permission.CanRead ctx.Consts.RepoUnitTypeCode}} {{if $canReadReleases}} -
+

{{ctx.Locale.PrettyNumber .NumReleases}} {{ctx.Locale.TrN .NumReleases "repo.release" "repo.releases"}} diff --git a/templates/repo/star_unstar.tmpl b/templates/repo/star_unstar.tmpl index 9234a0d196..a58fca1fcc 100644 --- a/templates/repo/star_unstar.tmpl +++ b/templates/repo/star_unstar.tmpl @@ -1,4 +1,4 @@ - +
{{$buttonText := ctx.Locale.Tr "repo.star"}} {{if $.IsStaringRepo}}{{$buttonText = ctx.Locale.Tr "repo.unstar"}}{{end}} diff --git a/templates/repo/watch_unwatch.tmpl b/templates/repo/watch_unwatch.tmpl index 465cd91c2b..4c16898730 100644 --- a/templates/repo/watch_unwatch.tmpl +++ b/templates/repo/watch_unwatch.tmpl @@ -1,4 +1,4 @@ - +
{{$buttonText := ctx.Locale.Tr "repo.watch"}} {{if $.IsWatchingRepo}}{{$buttonText = ctx.Locale.Tr "repo.unwatch"}}{{end}} diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index 6436643ee7..b8f31de43b 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -16,7 +16,7 @@
Registration Token
-
+