From bf38325dd87e2c7d2477ef095ff35b1d094abd1a Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 27 May 2023 10:47:05 +0200 Subject: [PATCH 1/7] Remove a few inline styles --- templates/repo/home.tmpl | 2 +- templates/repo/issue/labels/labels_selector_field.tmpl | 4 ++-- templates/repo/issue/milestone/select_menu.tmpl | 4 ++-- templates/repo/issue/new_form.tmpl | 6 +++--- templates/repo/issue/view_content/sidebar.tmpl | 6 +++--- templates/repo/wiki/revision.tmpl | 2 +- web_src/css/base.css | 6 ++++++ 7 files changed, 18 insertions(+), 12 deletions(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 56962aa3a50c0..5e9c285eb0a20 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -40,7 +40,7 @@ {{range .Topics}} {{/* keey the same layout as Fomantic UI generated labels */}} - {{.Name}}{{svg "octicon-x" 16 "delete icon"}} + {{.Name}}{{svg "octicon-x" 16 "delete icon"}} {{end}}
diff --git a/templates/repo/issue/labels/labels_selector_field.tmpl b/templates/repo/issue/labels/labels_selector_field.tmpl index 350cf631e83a0..06f9fc81425f9 100644 --- a/templates/repo/issue/labels/labels_selector_field.tmpl +++ b/templates/repo/issue/labels/labels_selector_field.tmpl @@ -6,7 +6,7 @@ {{end}}
-
{{.locale.Tr "repo.issues.new.add_labels_title"}}
+
{{.locale.Tr "repo.issues.new.add_labels_title"}}
{{if or .Labels .OrgLabels}}
{{svg "octicon-search" 16}} @@ -37,7 +37,7 @@ {{if .Description}}
{{.Description | RenderEmoji $.Context}}{{end}} {{end}} {{else}} -
{{.locale.Tr "repo.issues.new.no_items"}}
+
{{.locale.Tr "repo.issues.new.no_items"}}
{{end}}
diff --git a/templates/repo/issue/milestone/select_menu.tmpl b/templates/repo/issue/milestone/select_menu.tmpl index 6f67b5d52354c..2698acccfe05e 100644 --- a/templates/repo/issue/milestone/select_menu.tmpl +++ b/templates/repo/issue/milestone/select_menu.tmpl @@ -1,4 +1,4 @@ -
{{.locale.Tr "repo.issues.new.add_milestone_title"}}
+
{{.locale.Tr "repo.issues.new.add_milestone_title"}}
{{if or .OpenMilestones .ClosedMilestones}}
{{svg "octicon-search" 16}} @@ -8,7 +8,7 @@ {{end}}
{{.locale.Tr "repo.issues.new.clear_milestone"}}
{{if and (not .OpenMilestones) (not .ClosedMilestones)}} -
+
{{.locale.Tr "repo.issues.new.no_items"}}
{{else}} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index c12b8149b0864..b087410ea9681 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -94,7 +94,7 @@ {{end}}
-
{{.locale.Tr "repo.issues.new.add_project_title"}}
+
{{.locale.Tr "repo.issues.new.add_project_title"}}
{{if or .OpenProjects .ClosedProjects}}
{{svg "octicon-search" 16}} @@ -103,7 +103,7 @@ {{end}}
{{.locale.Tr "repo.issues.new.clear_projects"}}
{{if and (not .OpenProjects) (not .ClosedProjects)}} -
+
{{.locale.Tr "repo.issues.new.no_items"}}
{{else}} @@ -153,7 +153,7 @@ {{end}}
-
{{.locale.Tr "repo.issues.new.add_assignees_title"}}
+
{{.locale.Tr "repo.issues.new.add_assignees_title"}}
{{svg "octicon-search" 16}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 60d2f4a5613d5..73c4369a397fa 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -13,7 +13,7 @@ {{end}}
-
{{.locale.Tr "repo.issues.new.add_reviewer_title"}}
+
{{.locale.Tr "repo.issues.new.add_reviewer_title"}}
{{if .Reviewers}}
{{svg "octicon-search" 16}} @@ -134,7 +134,7 @@ {{end}}
-
{{.locale.Tr "repo.issues.new.add_project_title"}}
+
{{.locale.Tr "repo.issues.new.add_project_title"}}
{{if or .OpenProjects .ClosedProjects}}
{{svg "octicon-search" 16}} @@ -189,7 +189,7 @@ {{end}}
-
{{.locale.Tr "repo.issues.new.add_assignees_title"}}
+
{{.locale.Tr "repo.issues.new.add_assignees_title"}}
{{svg "octicon-search" 16}} diff --git a/templates/repo/wiki/revision.tmpl b/templates/repo/wiki/revision.tmpl index 0f540fbaa566c..803c8629a6da6 100644 --- a/templates/repo/wiki/revision.tmpl +++ b/templates/repo/wiki/revision.tmpl @@ -20,7 +20,7 @@

{{.locale.Tr "repo.wiki.wiki_page_revisions"}}

-
+

diff --git a/web_src/css/base.css b/web_src/css/base.css index 21de3c82685e4..3f16911efb493 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -1764,6 +1764,12 @@ img.ui.avatar, border-radius: 0 !important; } +/* undo fomantic uppercase tiny font on .menu > .header */ +.header-no-uppercase { + text-transform: none !important; + font-size: 14px !important; +} + .scrolling.menu .item.selected { font-weight: var(--font-weight-semibold) !important; } From 10236b15bbb0b91090cf4d6e63df6f004a92a7df Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 28 May 2023 00:07:14 +0200 Subject: [PATCH 2/7] remove 'Apply labels' --- options/locale/locale_en-US.ini | 1 - templates/repo/issue/labels/labels_selector_field.tmpl | 1 - 2 files changed, 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 16dbb0948d47d..3cfc9de4595f3 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1302,7 +1302,6 @@ issues.filter_reviewers = Filter Reviewer issues.new = New Issue issues.new.title_empty = Title cannot be empty issues.new.labels = Labels -issues.new.add_labels_title = Apply labels issues.new.no_label = No Label issues.new.clear_labels = Clear labels issues.new.projects = Projects diff --git a/templates/repo/issue/labels/labels_selector_field.tmpl b/templates/repo/issue/labels/labels_selector_field.tmpl index 06f9fc81425f9..cd92f0d916b69 100644 --- a/templates/repo/issue/labels/labels_selector_field.tmpl +++ b/templates/repo/issue/labels/labels_selector_field.tmpl @@ -6,7 +6,6 @@ {{end}}
-
{{.locale.Tr "repo.issues.new.add_labels_title"}}
{{if or .Labels .OrgLabels}}
{{svg "octicon-search" 16}} From 68f6b513ce3e84bc120fc7daecd78d7a32337997 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 28 May 2023 00:09:06 +0200 Subject: [PATCH 3/7] remove 'Set milestone' --- options/locale/locale_en-US.ini | 1 - templates/repo/issue/milestone/select_menu.tmpl | 1 - 2 files changed, 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 3cfc9de4595f3..9b3278802102a 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1312,7 +1312,6 @@ issues.new.open_projects = Open Projects issues.new.closed_projects = Closed Projects issues.new.no_items = No items issues.new.milestone = Milestone -issues.new.add_milestone_title = Set milestone issues.new.no_milestone = No Milestone issues.new.clear_milestone = Clear milestone issues.new.open_milestone = Open Milestones diff --git a/templates/repo/issue/milestone/select_menu.tmpl b/templates/repo/issue/milestone/select_menu.tmpl index 2698acccfe05e..96d4d2e141692 100644 --- a/templates/repo/issue/milestone/select_menu.tmpl +++ b/templates/repo/issue/milestone/select_menu.tmpl @@ -1,4 +1,3 @@ -
{{.locale.Tr "repo.issues.new.add_milestone_title"}}
{{if or .OpenMilestones .ClosedMilestones}}
{{svg "octicon-search" 16}} From d9db7bf6e4dd308309f161125752a8a00a1999a8 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 28 May 2023 00:10:54 +0200 Subject: [PATCH 4/7] remove 'Set Project' --- options/locale/locale_en-US.ini | 1 - templates/repo/issue/new_form.tmpl | 1 - templates/repo/issue/view_content/sidebar.tmpl | 1 - 3 files changed, 3 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 9b3278802102a..195dfa4b4adb6 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1305,7 +1305,6 @@ issues.new.labels = Labels issues.new.no_label = No Label issues.new.clear_labels = Clear labels issues.new.projects = Projects -issues.new.add_project_title = Set Project issues.new.clear_projects = Clear projects issues.new.no_projects = No project issues.new.open_projects = Open Projects diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index b087410ea9681..34a168f1b66f9 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -94,7 +94,6 @@ {{end}}
-
{{.locale.Tr "repo.issues.new.add_project_title"}}
{{if or .OpenProjects .ClosedProjects}}
{{svg "octicon-search" 16}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 73c4369a397fa..28ab549f64edf 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -134,7 +134,6 @@ {{end}}
-
{{.locale.Tr "repo.issues.new.add_project_title"}}
{{if or .OpenProjects .ClosedProjects}}
{{svg "octicon-search" 16}} From 9e2f28e9105d96de073a651c6f57b097ae6d6568 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 28 May 2023 00:11:54 +0200 Subject: [PATCH 5/7] remove 'Assign users' --- options/locale/locale_en-US.ini | 1 - templates/repo/issue/new_form.tmpl | 1 - templates/repo/issue/view_content/sidebar.tmpl | 1 - 3 files changed, 3 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 195dfa4b4adb6..ea10e3490765b 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1316,7 +1316,6 @@ issues.new.clear_milestone = Clear milestone issues.new.open_milestone = Open Milestones issues.new.closed_milestone = Closed Milestones issues.new.assignees = Assignees -issues.new.add_assignees_title = Assign users issues.new.clear_assignees = Clear assignees issues.new.no_assignees = No Assignees issues.new.no_reviewers = No reviewers diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 34a168f1b66f9..60504d4aa88d1 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -152,7 +152,6 @@ {{end}}
-
{{.locale.Tr "repo.issues.new.add_assignees_title"}}
{{svg "octicon-search" 16}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 28ab549f64edf..cfe9c68da6a3f 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -188,7 +188,6 @@ {{end}}
-
{{.locale.Tr "repo.issues.new.add_assignees_title"}}
{{svg "octicon-search" 16}} From 0dccf2d72d08d556562d7f87f38c8cfc89c7185a Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 28 May 2023 00:12:43 +0200 Subject: [PATCH 6/7] remove 'Request review' --- options/locale/locale_en-US.ini | 1 - templates/repo/issue/view_content/sidebar.tmpl | 1 - 2 files changed, 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ea10e3490765b..ca2c2e6376bab 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1319,7 +1319,6 @@ issues.new.assignees = Assignees issues.new.clear_assignees = Clear assignees issues.new.no_assignees = No Assignees issues.new.no_reviewers = No reviewers -issues.new.add_reviewer_title = Request review issues.choose.get_started = Get Started issues.choose.open_external_link = Open issues.choose.blank = Default diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index cfe9c68da6a3f..6ab490946779e 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -13,7 +13,6 @@ {{end}}
-
{{.locale.Tr "repo.issues.new.add_reviewer_title"}}
{{if .Reviewers}}
{{svg "octicon-search" 16}} From 85640be797aef9fc07f3e147de7aa7921a1874e2 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 28 May 2023 19:29:26 +0200 Subject: [PATCH 7/7] use disabled item --- templates/repo/issue/labels/labels_selector_field.tmpl | 2 +- templates/repo/issue/milestone/select_menu.tmpl | 2 +- templates/repo/issue/new_form.tmpl | 2 +- web_src/css/base.css | 6 ------ 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/templates/repo/issue/labels/labels_selector_field.tmpl b/templates/repo/issue/labels/labels_selector_field.tmpl index cd92f0d916b69..05580ea41eab4 100644 --- a/templates/repo/issue/labels/labels_selector_field.tmpl +++ b/templates/repo/issue/labels/labels_selector_field.tmpl @@ -36,7 +36,7 @@ {{if .Description}}
{{.Description | RenderEmoji $.Context}}{{end}} {{end}} {{else}} -
{{.locale.Tr "repo.issues.new.no_items"}}
+
{{.locale.Tr "repo.issues.new.no_items"}}
{{end}}
diff --git a/templates/repo/issue/milestone/select_menu.tmpl b/templates/repo/issue/milestone/select_menu.tmpl index 96d4d2e141692..497313e75da59 100644 --- a/templates/repo/issue/milestone/select_menu.tmpl +++ b/templates/repo/issue/milestone/select_menu.tmpl @@ -7,7 +7,7 @@ {{end}}
{{.locale.Tr "repo.issues.new.clear_milestone"}}
{{if and (not .OpenMilestones) (not .ClosedMilestones)}} -
+
{{.locale.Tr "repo.issues.new.no_items"}}
{{else}} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 60504d4aa88d1..e251e810d7c7f 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -102,7 +102,7 @@ {{end}}
{{.locale.Tr "repo.issues.new.clear_projects"}}
{{if and (not .OpenProjects) (not .ClosedProjects)}} -
+
{{.locale.Tr "repo.issues.new.no_items"}}
{{else}} diff --git a/web_src/css/base.css b/web_src/css/base.css index 3f16911efb493..21de3c82685e4 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -1764,12 +1764,6 @@ img.ui.avatar, border-radius: 0 !important; } -/* undo fomantic uppercase tiny font on .menu > .header */ -.header-no-uppercase { - text-transform: none !important; - font-size: 14px !important; -} - .scrolling.menu .item.selected { font-weight: var(--font-weight-semibold) !important; }