From 0f5847703c04954f84883bc51a6824fdf65f0876 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 22 Jun 2023 21:11:14 +0800 Subject: [PATCH 1/2] fix --- templates/devtest/gitea-ui.tmpl | 42 ++++++++++++++++++++++----------- templates/repo/commit_page.tmpl | 3 ++- web_src/css/base.css | 11 +++++++++ 3 files changed, 41 insertions(+), 15 deletions(-) diff --git a/templates/devtest/gitea-ui.tmpl b/templates/devtest/gitea-ui.tmpl index 0da443aade128..73e523b97f896 100644 --- a/templates/devtest/gitea-ui.tmpl +++ b/templates/devtest/gitea-ui.tmpl @@ -165,13 +165,6 @@
item
-
- button dropdown - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
-
item
-
-
search ... @@ -212,18 +205,39 @@
- small dropdown + mini dropdown {{svg "octicon-triangle-down" 12 "dropdown icon"}} -
-
item
-
+
+
+ tiny dropdown + {{svg "octicon-triangle-down" 12 "dropdown icon"}} +
+
+ button dropdown + {{svg "octicon-triangle-down" 14 "dropdown icon"}}
large dropdown {{svg "octicon-triangle-down" 18 "dropdown icon"}} -
-
item
-
+
+
+ +
+
+ mini compact + {{svg "octicon-triangle-down" 12 "dropdown icon"}} +
+
+ tiny compact + {{svg "octicon-triangle-down" 12 "dropdown icon"}} +
+
+ button compact + {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
+
+ large compact + {{svg "octicon-triangle-down" 18 "dropdown icon"}}
diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 2e8732b40b806..8f8e9fa0e81b8 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -26,7 +26,8 @@ {{.locale.Tr "repo.diff.browse_source"}} {{if and ($.Permission.CanWrite $.UnitTypeCode) (not $.Repository.IsArchived) (not .IsDeleted)}}{{- /* */ -}} -
{{.locale.Tr "repo.commit.operations"}} +
+ {{.locale.Tr "repo.commit.operations"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{.locale.Tr "repo.commit.operations"}}
diff --git a/web_src/css/base.css b/web_src/css/base.css index 23930403963ae..6414c26661a98 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -2192,6 +2192,17 @@ table th[data-sortt-desc] .svg { - "> .ui.label > .delete.icon": the "x" icon for removing a label item in multiple selection dropdown */ +.ui.dropdown.mini.button, +.ui.dropdown.tiny.button { + padding-right: 20px; +} +.ui.dropdown.button { + padding-right: 22px; +} +.ui.dropdown.large.button { + padding-right: 28px; +} + /* Gitea uses SVG images instead of Fomantic builtin "" font icons, so we need to reset the icon styles */ .ui.ui.dropdown > .icon.icon { position: initial; /* plain dropdown and button dropdown use flex layout for icons */ From c597f6ba97d467dda0452dba635a73007d0c3447 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 22 Jun 2023 22:44:55 +0800 Subject: [PATCH 2/2] use svg size 14 --- templates/devtest/gitea-ui.tmpl | 12 ++++++------ web_src/css/base.css | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/devtest/gitea-ui.tmpl b/templates/devtest/gitea-ui.tmpl index 73e523b97f896..2c5a54c1c22b6 100644 --- a/templates/devtest/gitea-ui.tmpl +++ b/templates/devtest/gitea-ui.tmpl @@ -206,11 +206,11 @@
mini dropdown - {{svg "octicon-triangle-down" 12 "dropdown icon"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}}
tiny dropdown - {{svg "octicon-triangle-down" 12 "dropdown icon"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}}
button dropdown @@ -218,18 +218,18 @@
large dropdown - {{svg "octicon-triangle-down" 18 "dropdown icon"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}}
mini compact - {{svg "octicon-triangle-down" 12 "dropdown icon"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}}
tiny compact - {{svg "octicon-triangle-down" 12 "dropdown icon"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}}
button compact @@ -237,7 +237,7 @@
large compact - {{svg "octicon-triangle-down" 18 "dropdown icon"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}}
diff --git a/web_src/css/base.css b/web_src/css/base.css index 6414c26661a98..2d649cb511627 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -2200,7 +2200,7 @@ table th[data-sortt-desc] .svg { padding-right: 22px; } .ui.dropdown.large.button { - padding-right: 28px; + padding-right: 24px; } /* Gitea uses SVG images instead of Fomantic builtin "" font icons, so we need to reset the icon styles */