From efdcf29e44a88e08b6ced14a0bc3aeaafab3d6dd Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 27 Jun 2023 19:08:12 +0200 Subject: [PATCH 1/8] Replace fomantic divider module with our own --- templates/repo/activity.tmpl | 2 +- web_src/css/admin.css | 5 - web_src/css/base.css | 9 - web_src/css/index.css | 1 + web_src/css/modules/divider.css | 37 ++++ web_src/css/repo.css | 7 +- web_src/fomantic/build/semantic.css | 296 ---------------------------- web_src/fomantic/semantic.json | 1 - 8 files changed, 41 insertions(+), 317 deletions(-) create mode 100644 web_src/css/modules/divider.css diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl index ed29ece137811..c4d93a4931de1 100644 --- a/templates/repo/activity.tmpl +++ b/templates/repo/activity.tmpl @@ -116,7 +116,7 @@ {{if gt .Activity.PublishedReleaseCount 0}}

- {{svg "octicon-tag"}} + {{svg "octicon-tag" 16 "gt-mr-3"}} {{.locale.Tr "repo.activity.title.releases_published_by" (.locale.TrN .Activity.PublishedReleaseCount "repo.activity.title.releases_1" "repo.activity.title.releases_n" .Activity.PublishedReleaseCount) (.locale.TrN .Activity.PublishedReleaseAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.PublishedReleaseAuthorCount) diff --git a/web_src/css/admin.css b/web_src/css/admin.css index 58e05273504d6..07c0190f52538 100644 --- a/web_src/css/admin.css +++ b/web_src/css/admin.css @@ -15,11 +15,6 @@ flex-wrap: wrap; } -/* divider needs explicit width because the parent container is "display: flex" */ -.admin dl.admin-dl-horizontal .ui.divider { - width: 100%; -} - .admin dl.admin-dl-horizontal dt, .admin dl.admin-dl-horizontal dd { line-height: 1; diff --git a/web_src/css/base.css b/web_src/css/base.css index 4e2cd373d7de2..c6775cee68e50 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -448,15 +448,6 @@ a.label, background-color: var(--color-markup-code-block); } -.ui.divider { - color: var(--color-text); -} - -.ui.divider:not(.vertical,.horizontal) { - border-top-color: var(--color-secondary) !important; - border-bottom: none !important; -} - .ui.dividing.header { border-bottom-color: var(--color-secondary); } diff --git a/web_src/css/index.css b/web_src/css/index.css index d7ac9f453d7d4..6a3e7d0dd5bfd 100644 --- a/web_src/css/index.css +++ b/web_src/css/index.css @@ -9,6 +9,7 @@ @import "./modules/comment.css"; @import "./modules/navbar.css"; @import "./modules/toast.css"; +@import "./modules/divider.css"; @import "./shared/issuelist.css"; @import "./shared/milestone.css"; diff --git a/web_src/css/modules/divider.css b/web_src/css/modules/divider.css new file mode 100644 index 0000000000000..4bcd3a6666026 --- /dev/null +++ b/web_src/css/modules/divider.css @@ -0,0 +1,37 @@ +.ui.divider { + margin: 1rem 0; + line-height: 1; + height: 0; + font-weight: var(--font-weight-medium); + text-transform: uppercase; + color: var(--color-text); + user-select: none; + font-size: 1rem; + width: 100%; +} + +.ui.divider:not(.horizontal) { + border-top: 1px solid var(--color-secondary); +} + +.ui.horizontal.divider { + display: flex; + align-items: center; + padding: 7px 0; +} + +.ui.horizontal.divider::before, +.ui.horizontal.divider::after { + content: ""; + height: 1px; + flex: 1; + border-bottom: 1px solid var(--color-secondary); +} + +.ui.horizontal.divider::before { + margin-right: .75em; +} + +.ui.horizontal.divider::after { + margin-left: .75em; +} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 825711465ecaf..8c2932d1fba94 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -138,10 +138,6 @@ background-color: var(--color-header-wrapper); } -.repository .header-wrapper .ui.tabs.divider { - border-bottom: 0; -} - .repository .header-wrapper .ui.tabular .svg { margin-right: 5px; } @@ -591,6 +587,7 @@ .repository.options .danger .ui.divider { margin: 0; + border-color: var(--color-error-border); } .repository.new.issue .comment.form .comment .avatar { @@ -1012,7 +1009,7 @@ .repository.view.issue .comment-list .comment .merge-section .divider { margin-left: -1rem; - margin-right: -1rem; + width: calc(100% + 2rem); } .repository.view.issue .comment-list .comment .merge-section.no-header::before, diff --git a/web_src/fomantic/build/semantic.css b/web_src/fomantic/build/semantic.css index c9a5fd4d92a31..c96c337988788 100644 --- a/web_src/fomantic/build/semantic.css +++ b/web_src/fomantic/build/semantic.css @@ -3631,302 +3631,6 @@ body.dimmable > .dimmer { /******************************* User Overrides *******************************/ -/*! - * # Fomantic-UI - Divider - * http://github.com/fomantic/Fomantic-UI/ - * - * - * Released under the MIT license - * http://opensource.org/licenses/MIT - * - */ - -/******************************* - Divider -*******************************/ - -.ui.divider { - margin: 1rem 0; - line-height: 1; - height: 0; - font-weight: 500; - text-transform: uppercase; - letter-spacing: 0.05em; - color: rgba(0, 0, 0, 0.85); - -webkit-user-select: none; - -moz-user-select: none; - user-select: none; - -webkit-tap-highlight-color: rgba(0, 0, 0, 0); -} - -/*-------------- - Basic ----------------*/ - -.ui.divider:not(.vertical):not(.horizontal) { - border-top: 1px solid rgba(34, 36, 38, 0.15); - border-bottom: 1px solid rgba(255, 255, 255, 0.1); -} - -/*-------------- - Coupling ----------------*/ - -/* Allow divider between each column row */ - -.ui.grid > .column + .divider, -.ui.grid > .row > .column + .divider { - left: auto; -} - -/*-------------- - Horizontal - ---------------*/ - -.ui.horizontal.divider { - display: table; - white-space: nowrap; - height: auto; - margin: ''; - line-height: 1; - text-align: center; -} - -.ui.horizontal.divider:before, -.ui.horizontal.divider:after { - content: ''; - display: table-cell; - position: relative; - top: 50%; - width: 50%; - background-repeat: no-repeat; -} - -.ui.horizontal.divider:before { - background-position: right 1em top 50%; -} - -.ui.horizontal.divider:after { - background-position: left 1em top 50%; -} - -/*-------------- - Vertical - ---------------*/ - -.ui.vertical.divider { - position: absolute; - z-index: 2; - top: 50%; - left: 50%; - margin: 0; - padding: 0; - width: auto; - height: 50%; - line-height: 0; - text-align: center; - transform: translateX(-50%); -} - -.ui.vertical.divider:before, -.ui.vertical.divider:after { - position: absolute; - left: 50%; - content: ''; - z-index: 3; - border-left: 1px solid rgba(34, 36, 38, 0.15); - border-right: 1px solid rgba(255, 255, 255, 0.1); - width: 0; - height: calc(100% - 1rem); -} - -.ui.vertical.divider:before { - top: -100%; -} - -.ui.vertical.divider:after { - top: auto; - bottom: 0; -} - -/* Inside grid */ - -@media only screen and (max-width: 767.98px) { - .ui.stackable.grid .ui.vertical.divider, - .ui.grid .stackable.row .ui.vertical.divider { - display: table; - white-space: nowrap; - height: auto; - margin: ''; - overflow: hidden; - line-height: 1; - text-align: center; - position: static; - top: 0; - left: 0; - transform: none; - } - - .ui.stackable.grid .ui.vertical.divider:before, - .ui.grid .stackable.row .ui.vertical.divider:before, - .ui.stackable.grid .ui.vertical.divider:after, - .ui.grid .stackable.row .ui.vertical.divider:after { - left: 0; - border-left: none; - border-right: none; - content: ''; - display: table-cell; - position: relative; - top: 50%; - width: 50%; - background-repeat: no-repeat; - } - - .ui.stackable.grid .ui.vertical.divider:before, - .ui.grid .stackable.row .ui.vertical.divider:before { - background-position: right 1em top 50%; - } - - .ui.stackable.grid .ui.vertical.divider:after, - .ui.grid .stackable.row .ui.vertical.divider:after { - background-position: left 1em top 50%; - } -} - -/*-------------- - Icon - ---------------*/ - -.ui.divider > .icon { - margin: 0; - font-size: 1rem; - height: 1em; - vertical-align: middle; -} - -/*-------------- - Header - ---------------*/ - -.ui.horizontal.divider[class*="left aligned"]:before { - display: none; -} - -.ui.horizontal.divider[class*="left aligned"]:after { - width: 100%; -} - -.ui.horizontal.divider[class*="right aligned"]:before { - width: 100%; -} - -.ui.horizontal.divider[class*="right aligned"]:after { - display: none; -} - -/******************************* - Variations -*******************************/ - -/*-------------- - Hidden - ---------------*/ - -.ui.hidden.divider { - border-color: transparent !important; -} - -.ui.hidden.divider:before, -.ui.hidden.divider:after { - display: none; -} - -/*-------------- - Inverted ----------------*/ - -/*-------------- - Fitted ----------------*/ - -.ui.fitted.divider { - margin: 0; -} - -/*-------------- - Clearing - ---------------*/ - -.ui.clearing.divider { - clear: both; -} - -/*-------------- - Section - ---------------*/ - -.ui.section.divider { - margin-top: 2rem; - margin-bottom: 2rem; -} - -/*-------------- - Sizes ----------------*/ - -.ui.divider { - font-size: 1rem; -} - -.ui.mini.divider { - font-size: 0.78571429rem; -} - -.ui.tiny.divider { - font-size: 0.85714286rem; -} - -.ui.small.divider { - font-size: 0.92857143rem; -} - -.ui.large.divider { - font-size: 1.14285714rem; -} - -.ui.big.divider { - font-size: 1.28571429rem; -} - -.ui.huge.divider { - font-size: 1.42857143rem; -} - -.ui.massive.divider { - font-size: 1.71428571rem; -} - -/******************************* - Theme Overrides -*******************************/ - -.ui.horizontal.divider:before, -.ui.horizontal.divider:after { - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABaAAAAACCAYAAACuTHuKAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyFpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChXaW5kb3dzKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo1OThBRDY4OUNDMTYxMUU0OUE3NUVGOEJDMzMzMjE2NyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo1OThBRDY4QUNDMTYxMUU0OUE3NUVGOEJDMzMzMjE2NyI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjU5OEFENjg3Q0MxNjExRTQ5QTc1RUY4QkMzMzMyMTY3IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjU5OEFENjg4Q0MxNjExRTQ5QTc1RUY4QkMzMzMyMTY3Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+VU513gAAADVJREFUeNrs0DENACAQBDBIWLGBJQby/mUcJn5sJXQmOQMAAAAAAJqt+2prAAAAAACg2xdgANk6BEVuJgyMAAAAAElFTkSuQmCC'); -} - -@media only screen and (max-width: 767px) { - .ui.stackable.grid .ui.vertical.divider:before, - .ui.grid .stackable.row .ui.vertical.divider:before, - .ui.stackable.grid .ui.vertical.divider:after, - .ui.grid .stackable.row .ui.vertical.divider:after { - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABaAAAAACCAYAAACuTHuKAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyFpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChXaW5kb3dzKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo1OThBRDY4OUNDMTYxMUU0OUE3NUVGOEJDMzMzMjE2NyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo1OThBRDY4QUNDMTYxMUU0OUE3NUVGOEJDMzMzMjE2NyI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjU5OEFENjg3Q0MxNjExRTQ5QTc1RUY4QkMzMzMyMTY3IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjU5OEFENjg4Q0MxNjExRTQ5QTc1RUY4QkMzMzMyMTY3Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+VU513gAAADVJREFUeNrs0DENACAQBDBIWLGBJQby/mUcJn5sJXQmOQMAAAAAAJqt+2prAAAAAACg2xdgANk6BEVuJgyMAAAAAElFTkSuQmCC'); - } -} - -/******************************* - Site Overrides -*******************************/ /*! * # Fomantic-UI - Dropdown * http://github.com/fomantic/Fomantic-UI/ diff --git a/web_src/fomantic/semantic.json b/web_src/fomantic/semantic.json index be7519c308611..d18ace5aa71b3 100644 --- a/web_src/fomantic/semantic.json +++ b/web_src/fomantic/semantic.json @@ -26,7 +26,6 @@ "checkbox", "container", "dimmer", - "divider", "dropdown", "form", "grid", From 574587be54f2347c547f141db32196167209e41d Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 27 Jun 2023 19:13:40 +0200 Subject: [PATCH 2/8] allow text selection --- web_src/css/modules/divider.css | 1 - 1 file changed, 1 deletion(-) diff --git a/web_src/css/modules/divider.css b/web_src/css/modules/divider.css index 4bcd3a6666026..3d562ae79de99 100644 --- a/web_src/css/modules/divider.css +++ b/web_src/css/modules/divider.css @@ -5,7 +5,6 @@ font-weight: var(--font-weight-medium); text-transform: uppercase; color: var(--color-text); - user-select: none; font-size: 1rem; width: 100%; } From 9a6523fcaa9579a05365d89f3bb5ff2fda6b469d Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 27 Jun 2023 19:19:37 +0200 Subject: [PATCH 3/8] remove unnecessary line-height --- web_src/css/modules/divider.css | 1 - 1 file changed, 1 deletion(-) diff --git a/web_src/css/modules/divider.css b/web_src/css/modules/divider.css index 3d562ae79de99..9d6f107c51445 100644 --- a/web_src/css/modules/divider.css +++ b/web_src/css/modules/divider.css @@ -1,6 +1,5 @@ .ui.divider { margin: 1rem 0; - line-height: 1; height: 0; font-weight: var(--font-weight-medium); text-transform: uppercase; From a48e610a82e9a4233a6f089451917fb4de598148 Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 27 Jun 2023 19:21:21 +0200 Subject: [PATCH 4/8] fix more divider icons in activity --- templates/repo/activity.tmpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl index c4d93a4931de1..7ab7711107525 100644 --- a/templates/repo/activity.tmpl +++ b/templates/repo/activity.tmpl @@ -138,7 +138,7 @@ {{if gt .Activity.MergedPRCount 0}}

- {{svg "octicon-git-pull-request"}} + {{svg "octicon-git-pull-request" 16 "gt-mr-3"}} {{.locale.Tr "repo.activity.title.prs_merged_by" (.locale.TrN .Activity.MergedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.MergedPRCount) (.locale.TrN .Activity.MergedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.MergedPRAuthorCount) @@ -157,7 +157,7 @@ {{if gt .Activity.OpenedPRCount 0}}

- {{svg "octicon-git-branch"}} + {{svg "octicon-git-branch" 16 "gt-mr-3"}} {{.locale.Tr "repo.activity.title.prs_opened_by" (.locale.TrN .Activity.OpenedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.OpenedPRCount) (.locale.TrN .Activity.OpenedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedPRAuthorCount) @@ -176,7 +176,7 @@ {{if gt .Activity.ClosedIssueCount 0}}

- {{svg "octicon-issue-closed"}} + {{svg "octicon-issue-closed" 16 "gt-mr-3"}} {{.locale.Tr "repo.activity.title.issues_closed_from" (.locale.TrN .Activity.ClosedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.ClosedIssueCount) (.locale.TrN .Activity.ClosedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.ClosedIssueAuthorCount) @@ -195,7 +195,7 @@ {{if gt .Activity.OpenedIssueCount 0}}

- {{svg "octicon-issue-opened"}} + {{svg "octicon-issue-opened" 16 "gt-mr-3"}} {{.locale.Tr "repo.activity.title.issues_created_by" (.locale.TrN .Activity.OpenedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.OpenedIssueCount) (.locale.TrN .Activity.OpenedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedIssueAuthorCount) @@ -214,7 +214,7 @@ {{if gt .Activity.UnresolvedIssueCount 0}}

- {{svg "octicon-comment-discussion"}} + {{svg "octicon-comment-discussion" 16 "gt-mr-3"}} {{.locale.TrN .Activity.UnresolvedIssueCount "repo.activity.title.unresolved_conv_1" "repo.activity.title.unresolved_conv_n" .Activity.UnresolvedIssueCount}}

From 737981605c0a5626646038c296aabc22205e6542 Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 27 Jun 2023 19:24:48 +0200 Subject: [PATCH 5/8] use border-top for consistency --- web_src/css/modules/divider.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/modules/divider.css b/web_src/css/modules/divider.css index 9d6f107c51445..3d532375191f5 100644 --- a/web_src/css/modules/divider.css +++ b/web_src/css/modules/divider.css @@ -23,7 +23,7 @@ content: ""; height: 1px; flex: 1; - border-bottom: 1px solid var(--color-secondary); + border-top: 1px solid var(--color-secondary); } .ui.horizontal.divider::before { From 64653adc777bd05c0ce3c0f05c9614efac4c5654 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 28 Jun 2023 19:11:09 +0200 Subject: [PATCH 6/8] move style --- web_src/css/base.css | 5 ----- web_src/css/modules/divider.css | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index dac47b34717d9..81ada7dca8044 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -2056,11 +2056,6 @@ table th[data-sortt-desc] .svg { border-radius: 0 0 var(--border-radius) var(--border-radius); } -.ui.dropdown .menu > .divider { - border-top: 1px solid var(--color-secondary); - margin: 4px 0; -} - .ui.multiple.dropdown > .label { box-shadow: 0 0 0 1px var(--color-secondary) inset; } diff --git a/web_src/css/modules/divider.css b/web_src/css/modules/divider.css index 3d532375191f5..3ffee17d44e02 100644 --- a/web_src/css/modules/divider.css +++ b/web_src/css/modules/divider.css @@ -33,3 +33,8 @@ .ui.horizontal.divider::after { margin-left: .75em; } + +.ui.dropdown .menu > .divider { + border-top: 1px solid var(--color-secondary); + margin: 4px 0; +} From 6cd4d8a3781e624a43e1991eb43c8af486d145bd Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 28 Jun 2023 19:22:18 +0200 Subject: [PATCH 7/8] remove unnecessary height --- web_src/css/modules/divider.css | 1 - 1 file changed, 1 deletion(-) diff --git a/web_src/css/modules/divider.css b/web_src/css/modules/divider.css index 3ffee17d44e02..62f6dab19597a 100644 --- a/web_src/css/modules/divider.css +++ b/web_src/css/modules/divider.css @@ -21,7 +21,6 @@ .ui.horizontal.divider::before, .ui.horizontal.divider::after { content: ""; - height: 1px; flex: 1; border-top: 1px solid var(--color-secondary); } From 86d4061b64cd90785a1ea2383adbf3c0eface413 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 29 Jun 2023 06:15:27 +0200 Subject: [PATCH 8/8] remove divider class, improve activity history headers --- templates/admin/config.tmpl | 14 ++++----- templates/admin/dashboard.tmpl | 8 ++--- templates/admin/stacktrace.tmpl | 2 +- templates/admin/user/edit.tmpl | 8 ++--- templates/admin/user/list.tmpl | 10 +++---- templates/explore/code.tmpl | 2 +- templates/explore/repo_search.tmpl | 2 +- templates/explore/search.tmpl | 2 +- templates/install.tmpl | 2 +- templates/org/home.tmpl | 2 +- templates/org/settings/labels.tmpl | 2 +- templates/org/settings/options.tmpl | 6 ++-- templates/org/team/new.tmpl | 2 +- templates/org/team/teams.tmpl | 2 +- .../package/shared/cleanup_rules/edit.tmpl | 4 +-- templates/package/view.tmpl | 6 ++-- templates/projects/list.tmpl | 2 +- templates/projects/new.tmpl | 2 +- templates/projects/view.tmpl | 6 ++-- templates/repo/activity.tmpl | 29 +++++++++---------- templates/repo/create.tmpl | 2 +- templates/repo/diff/new_review.tmpl | 2 +- templates/repo/empty.tmpl | 4 +-- templates/repo/header.tmpl | 2 +- .../repo/issue/branch_selector_field.tmpl | 2 +- templates/repo/issue/choose.tmpl | 2 +- templates/repo/issue/labels/label_list.tmpl | 4 +-- .../issue/labels/labels_selector_field.tmpl | 6 ++-- templates/repo/issue/list.tmpl | 6 ++-- templates/repo/issue/milestone_issues.tmpl | 2 +- templates/repo/issue/milestone_new.tmpl | 4 +-- templates/repo/issue/new_form.tmpl | 8 ++--- .../repo/issue/view_content/attachments.tmpl | 4 +-- templates/repo/issue/view_content/pull.tmpl | 10 +++---- .../view_content/pull_merge_instruction.tmpl | 2 +- .../repo/issue/view_content/sidebar.tmpl | 28 +++++++++--------- .../view_content/update_branch_by_merge.tmpl | 2 +- templates/repo/migrate/codebase.tmpl | 2 +- templates/repo/migrate/git.tmpl | 2 +- templates/repo/migrate/gitbucket.tmpl | 2 +- templates/repo/migrate/gitea.tmpl | 2 +- templates/repo/migrate/github.tmpl | 2 +- templates/repo/migrate/gitlab.tmpl | 2 +- templates/repo/migrate/gogs.tmpl | 2 +- templates/repo/migrate/migrating.tmpl | 2 +- templates/repo/migrate/onedev.tmpl | 2 +- templates/repo/projects/view.tmpl | 6 ++-- templates/repo/release/new.tmpl | 2 +- templates/repo/release_tag_header.tmpl | 2 +- templates/repo/settings/options.tmpl | 24 +++++++-------- templates/repo/settings/protected_branch.tmpl | 2 +- templates/repo/settings/webhook/settings.tmpl | 2 +- templates/repo/wiki/view.tmpl | 2 +- templates/shared/actions/runner_edit.tmpl | 4 +-- templates/status/404.tmpl | 2 +- templates/status/500.tmpl | 2 +- templates/user/auth/activate.tmpl | 2 +- templates/user/auth/forgot_passwd.tmpl | 2 +- templates/user/auth/reset_passwd.tmpl | 2 +- templates/user/auth/signin_inner.tmpl | 2 +- templates/user/code.tmpl | 2 +- templates/user/dashboard/feeds.tmpl | 2 +- templates/user/dashboard/issues.tmpl | 2 +- templates/user/dashboard/milestones.tmpl | 2 +- templates/user/dashboard/navbar.tmpl | 2 +- templates/user/heatmap.tmpl | 2 +- .../notification_subscriptions.tmpl | 2 +- templates/user/settings/profile.tmpl | 4 +-- web_src/css/helpers.css | 1 + web_src/css/modules/divider.css | 14 ++++----- web_src/js/features/repo-issue-list.js | 2 +- 71 files changed, 155 insertions(+), 157 deletions(-) diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index 17fb2444d3f8d..c51f9cb0bf8af 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -20,19 +20,19 @@
{{.locale.Tr "admin.config.disable_router_log"}}
{{if .DisableRouterLog}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
-
+
{{.locale.Tr "admin.config.run_user"}}
{{.RunUser}}
{{.locale.Tr "admin.config.run_mode"}}
{{.RunMode}}
-
+
{{.locale.Tr "admin.config.git_version"}}
{{.GitVersion}}
-
+
{{.locale.Tr "admin.config.repo_root_path"}}
{{.RepoRootPath}}
@@ -174,7 +174,7 @@
{{if .Service.NoReplyAddress}}{{.Service.NoReplyAddress}}{{else}}-{{end}}
{{.locale.Tr "admin.config.default_enable_dependencies"}}
{{if .Service.DefaultEnableDependencies}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
-
+
{{.locale.Tr "admin.config.active_code_lives"}}
{{.Service.ActiveCodeLives}} {{.locale.Tr "tool.raw_minutes"}}
{{.locale.Tr "admin.config.reset_password_code_lives"}}
@@ -230,7 +230,7 @@ {{end}}
{{.locale.Tr "admin.config.mailer_user"}}
{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}
-
+
{{.locale.Tr "admin.config.send_test_mail"}}
@@ -296,7 +296,7 @@
-
+
{{.locale.Tr "admin.config.enable_federated_avatar"}}
@@ -322,7 +322,7 @@
{{.locale.Tr "admin.config.git_gc_args"}}
{{.Git.GCArgs}}
-
+
{{.locale.Tr "admin.config.git_migrate_timeout"}}
{{.Git.Timeout.Migrate}} {{.locale.Tr "tool.raw_seconds"}}
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl index 9d503a19b06ae..86da3abfdd815 100644 --- a/templates/admin/dashboard.tmpl +++ b/templates/admin/dashboard.tmpl @@ -75,7 +75,7 @@
{{.SysStatus.StartTime}}
{{.locale.Tr "admin.dashboard.current_goroutine"}}
{{.SysStatus.NumGoroutine}}
-
+
{{.locale.Tr "admin.dashboard.current_memory_usage"}}
{{.SysStatus.MemAllocated}}
{{.locale.Tr "admin.dashboard.total_memory_allocated"}}
@@ -88,7 +88,7 @@
{{.SysStatus.MemMallocs}}
{{.locale.Tr "admin.dashboard.memory_free_times"}}
{{.SysStatus.MemFrees}}
-
+
{{.locale.Tr "admin.dashboard.current_heap_usage"}}
{{.SysStatus.HeapAlloc}}
{{.locale.Tr "admin.dashboard.heap_memory_obtained"}}
@@ -101,7 +101,7 @@
{{.SysStatus.HeapReleased}}
{{.locale.Tr "admin.dashboard.heap_objects"}}
{{.SysStatus.HeapObjects}}
-
+
{{.locale.Tr "admin.dashboard.bootstrap_stack_usage"}}
{{.SysStatus.StackInuse}}
{{.locale.Tr "admin.dashboard.stack_memory_obtained"}}
@@ -120,7 +120,7 @@
{{.SysStatus.GCSys}}
{{.locale.Tr "admin.dashboard.other_system_allocation_obtained"}}
{{.SysStatus.OtherSys}}
-
+
{{.locale.Tr "admin.dashboard.next_gc_recycle"}}
{{.SysStatus.NextGC}}
{{.locale.Tr "admin.dashboard.last_gc_time"}}
diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl index 46ad421587b03..b9d8e6538f0b8 100644 --- a/templates/admin/stacktrace.tmpl +++ b/templates/admin/stacktrace.tmpl @@ -16,7 +16,7 @@ -
+

{{printf "%d Goroutines" .GoroutineCount}}{{/* Goroutine is non-translatable*/}} diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index 75bbd9a97c30b..96e09156d1eb6 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -79,7 +79,7 @@ -
+
@@ -87,7 +87,7 @@

{{.locale.Tr "admin.users.max_repo_creation_desc"}}

-
+
@@ -135,7 +135,7 @@ {{end}} {{if .TwoFactorEnabled}} -
+
@@ -144,7 +144,7 @@
{{end}} -
+
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index 3093b0f47a878..3742b4ae85176 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -16,19 +16,19 @@ {{.locale.Tr "admin.users.list_status_filter.menu_text"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{.locale.Tr "admin.users.list_status_filter.reset"}} -
+
-
+
-
+
-
+
-
+
diff --git a/templates/explore/code.tmpl b/templates/explore/code.tmpl index 924a3e627482a..c537cca05e8d1 100644 --- a/templates/explore/code.tmpl +++ b/templates/explore/code.tmpl @@ -3,7 +3,7 @@ {{template "explore/navbar" .}}
{{template "code/searchform" .}} -
+
{{if .CodeIndexerUnavailable}}
diff --git a/templates/explore/repo_search.tmpl b/templates/explore/repo_search.tmpl index fbce9dcdd94e5..6e150dc7f2ac8 100644 --- a/templates/explore/repo_search.tmpl +++ b/templates/explore/repo_search.tmpl @@ -39,4 +39,4 @@ {{.locale.Tr "explore.relevant_repositories" ((printf "%s%s" $.Link "?only_show_relevant=0")|Escape) | Safe}}
{{end}} -
+
diff --git a/templates/explore/search.tmpl b/templates/explore/search.tmpl index 11f3b7ba34f28..b0041ee3ce25e 100644 --- a/templates/explore/search.tmpl +++ b/templates/explore/search.tmpl @@ -21,4 +21,4 @@
-
+
diff --git a/templates/install.tmpl b/templates/install.tmpl index 3df4455416df7..c9f147a64df36 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -321,7 +321,7 @@
-
+
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index d540f8035247e..7f52b8cc6dcab 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -51,7 +51,7 @@ {{.locale.Tr "new_migrate"}} {{end}}
-
+
{{end}}

{{.locale.Tr "org.members"}} diff --git a/templates/org/settings/labels.tmpl b/templates/org/settings/labels.tmpl index be408617ce596..2700c61bb6cf7 100644 --- a/templates/org/settings/labels.tmpl +++ b/templates/org/settings/labels.tmpl @@ -10,7 +10,7 @@

-
+
{{template "repo/issue/labels/label_new" .}} {{template "repo/issue/labels/label_list" .}} diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl index 12a24bff08999..846ebaee1adae 100644 --- a/templates/org/settings/options.tmpl +++ b/templates/org/settings/options.tmpl @@ -31,7 +31,7 @@ -
+
@@ -65,7 +65,7 @@
{{if .SignedUser.IsAdmin}} -
+
@@ -79,7 +79,7 @@
-
+
{{.CsrfTokenHtml}} diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index 0cba09be51390..3702198ae0932 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -69,7 +69,7 @@
-
+
diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl index dcf937f3f0734..9a7dae8f328df 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -7,7 +7,7 @@
{{svg "octicon-plus"}} {{.locale.Tr "org.create_new_team"}}
-
+
{{end}}
diff --git a/templates/package/shared/cleanup_rules/edit.tmpl b/templates/package/shared/cleanup_rules/edit.tmpl index f8525afb70b45..295ac1a6a4d98 100644 --- a/templates/package/shared/cleanup_rules/edit.tmpl +++ b/templates/package/shared/cleanup_rules/edit.tmpl @@ -23,7 +23,7 @@
-
+

{{.locale.Tr "packages.owner.settings.cleanuprules.keep.title"}}

@@ -42,7 +42,7 @@

{{.locale.Tr "packages.owner.settings.cleanuprules.keep.pattern.container" | Safe}}

-
+

{{.locale.Tr "packages.owner.settings.cleanuprules.remove.title"}}

diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl index 755c93fde3012..1e7d13285ec33 100644 --- a/templates/package/view.tmpl +++ b/templates/package/view.tmpl @@ -73,7 +73,7 @@ {{end}}
{{if not (eq .PackageDescriptor.Package.Type "container")}} -
+
{{.locale.Tr "packages.assets"}} ({{len .PackageDescriptor.Files}})
{{range .PackageDescriptor.Files}} @@ -85,7 +85,7 @@
{{end}} {{if .LatestVersions}} -
+
{{.locale.Tr "packages.versions"}} ({{.TotalVersionCount}}) {{.locale.Tr "packages.versions.view_all"}}
@@ -98,7 +98,7 @@
{{end}} {{if or .CanWritePackages .HasRepositoryAccess}} -
+
{{if .HasRepositoryAccess}}
{{svg "octicon-issue-opened" 16 "gt-mr-3"}} {{.locale.Tr "repo.issues"}}
diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index f14dc9d56a15b..9725c1e63b337 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -6,7 +6,7 @@ {{.locale.Tr "repo.projects.new"}}
-
+
{{end}} {{template "base/alert" .}} diff --git a/templates/projects/new.tmpl b/templates/projects/new.tmpl index 6d1ae04159f9b..bc3b19e915086 100644 --- a/templates/projects/new.tmpl +++ b/templates/projects/new.tmpl @@ -56,7 +56,7 @@
-
+
{{.locale.Tr "repo.milestones.cancel"}} diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index 35493775b56ef..59fa1870f884e 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -37,7 +37,7 @@
-
+

{{$.Project.Title}}

@@ -69,7 +69,7 @@
{{end}}
-
+
@@ -175,7 +175,7 @@
{{end}} -
+
diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl index 7ab7711107525..da4eca7525ed7 100644 --- a/templates/repo/activity.tmpl +++ b/templates/repo/activity.tmpl @@ -23,7 +23,7 @@

-
+
{{if (or (.Permission.CanRead $.UnitTypeIssues) (.Permission.CanRead $.UnitTypePullRequests))}}

{{.locale.Tr "repo.activity.overview"}}

@@ -115,8 +115,8 @@ {{end}} {{if gt .Activity.PublishedReleaseCount 0}} -

- {{svg "octicon-tag" 16 "gt-mr-3"}} +

+ {{svg "octicon-tag" 16 "gt-mr-3"}} {{.locale.Tr "repo.activity.title.releases_published_by" (.locale.TrN .Activity.PublishedReleaseCount "repo.activity.title.releases_1" "repo.activity.title.releases_n" .Activity.PublishedReleaseCount) (.locale.TrN .Activity.PublishedReleaseAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.PublishedReleaseAuthorCount) @@ -137,8 +137,8 @@ {{end}} {{if gt .Activity.MergedPRCount 0}} -

- {{svg "octicon-git-pull-request" 16 "gt-mr-3"}} +

+ {{svg "octicon-git-pull-request" 16 "gt-mr-3"}} {{.locale.Tr "repo.activity.title.prs_merged_by" (.locale.TrN .Activity.MergedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.MergedPRCount) (.locale.TrN .Activity.MergedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.MergedPRAuthorCount) @@ -156,8 +156,8 @@ {{end}} {{if gt .Activity.OpenedPRCount 0}} -

- {{svg "octicon-git-branch" 16 "gt-mr-3"}} +

+ {{svg "octicon-git-branch" 16 "gt-mr-3"}} {{.locale.Tr "repo.activity.title.prs_opened_by" (.locale.TrN .Activity.OpenedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.OpenedPRCount) (.locale.TrN .Activity.OpenedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedPRAuthorCount) @@ -175,8 +175,8 @@ {{end}} {{if gt .Activity.ClosedIssueCount 0}} -

- {{svg "octicon-issue-closed" 16 "gt-mr-3"}} +

+ {{svg "octicon-issue-closed" 16 "gt-mr-3"}} {{.locale.Tr "repo.activity.title.issues_closed_from" (.locale.TrN .Activity.ClosedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.ClosedIssueCount) (.locale.TrN .Activity.ClosedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.ClosedIssueAuthorCount) @@ -194,8 +194,8 @@ {{end}} {{if gt .Activity.OpenedIssueCount 0}} -

- {{svg "octicon-issue-opened" 16 "gt-mr-3"}} +

+ {{svg "octicon-issue-opened" 16 "gt-mr-3"}} {{.locale.Tr "repo.activity.title.issues_created_by" (.locale.TrN .Activity.OpenedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.OpenedIssueCount) (.locale.TrN .Activity.OpenedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedIssueAuthorCount) @@ -213,13 +213,10 @@ {{end}} {{if gt .Activity.UnresolvedIssueCount 0}} -

- {{svg "octicon-comment-discussion" 16 "gt-mr-3"}} +

+ {{svg "octicon-comment-discussion" 16 "gt-mr-3"}} {{.locale.TrN .Activity.UnresolvedIssueCount "repo.activity.title.unresolved_conv_1" "repo.activity.title.unresolved_conv_n" .Activity.UnresolvedIssueCount}}

-
- {{.locale.Tr "repo.activity.unresolved_conv_desc"}} -
{{range .Activity.UnresolvedIssues}}

diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index 05e7052ff4e5d..1ec67827e5220 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -124,7 +124,7 @@

-
+
diff --git a/templates/repo/diff/new_review.tmpl b/templates/repo/diff/new_review.tmpl index 128c1e550482b..013fdfe2a8df0 100644 --- a/templates/repo/diff/new_review.tmpl +++ b/templates/repo/diff/new_review.tmpl @@ -28,7 +28,7 @@ {{template "repo/upload" .}}
{{end}} -
+
{{$showSelfTooltip := (and $.IsSigned ($.Issue.IsPoster $.SignedUser.ID))}} {{if $showSelfTooltip}} diff --git a/templates/repo/empty.tmpl b/templates/repo/empty.tmpl index 50f209b460f83..b81b312c6c5fd 100644 --- a/templates/repo/empty.tmpl +++ b/templates/repo/empty.tmpl @@ -44,7 +44,7 @@ {{if not .Repository.IsArchived}} -
+

{{.locale.Tr "repo.create_new_repo_command"}}

@@ -58,7 +58,7 @@ git remote add origin {{$.CloneButtonOriginLink.HTTPS git push -u origin {{.Repository.DefaultBranch}}
-
+

{{.locale.Tr "repo.push_exist_repo"}}

diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index c1d4676d6800e..18ed738a204f4 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -132,7 +132,7 @@ {{end}}
{{if $.CanSignedUserFork}} -
+
{{$.locale.Tr "repo.fork_to_different_account"}} diff --git a/templates/repo/issue/branch_selector_field.tmpl b/templates/repo/issue/branch_selector_field.tmpl index 4669c9e8e560a..33b2af9c40ffe 100644 --- a/templates/repo/issue/branch_selector_field.tmpl +++ b/templates/repo/issue/branch_selector_field.tmpl @@ -50,5 +50,5 @@ -
+
{{end}} diff --git a/templates/repo/issue/choose.tmpl b/templates/repo/issue/choose.tmpl index ccfeb7b33126a..1bbfbbb2d1534 100644 --- a/templates/repo/issue/choose.tmpl +++ b/templates/repo/issue/choose.tmpl @@ -6,7 +6,7 @@
{{template "repo/issue/navbar" .}}
-
+
{{range .IssueTemplates}}
diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl index 325efd1da6e4d..9eee95be92369 100644 --- a/templates/repo/issue/labels/label_list.tmpl +++ b/templates/repo/issue/labels/label_list.tmpl @@ -22,10 +22,10 @@
{{if and (not $.PageIsOrgSettingsLabels) (or $.CanWriteIssues $.CanWritePulls) (eq .NumLabels 0) (not $.Repository.IsArchived)}} {{template "repo/issue/labels/label_load_template" .}} -
+
{{else if and ($.PageIsOrgSettingsLabels) (eq .NumLabels 0)}} {{template "repo/issue/labels/label_load_template" .}} -
+
{{end}}
{{.locale.Tr "repo.issues.filter_label_exclude" | Safe}} -
+
{{.locale.Tr "repo.issues.filter_label_select_no_label"}} {{.locale.Tr "repo.issues.filter_label_no_select"}} {{$previousExclusiveScope := "_no_scope"}} {{range .Labels}} {{$exclusiveScope := .ExclusiveScope}} {{if and (ne $previousExclusiveScope $exclusiveScope)}} -
+
{{end}} {{$previousExclusiveScope = $exclusiveScope}} {{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if .IsSelected}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel $.Context .}} @@ -306,7 +306,7 @@ {{range .Labels}} {{$exclusiveScope := .ExclusiveScope}} {{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}} -
+
{{end}} {{$previousExclusiveScope = $exclusiveScope}}
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 3cd84d5456f2c..5913f59fe82e2 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -48,7 +48,7 @@
{{.locale.Tr "repo.milestones.completeness" .Milestone.Completeness | Safe}}
-
+
diff --git a/templates/repo/issue/milestone_new.tmpl b/templates/repo/issue/milestone_new.tmpl index ac34fb0f0d189..1979eb07a5a1f 100644 --- a/templates/repo/issue/milestone_new.tmpl +++ b/templates/repo/issue/milestone_new.tmpl @@ -10,7 +10,7 @@
{{end}}
-
+

{{if .PageIsEditMilestone}} {{.locale.Tr "repo.milestones.edit"}} @@ -41,7 +41,7 @@

-
+
{{if .PageIsEditMilestone}} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 70c45b37c87a3..c565be336f6bc 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -55,7 +55,7 @@ {{template "repo/issue/labels/labels_selector_field" .}} {{template "repo/issue/labels/labels_sidebar" dict "root" $}} -
+
@@ -82,7 +82,7 @@
{{if .IsProjectsEnabled}} -
+
@@ -141,7 +141,7 @@
{{end}} -
+
@@ -177,7 +177,7 @@ {{end}}
{{if and .PageIsComparePull (not (eq .HeadRepo.FullName .BaseCompareRepo.FullName)) .CanWriteToHeadRepo}} -
+
diff --git a/templates/repo/issue/view_content/attachments.tmpl b/templates/repo/issue/view_content/attachments.tmpl index f342340fe474d..981360ebe0dde 100644 --- a/templates/repo/issue/view_content/attachments.tmpl +++ b/templates/repo/issue/view_content/attachments.tmpl @@ -1,6 +1,6 @@
{{if .Attachments}} -
+
{{end}} {{$hasThumbnails := false}} {{- range .Attachments -}} @@ -25,7 +25,7 @@ {{end -}} {{if $hasThumbnails}} -
+
{{- range .Attachments -}} {{if FilenameIsImage .Name}} diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index fd395c0eb6255..3666154b202d9 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -179,7 +179,7 @@ {{end}} {{template "repo/issue/view_content/update_branch_by_merge" $}} {{if .Issue.PullRequest.IsEmpty}} -
+
{{svg "octicon-alert"}} @@ -196,7 +196,7 @@ {{$createdPRMergeStr := TimeSinceUnix .PendingPullRequestMerge.CreatedUnix $.locale}} {{$hasPendingPullRequestMergeTip = $.locale.Tr "repo.pulls.auto_merge_has_pending_schedule" .PendingPullRequestMerge.Doer.Name $createdPRMergeStr}} {{end}} -
+