From 7b33b08f1d43e369761fc690c8efcab0dda0b5ae Mon Sep 17 00:00:00 2001 From: Gusted Date: Tue, 9 Aug 2022 05:44:18 +0200 Subject: [PATCH 1/3] Make branch icon stand out more - Currently the branch icon is "squashed" between the two branch names and feels a bit "amateur-ish" to my feeling(relative to other UI elements). - This patch tries to improve that by making the icon bigger and by adding some margin to not have a "squashed" icon. - This patch also includes a "fix", for some reason this symbol is not centering correctly within the span(or without for that matter), so simply manually patch this by adding `bottom: 1.px`. --- templates/shared/issuelist.tmpl | 2 +- web_src/less/shared/issuelist.less | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index f4e0674be407..1551cf2bb98f 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -72,7 +72,7 @@ - « + « {{if .PullRequest.HeadRepo}}
diff --git a/web_src/less/shared/issuelist.less b/web_src/less/shared/issuelist.less index a0331a1cbeb5..0f016b9d8d00 100644 --- a/web_src/less/shared/issuelist.less +++ b/web_src/less/shared/issuelist.less @@ -135,6 +135,13 @@ text-overflow: ellipsis; max-width: 10em; } + + .branch-icon { + bottom: 1.5px; + font-size: 22px; + margin: 0 .2em; + position: relative; + } } > .item + .item { From 97e4f506edef7152a1d2cc36ade320860a0cdc3b Mon Sep 17 00:00:00 2001 From: Gusted Date: Tue, 9 Aug 2022 13:22:05 +0200 Subject: [PATCH 2/3] Use svg --- templates/shared/issuelist.tmpl | 2 +- web_src/less/shared/issuelist.less | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index 1551cf2bb98f..d6d95e900fd0 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -72,7 +72,7 @@
- « + {{svg "gitea-double-chevron-left"}} {{if .PullRequest.HeadRepo}}
diff --git a/web_src/less/shared/issuelist.less b/web_src/less/shared/issuelist.less index 0f016b9d8d00..1d7f87ad8f14 100644 --- a/web_src/less/shared/issuelist.less +++ b/web_src/less/shared/issuelist.less @@ -137,8 +137,7 @@ } .branch-icon { - bottom: 1.5px; - font-size: 22px; + top: 1.5px; margin: 0 .2em; position: relative; } From d5f772b4a9e537a3ff606599376a3a95c6196ae6 Mon Sep 17 00:00:00 2001 From: Gusted Date: Tue, 9 Aug 2022 17:32:39 +0200 Subject: [PATCH 3/3] Apply suggestion Co-authored-by: silverwind --- templates/shared/issuelist.tmpl | 10 ++++------ web_src/less/shared/issuelist.less | 8 +------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index d6d95e900fd0..86d67cb17874 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -64,19 +64,17 @@ {{$.locale.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}} {{end}} {{if .IsPull}} -
+
- - {{svg "gitea-double-chevron-left"}} - + {{svg "gitea-double-chevron-left" 12 "mx-1"}} {{if .PullRequest.HeadRepo}}
- + {{/* inline to remove the spaces between spans */}} {{if ne .RepoID .PullRequest.HeadRepoID}}{{.PullRequest.HeadRepo.OwnerName}}:{{end}}{{.PullRequest.HeadBranch}} diff --git a/web_src/less/shared/issuelist.less b/web_src/less/shared/issuelist.less index 1d7f87ad8f14..2dffe19909a2 100644 --- a/web_src/less/shared/issuelist.less +++ b/web_src/less/shared/issuelist.less @@ -122,7 +122,7 @@ .branches { display: inline-flex; - padding: 0 6px; + padding: 0 4px; .branch { background-color: var(--color-secondary); @@ -135,12 +135,6 @@ text-overflow: ellipsis; max-width: 10em; } - - .branch-icon { - top: 1.5px; - margin: 0 .2em; - position: relative; - } } > .item + .item {