tom/forkjo
tom/forkjo
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

Merge pull request '[v7.0/forgejo] Fix New issue button position consistency' (#2930) from bp-v7.0/forgejo-892fc82 into v7.0/forgejo

Browse source 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2930
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
This commit is contained in:
Earl Warren 2024-03-31 09:45:48 +00:00
commit e628d0e54b
5 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
templates/repo/issue/list.tmpl
View file

@ -14,7 +14,7 @@
</div> </div>
{{end}} {{end}}
<div class="list-header"> <div class="list-header list-header-issues">
{{template "repo/issue/navbar" .}} {{template "repo/issue/navbar" .}}
{{template "repo/issue/search" .}} {{template "repo/issue/search" .}}
{{if not .Repository.IsArchived}} {{if not .Repository.IsArchived}}

2
templates/repo/issue/view_title.tmpl
View file

@ -14,7 +14,7 @@
</h1> </h1>
<div class="issue-title-buttons"> <div class="issue-title-buttons">
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}} {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}}
<button id="edit-title" class="ui small basic button edit-button not-in-edit{{if .Issue.IsPull}} tw-mr-0{{end}}">{{ctx.Locale.Tr "repo.issues.edit"}}</button> <button id="edit-title" class="ui small basic button edit-button not-in-edit tw-mr-0">{{ctx.Locale.Tr "repo.issues.edit"}}</button>
{{end}} {{end}}
{{if not .Issue.IsPull}} {{if not .Issue.IsPull}}
<a role="button" class="ui small primary button new-issue-button tw-mr-0" href="{{.RepoLink}}/issues/new{{if .NewIssueChooseTemplate}}/choose{{end}}">{{ctx.Locale.Tr "repo.issues.new"}}</a> <a role="button" class="ui small primary button new-issue-button tw-mr-0" href="{{.RepoLink}}/issues/new{{if .NewIssueChooseTemplate}}/choose{{end}}">{{ctx.Locale.Tr "repo.issues.new"}}</a>

1
web_src/css/base.css
View file

@ -21,6 +21,7 @@
--border-radius-circle: 50%; --border-radius-circle: 50%;
--opacity-disabled: 0.55; --opacity-disabled: 0.55;
--height-loading: 16rem; --height-loading: 16rem;
--repo-header-issue-min-height: 41px;
--min-height-textarea: 132px; /* padding + 6 lines + border = calc(1.57142em + 6lh + 2px), but lh is not fully supported */ --min-height-textarea: 132px; /* padding + 6 lines + border = calc(1.57142em + 6lh + 2px), but lh is not fully supported */
--tab-size: 4; --tab-size: 4;
} }

8
web_src/css/repo.css
View file

@ -569,6 +569,10 @@
display: flex; display: flex;
} }
.issue-title-buttons {
gap: 0.5rem;
}
@media (max-width: 767.98px) { @media (max-width: 767.98px) {
.repository.view.issue .issue-title { .repository.view.issue .issue-title {
flex-direction: column; flex-direction: column;
@ -611,7 +615,7 @@
line-height: 40px; line-height: 40px;
margin: 0; margin: 0;
padding-right: 0.25rem; padding-right: 0.25rem;
min-height: 41px; /* avoid layout shift on edit */ min-height: var(--repo-header-issue-min-height);
} }
.repository.view.issue .issue-title h1 .ui.input { .repository.view.issue .issue-title h1 .ui.input {
@ -2180,7 +2184,7 @@
margin: 0 !important; margin: 0 !important;
position: relative; position: relative;
color: var(--color-text); color: var(--color-text);
min-height: 41px; min-height: var(--repo-header-issue-min-height);
background-color: var(--color-box-header); background-color: var(--color-box-header);
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;

8
web_src/css/repo/issue-list.css
View file

@ -16,6 +16,14 @@
flex-wrap: wrap; flex-wrap: wrap;
} }
.issue-list-new.button {
margin-right: 0;
}
.list-header-issues {
min-height: var(--repo-header-issue-min-height);
}
@media (max-width: 767.98px) { @media (max-width: 767.98px) {
.issue-list-navbar { .issue-list-navbar {
order: 0; order: 0;