linden123/githaven-fork
1
1
Fork 0
forked from Shiloh/githaven
Code Pull Requests Activity

Fix "delete" modal dialog for issue/PR (#27015)

Browse Source 
Close #27012

By the way, rename the single-word ID to a long ID.


![image](https://github.com/go-gitea/gitea/assets/2114189/9f05ecc3-0a3d-4612-85e0-da60f7a45d2e)


![image](https://github.com/go-gitea/gitea/assets/2114189/9133808c-bd89-4265-99c5-83b986bd266f)
This commit is contained in:
wxiaoguang 2023-09-12 01:06:05 +08:00 committed by GitHub
parent ebff0513db
commit 1875362383
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
templates/devtest/fomantic-modal.tmpl
View File

@ -30,6 +30,16 @@
</form> </form>
</div> </div>
<div id="test-modal-form-4" class="ui mini modal">
<div class="header">Form dialog (layout 4)</div>
<div class="content">
<div class="ui input gt-w-100"><input name="user_input"></div>
</div>
<form method="post">
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}}
</form>
</div>
<div class="ui g-modal-confirm modal" id="test-modal-default"> <div class="ui g-modal-confirm modal" id="test-modal-default">
<div class="header">{{svg "octicon-file"}} Default dialog <span>title</span></div> <div class="header">{{svg "octicon-file"}} Default dialog <span>title</span></div>
<div class="content"> <div class="content">

4
templates/repo/issue/view_content/sidebar.tmpl
View File

@ -655,11 +655,11 @@
</form> </form>
</div> </div>
</div> </div>
<button class="gt-mt-2 fluid ui show-modal button" data-modal="#delete"> <button class="gt-mt-2 fluid ui show-modal button" data-modal="#sidebar-delete-issue">
{{svg "octicon-trash"}} {{svg "octicon-trash"}}
{{.locale.Tr "repo.issues.delete"}} {{.locale.Tr "repo.issues.delete"}}
</button> </button>
<div class="ui g-modal-confirm modal" id="delete"> <div class="ui g-modal-confirm modal" id="sidebar-delete-issue">
<div class="header"> <div class="header">
{{if .Issue.IsPull}} {{if .Issue.IsPull}}
{{.locale.Tr "repo.pulls.delete.title"}} {{.locale.Tr "repo.pulls.delete.title"}}

4
web_src/css/modules/modal.css
View File

@ -36,6 +36,7 @@ However, Gitea uses the following layouts:
* <div .modal><div .content><div .actions/></div></div> * <div .modal><div .content><div .actions/></div></div>
* <div .modal><form><div .content/><div .actions/></form></div> * <div .modal><form><div .content/><div .actions/></form></div>
* <div .modal><div .content><form><div .actions/></form></div></div> * <div .modal><div .content><form><div .actions/></form></div></div>
* <div .modal><div .content></div><form><div .actions/></form></div>
* ... * ...
These inconsistent layouts should be refactored to simple ones. These inconsistent layouts should be refactored to simple ones.
*/ */
@ -47,7 +48,8 @@ These inconsistent layouts should be refactored to simple ones.
} }
.ui.modal > .actions, .ui.modal > .actions,
.ui.modal .content + .actions { .ui.modal .content + .actions,
.ui.modal .content + form > .actions {
background: var(--color-secondary-bg); background: var(--color-secondary-bg);
border-color: var(--color-secondary); border-color: var(--color-secondary);
padding: 1rem; padding: 1rem;