From 1c7496c7a7e4c3145ab90bbef129dd7c1a0189dd Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 22 Nov 2022 00:10:42 +0100 Subject: [PATCH] Webhook list enhancements (#21893) --- templates/admin/queue.tmpl | 2 +- templates/repo/settings/webhook/base_list.tmpl | 8 +++----- web_src/less/_admin.less | 4 ++-- web_src/less/_base.less | 6 ++++++ web_src/less/_repository.less | 4 ++-- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl index cd50798f8..675ec417e 100644 --- a/templates/admin/queue.tmpl +++ b/templates/admin/queue.tmpl @@ -161,7 +161,7 @@ {{DateFmtLong .Start}} {{if .HasTimeout}}{{DateFmtLong .Timeout}}{{else}}-{{end}} - {{svg "octicon-trash"}} + {{svg "octicon-trash"}} {{else}} diff --git a/templates/repo/settings/webhook/base_list.tmpl b/templates/repo/settings/webhook/base_list.tmpl index f96c48d4c..333764a7e 100644 --- a/templates/repo/settings/webhook/base_list.tmpl +++ b/templates/repo/settings/webhook/base_list.tmpl @@ -55,11 +55,9 @@ {{else}} {{svg "octicon-dot-fill"}} {{end}} - {{.URL}} -
- {{svg "octicon-pencil"}} - {{svg "octicon-trash"}} -
+ {{.URL}} + {{svg "octicon-pencil"}} + {{svg "octicon-trash"}} {{end}} diff --git a/web_src/less/_admin.less b/web_src/less/_admin.less index b18bc7c5e..26417d42e 100644 --- a/web_src/less/_admin.less +++ b/web_src/less/_admin.less @@ -3,8 +3,8 @@ > .item { &:not(:first-child) { border-top: 1px solid var(--color-secondary); - padding: 1rem; - margin: 15px -1rem -1rem; + padding: .25rem 1rem; + margin: 12px -1rem -1rem; } } } diff --git a/web_src/less/_base.less b/web_src/less/_base.less index e49721f7e..6054331ec 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -307,6 +307,11 @@ a.muted:hover [class*="color-text"], color: var(--color-primary); } +.delete-button, +.delete-button:hover { + color: var(--color-red); +} + a.label, .repository-menu a, .ui.search .results a, @@ -2571,6 +2576,7 @@ table th[data-sortt-desc] { .truncated-item-container { display: flex !important; + align-items: center; } .ellipsis-button { diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 63f1f954a..f89a5df33 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -2616,8 +2616,8 @@ > .item { &:not(:first-child) { border-top: 1px solid var(--color-secondary); - padding: 1rem; - margin: 15px -1rem -1rem; + padding: .25rem 1rem; + margin: 12px -1rem -1rem; } > .svg {