From f31879069f7db9250232009cee06c88179d6ee19 Mon Sep 17 00:00:00 2001
From: Giteabot <teabot@gitea.io>
Date: Fri, 19 Apr 2024 03:58:37 +0800
Subject: [PATCH] Improve "Reference in new issue" modal (#30547) (#30574)
Backport #30547 by @silverwind
Fixes: https://github.com/go-gitea/gitea/issues/29994
Also some misc enhancements done to the form in the modal.
<img width="840" alt="Screenshot 2024-04-17 at 23 02 55"
src="https://github.com/go-gitea/gitea/assets/115237/e71fba55-55cd-4e48-a497-6b1025c36a43">
Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit 42019677e6cce6ae44a922e68b91d2a002450fa0)
---
.../view_content/reference_issue_dialog.tmpl | 34 +++++++++----------
web_src/css/base.css | 7 ++++
2 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/templates/repo/issue/view_content/reference_issue_dialog.tmpl b/templates/repo/issue/view_content/reference_issue_dialog.tmpl
index 5f338f6768..f6ac4192ab 100644
--- a/templates/repo/issue/view_content/reference_issue_dialog.tmpl
+++ b/templates/repo/issue/view_content/reference_issue_dialog.tmpl
@@ -5,26 +5,24 @@
<div class="content tw-text-left">
<form class="ui form form-fetch-action" action="{{printf "%s/issues/new" .Repository.Link}}" method="post">
{{.CsrfTokenHtml}}
- <div class="ui segment content">
- <div class="field">
- <span class="text"><strong>{{ctx.Locale.Tr "repository"}}</strong></span>
- <div class="ui search normal selection dropdown issue_reference_repository_search">
- <div class="default text">{{.Repository.FullName}}</div>
- <div class="menu"></div>
- </div>
- </div>
- <div class="field">
- <span class="text"><strong>{{ctx.Locale.Tr "repo.milestones.title"}}</strong></span>
- <input name="title" value="" autofocus required maxlength="255" autocomplete="off">
- </div>
- <div class="field">
- <span class="text"><strong>{{ctx.Locale.Tr "repo.issues.reference_issue.body"}}</strong></span>
- <textarea name="content" class="form-control"></textarea>
- </div>
- <div class="text right">
- <button class="ui primary button">{{ctx.Locale.Tr "repo.issues.create"}}</button>
+ <div class="field">
+ <label><strong>{{ctx.Locale.Tr "repository"}}</strong></label>
+ <div class="ui search selection dropdown issue_reference_repository_search">
+ <div class="default text">{{.Repository.FullName}}</div>
+ <div class="menu"></div>
</div>
</div>
+ <div class="field">
+ <label><strong>{{ctx.Locale.Tr "repo.milestones.title"}}</strong></label>
+ <input name="title" value="" autofocus required maxlength="255" autocomplete="off">
+ </div>
+ <div class="field">
+ <label><strong>{{ctx.Locale.Tr "repo.issues.reference_issue.body"}}</strong></label>
+ <textarea name="content" class="form-control"></textarea>
+ </div>
+ <div class="text right">
+ <button class="ui primary button">{{ctx.Locale.Tr "repo.issues.create"}}</button>
+ </div>
</form>
</div>
</div>
diff --git a/web_src/css/base.css b/web_src/css/base.css
index a1f9c087fd..7c13f352cd 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -496,6 +496,7 @@ ol.ui.list li,
.ui.selection.dropdown .menu > .item {
border-color: var(--color-secondary);
+ white-space: nowrap;
}
.ui.selection.visible.dropdown > .text:not(.default) {
@@ -517,6 +518,12 @@ ol.ui.list li,
color: var(--color-text-light-2);
}
+.ui.dropdown > .text {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
/* extend fomantic style '.ui.dropdown > .text > img' to include svg.img */
.ui.dropdown > .text > .img {
margin-left: 0;