From 39322d9fc4644d2ede3efe3a9c4efee2e493d4cd Mon Sep 17 00:00:00 2001 From: Giteabot <teabot@gitea.io> Date: Tue, 2 Apr 2024 20:15:50 +0800 Subject: [PATCH] Fix spacing in issue navbar (#30238) (#30242) Backport #30238 by @silverwind Create a new `issue-navbar` class specifically for this bar, previous class used in many places and I thought I had them all removed, but not this one. Fixes: https://github.com/go-gitea/gitea/issues/30226 Co-authored-by: silverwind <me@silverwind.io> --- templates/repo/issue/choose.tmpl | 2 +- templates/repo/issue/labels.tmpl | 2 +- templates/repo/issue/milestone_new.tmpl | 2 +- web_src/css/modules/navbar.css | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/templates/repo/issue/choose.tmpl b/templates/repo/issue/choose.tmpl index a8037482be..38cf9e485f 100644 --- a/templates/repo/issue/choose.tmpl +++ b/templates/repo/issue/choose.tmpl @@ -3,7 +3,7 @@ {{template "repo/header" .}} <div class="ui container"> {{template "base/alert" .}} - <div class="navbar"> + <div class="issue-navbar"> {{template "repo/issue/navbar" .}} </div> <div class="divider"></div> diff --git a/templates/repo/issue/labels.tmpl b/templates/repo/issue/labels.tmpl index 6dc7e4ef64..230777efcc 100644 --- a/templates/repo/issue/labels.tmpl +++ b/templates/repo/issue/labels.tmpl @@ -2,7 +2,7 @@ <div role="main" aria-label="{{.Title}}" class="page-content repository labels"> {{template "repo/header" .}} <div class="ui container"> - <div class="navbar tw-mb-4"> + <div class="issue-navbar tw-mb-4"> {{template "repo/issue/navbar" .}} {{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}} <button class="ui small primary new-label button">{{ctx.Locale.Tr "repo.issues.new_label"}}</button> diff --git a/templates/repo/issue/milestone_new.tmpl b/templates/repo/issue/milestone_new.tmpl index 7a56d73ac9..9f32df00e3 100644 --- a/templates/repo/issue/milestone_new.tmpl +++ b/templates/repo/issue/milestone_new.tmpl @@ -2,7 +2,7 @@ <div role="main" aria-label="{{.Title}}" class="page-content repository new milestone"> {{template "repo/header" .}} <div class="ui container"> - <div class="navbar"> + <div class="issue-navbar"> {{template "repo/issue/navbar" .}} {{if and (or .CanWriteIssues .CanWritePulls) .PageIsEditMilestone}} <div class="ui right floated secondary menu"> diff --git a/web_src/css/modules/navbar.css b/web_src/css/modules/navbar.css index f8553d7cf0..d7aa197e02 100644 --- a/web_src/css/modules/navbar.css +++ b/web_src/css/modules/navbar.css @@ -140,3 +140,8 @@ .secondary-nav { background: var(--color-secondary-nav-bg) !important; /* important because of .ui.secondary.menu */ } + +.issue-navbar { + display: flex; + justify-content: space-between; +}