From 73b57c29922a9f76ca061dfe7c118b6e923ee606 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 29 May 2023 16:10:06 +0200 Subject: [PATCH] Improve dropdown menus, remove inline styles (#24954) Before: Screenshot 2023-05-27 at 10 46 43 After: Screenshot 2023-05-28 at 19 29 03 --------- Co-authored-by: Giteabot --- options/locale/locale_en-US.ini | 5 ----- templates/repo/home.tmpl | 2 +- templates/repo/issue/labels/labels_selector_field.tmpl | 3 +-- templates/repo/issue/milestone/select_menu.tmpl | 3 +-- templates/repo/issue/new_form.tmpl | 4 +--- templates/repo/issue/view_content/sidebar.tmpl | 3 --- templates/repo/wiki/revision.tmpl | 2 +- 7 files changed, 5 insertions(+), 17 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ed7cbef9fed76..2399410287d27 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1302,28 +1302,23 @@ 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 -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 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 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 -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/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..05580ea41eab4 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}} @@ -37,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 6f67b5d52354c..497313e75da59 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}} @@ -8,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 bdaafbb36bf7b..00da68eb06fa1 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -93,7 +93,6 @@ {{end}}
-
{{.locale.Tr "repo.issues.new.add_project_title"}}
{{if or .OpenProjects .ClosedProjects}}
{{svg "octicon-search" 16}} @@ -102,7 +101,7 @@ {{end}}
{{.locale.Tr "repo.issues.new.clear_projects"}}
{{if and (not .OpenProjects) (not .ClosedProjects)}} -
+
{{.locale.Tr "repo.issues.new.no_items"}}
{{else}} @@ -152,7 +151,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 343f041bfc832..ebb844bc003e6 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -10,7 +10,6 @@ {{end}}
-
{{.locale.Tr "repo.issues.new.add_reviewer_title"}}
{{if .Reviewers}}
{{svg "octicon-search" 16}} @@ -161,7 +160,6 @@ {{end}}
-
{{.locale.Tr "repo.issues.new.add_project_title"}}
{{if or .OpenProjects .ClosedProjects}}
{{svg "octicon-search" 16}} @@ -216,7 +214,6 @@ {{end}}
-
{{.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"}}

-
+