Fix issue sidebar (#32455)

Fix #32453

Major changes:

* revert the `<div class="divider"></div>` in
`templates/repo/issue/branch_selector_field.tmpl` (it was removed by
mistake in ##32444)
* remove incorrect `<div class="inline field">` in
`templates/repo/issue/sidebar/allow_maintainer_edit.tmpl`
* use `gt-ellipsis` to replace the "title" class in the dependency list,
then `.repository .issue-content-right .ui.list .title` could be removed
* remove the "relaxed" from dependency list, then there is no padding,
then `.repository .issue-content-right .ui.list .dependency` could be
removed (`white-space` doesn't have effect either because there is
`gt-ellipsis`)
* remove dead code `.repository .issue-content-right #deadlineForm input
`

The fixed UI should be the same as before.

diff --git a/templates/repo/issue/branch_selector_field.tmpl b/templates/repo/issue/branch_selector_field.tmpl
index 643222ca72cc9debeafc937df164d3bcf9aa4bfb..286ac0cd051df0d61ae19b1babce970f2e30c5ab 100644 (file)
--- a/templates/repo/issue/branch_selector_field.tmpl
+++ b/templates/repo/issue/branch_selector_field.tmpl
@@ -44,4 +44,5 @@
                </div>
        </div>
 </div>
+<div class="divider"></div>
 {{end}}

diff --git a/templates/repo/issue/sidebar/allow_maintainer_edit.tmpl b/templates/repo/issue/sidebar/allow_maintainer_edit.tmpl
index 43736deeed8a965887589018c1686e329d03d13c..ad4ce96a475527408eb520c7d36de03e033b08bc 100644 (file)
--- a/templates/repo/issue/sidebar/allow_maintainer_edit.tmpl
+++ b/templates/repo/issue/sidebar/allow_maintainer_edit.tmpl
@@ -1,15 +1,13 @@
 {{if and .Issue.IsPull .IsIssuePoster (not .Issue.IsClosed) .Issue.PullRequest.HeadRepo}}
        {{if and (not (eq .Issue.PullRequest.HeadRepo.FullName .Issue.PullRequest.BaseRepo.FullName)) .CanWriteToHeadRepo}}
        <div class="divider"></div>
-       <div class="inline field">
-               <div class="ui checkbox loading-icon-2px" id="allow-edits-from-maintainers"
-                               data-url="{{.Issue.Link}}"
-                               data-tooltip-content="{{ctx.Locale.Tr "repo.pulls.allow_edits_from_maintainers_desc"}}"
-                               data-prompt-error="{{ctx.Locale.Tr "repo.pulls.allow_edits_from_maintainers_err"}}"
-               >
-                       <label><strong>{{ctx.Locale.Tr "repo.pulls.allow_edits_from_maintainers"}}</strong></label>
-                       <input type="checkbox" {{if .Issue.PullRequest.AllowMaintainerEdit}}checked{{end}}>
-               </div>
+       <div class="ui checkbox loading-icon-2px" id="allow-edits-from-maintainers"
+                       data-url="{{.Issue.Link}}"
+                       data-tooltip-content="{{ctx.Locale.Tr "repo.pulls.allow_edits_from_maintainers_desc"}}"
+                       data-prompt-error="{{ctx.Locale.Tr "repo.pulls.allow_edits_from_maintainers_err"}}"
+       >
+               <label><strong>{{ctx.Locale.Tr "repo.pulls.allow_edits_from_maintainers"}}</strong></label>
+               <input type="checkbox" {{if .Issue.PullRequest.AllowMaintainerEdit}}checked{{end}}>
        </div>
        {{end}}
 {{end}}

diff --git a/templates/repo/issue/sidebar/issue_dependencies.tmpl b/templates/repo/issue/sidebar/issue_dependencies.tmpl
index f372ff81b2a981fcdec1a7fc280c7007740beb34..837bcd56705d25ae5f963450d74e22e811de70da 100644 (file)
--- a/templates/repo/issue/sidebar/issue_dependencies.tmpl
+++ b/templates/repo/issue/sidebar/issue_dependencies.tmpl
@@ -18,11 +18,11 @@
                        <span class="text" data-tooltip-content="{{if .Issue.IsPull}}{{ctx.Locale.Tr "repo.issues.dependency.pr_close_blocks"}}{{else}}{{ctx.Locale.Tr "repo.issues.dependency.issue_close_blocks"}}{{end}}">
                                <strong>{{ctx.Locale.Tr "repo.issues.dependency.blocks_short"}}</strong>
                        </span>
-                       <div class="ui relaxed divided list">
+                       <div class="ui divided list">
                                {{range .BlockingDependencies}}
                                        <div class="item dependency{{if .Issue.IsClosed}} is-closed{{end}} tw-flex tw-items-center tw-justify-between">
                                                <div class="item-left tw-flex tw-justify-center tw-flex-col tw-flex-1 gt-ellipsis">
-                                                       <a class="title muted" href="{{.Issue.Link}}" data-tooltip-content="#{{.Issue.Index}} {{.Issue.Title | ctx.RenderUtils.RenderEmoji}}">
+                                                       <a class="muted gt-ellipsis" href="{{.Issue.Link}}" data-tooltip-content="#{{.Issue.Index}} {{.Issue.Title | ctx.RenderUtils.RenderEmoji}}">
                                                                #{{.Issue.Index}} {{.Issue.Title | ctx.RenderUtils.RenderEmoji}}
                                                        </a>
                                                        <div class="text small gt-ellipsis" data-tooltip-content="{{.Repository.OwnerName}}/{{.Repository.Name}}">
@@ -50,11 +50,11 @@
                        <span class="text" data-tooltip-content="{{if .Issue.IsPull}}{{ctx.Locale.Tr "repo.issues.dependency.pr_closing_blockedby"}}{{else}}{{ctx.Locale.Tr "repo.issues.dependency.issue_closing_blockedby"}}{{end}}">
                                <strong>{{ctx.Locale.Tr "repo.issues.dependency.blocked_by_short"}}</strong>
                        </span>
-                       <div class="ui relaxed divided list">
+                       <div class="ui divided list">
                                {{range .BlockedByDependencies}}
                                        <div class="item dependency{{if .Issue.IsClosed}} is-closed{{end}} tw-flex tw-items-center tw-justify-between">
                                                <div class="item-left tw-flex tw-justify-center tw-flex-col tw-flex-1 gt-ellipsis">
-                                                       <a class="title muted" href="{{.Issue.Link}}" data-tooltip-content="#{{.Issue.Index}} {{.Issue.Title | ctx.RenderUtils.RenderEmoji}}">
+                                                       <a class="muted gt-ellipsis" href="{{.Issue.Link}}" data-tooltip-content="#{{.Issue.Index}} {{.Issue.Title | ctx.RenderUtils.RenderEmoji}}">
                                                                #{{.Issue.Index}} {{.Issue.Title | ctx.RenderUtils.RenderEmoji}}
                                                        </a>
                                                        <div class="text small gt-ellipsis" data-tooltip-content="{{.Repository.OwnerName}}/{{.Repository.Name}}">
@@ -76,7 +76,7 @@
                                                        <div class="item-left tw-flex tw-justify-center tw-flex-col tw-flex-1 gt-ellipsis">
                                                                <div class="gt-ellipsis">
                                                                        <span data-tooltip-content="{{ctx.Locale.Tr "repo.issues.dependency.no_permission.can_remove"}}">{{svg "octicon-lock" 16}}</span>
-                                                                       <span class="title" data-tooltip-content="#{{.Issue.Index}} {{.Issue.Title | ctx.RenderUtils.RenderEmoji}}">
+                                                                       <span class="gt-ellipsis" data-tooltip-content="#{{.Issue.Index}} {{.Issue.Title | ctx.RenderUtils.RenderEmoji}}">
                                                                                #{{.Issue.Index}} {{.Issue.Title | ctx.RenderUtils.RenderEmoji}}
                                                                        </span>
                                                                </div>

diff --git a/web_src/css/repo.css b/web_src/css/repo.css
index 85f33f858e2ecedc462f70959ec5fcc47b4e2a0f..61aa99d531fb21f25c73b1b550b1c7e1267751fe 100644 (file)
--- a/web_src/css/repo.css
+++ b/web_src/css/repo.css
@@ -62,23 +62,6 @@
   }
 }
 
-.repository .issue-content-right .ui.list .dependency {
-  padding: 0;
-  white-space: nowrap;
-}
-
-.repository .issue-content-right .ui.list .title {
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.repository .issue-content-right #deadlineForm input {
-  width: 12.8rem;
-  border-radius: var(--border-radius) 0 0 var(--border-radius);
-  border-right: 0;
-  white-space: nowrap;
-}
-
 .repository .issue-content-right .filter.menu {
   max-height: 500px;
   overflow-x: auto;