From 67659c5d46793ea6d40ed421e2a2f266ff6015b8 Mon Sep 17 00:00:00 2001 From: silverwind <me@silverwind.io> Date: Mon, 25 Mar 2024 14:52:54 +0100 Subject: [PATCH] Fix menu buttons in issues and release (#30056) Fix regression from https://github.com/go-gitea/gitea/pull/30033 These buttons had lost their border because `.ui.header` sets `none` but `.ui.menu` has it, after the migration, the order of styles changed and header won. I see no reason why those have the `header` class in first place, besides for semantic meaning. Before: <img width="491" alt="Screenshot 2024-03-25 at 00 39 27" src="https://github.com/go-gitea/gitea/assets/115237/fa1b7505-75cf-4854-a97f-db3c46f31e93"> After: <img width="496" alt="Screenshot 2024-03-25 at 00 39 14" src="https://github.com/go-gitea/gitea/assets/115237/8f6bdc07-9596-436b-8c82-9af283300004"> (cherry picked from commit 8717c1c2bef1afcc6b0bb2d84627b158b95836b0) --- templates/repo/issue/navbar.tmpl | 2 +- templates/repo/release_tag_header.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/issue/navbar.tmpl b/templates/repo/issue/navbar.tmpl index 16110597ed..30e42c77cc 100644 --- a/templates/repo/issue/navbar.tmpl +++ b/templates/repo/issue/navbar.tmpl @@ -1,4 +1,4 @@ -<h2 class="ui compact small menu header small-menu-items issue-list-navbar"> +<h2 class="ui compact small menu small-menu-items issue-list-navbar"> <a class="{{if .PageIsLabels}}active {{end}}item" href="{{.RepoLink}}/labels">{{ctx.Locale.Tr "repo.labels"}}</a> <a class="{{if .PageIsMilestones}}active {{end}}item" href="{{.RepoLink}}/milestones">{{ctx.Locale.Tr "repo.milestones"}}</a> </h2> diff --git a/templates/repo/release_tag_header.tmpl b/templates/repo/release_tag_header.tmpl index 7a00cbe49c..5896fdd19d 100644 --- a/templates/repo/release_tag_header.tmpl +++ b/templates/repo/release_tag_header.tmpl @@ -4,7 +4,7 @@ {{if $canReadReleases}} <div class="tw-flex"> <div class="tw-flex-1 tw-flex tw-items-center"> - <h2 class="ui compact small menu header small-menu-items"> + <h2 class="ui compact small menu small-menu-items"> <a class="{{if and .PageIsReleaseList (not .PageIsSingleTag)}}active {{end}}item" href="{{.RepoLink}}/releases">{{ctx.Locale.PrettyNumber .NumReleases}} {{ctx.Locale.TrN .NumReleases "repo.release" "repo.releases"}}</a> {{if $canReadCode}} <a class="{{if or .PageIsTagList .PageIsSingleTag}}active {{end}}item" href="{{.RepoLink}}/tags">{{ctx.Locale.PrettyNumber .NumTags}} {{ctx.Locale.TrN .NumTags "repo.tag" "repo.tags"}}</a>