From 8875586570599f92ba9ab0def1ed87b7efc411fc Mon Sep 17 00:00:00 2001 From: jaqra <48099350+jaqra@users.noreply.github.com> Date: Wed, 4 Dec 2019 04:39:58 +0300 Subject: [PATCH] Change some label colors (#9051) * Change label colors * Override black basic label background for green theme on label list --- public/css/theme-arc-green.css | 1 + templates/admin/org/list.tmpl | 2 +- templates/admin/user/list.tmpl | 2 +- templates/repo/commits_table.tmpl | 2 +- templates/repo/issue/labels.tmpl | 2 +- templates/repo/issue/milestone_issues.tmpl | 2 +- templates/user/settings/organization.tmpl | 2 +- web_src/less/themes/arc-green.less | 4 ++++ 8 files changed, 11 insertions(+), 6 deletions(-) diff --git a/public/css/theme-arc-green.css b/public/css/theme-arc-green.css index d4d71ff086e..53aa58b8b39 100644 --- a/public/css/theme-arc-green.css +++ b/public/css/theme-arc-green.css @@ -208,6 +208,7 @@ input{background:#2e323e} .ui.blue.button:focus,.ui.blue.buttons .button:focus{background-color:#a27558} .ui.basic.blue.button:hover,.ui.basic.blue.buttons .button:hover{box-shadow:0 0 0 1px #87ab63 inset!important;color:#87ab63!important} .ui.basic.blue.button:focus,.ui.basic.blue.buttons .button:focus{box-shadow:0 0 0 1px #87ab63 inset!important;color:#87ab63!important} +.repository.labels .ui.basic.black.label{background-color:#bbb!important} .lines-commit{background:#2e323e!important} .bottom-line{border-color:#4e525e!important} .lines-num{background:#2e323e!important;color:#9e9e9e!important;border-color:#2d2d2d!important} diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index e9dbc7f8777..26f91faa743 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -6,7 +6,7 @@

{{.i18n.Tr "admin.orgs.org_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
- {{.i18n.Tr "admin.orgs.new_orga"}} + {{.i18n.Tr "admin.orgs.new_orga"}}

diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index d590526ca32..538f9b7fed3 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -6,7 +6,7 @@

{{.i18n.Tr "admin.users.user_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
- {{.i18n.Tr "admin.users.new_account"}} + {{.i18n.Tr "admin.users.new_account"}}

diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index 93c321cbe7b..0e53936f0ae 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -18,7 +18,7 @@
- + {{else if .IsDiffCompare}} {{if not .BaseIsCommit}}{{if .BaseIsBranch}}{{else if .BaseIsTag}}{{end}}{{.BaseBranch}}{{else}}{{ShortSha .BaseBranch}}{{end}} diff --git a/templates/repo/issue/labels.tmpl b/templates/repo/issue/labels.tmpl index 176304278fa..c3bfc9ccc67 100644 --- a/templates/repo/issue/labels.tmpl +++ b/templates/repo/issue/labels.tmpl @@ -57,7 +57,7 @@
{{template "base/alert" .}} -
{{.i18n.Tr "repo.issues.label_count" .NumLabels}}
+
{{.i18n.Tr "repo.issues.label_count" .NumLabels}}
{{if and (or $.CanWriteIssues $.CanWritePulls) (eq .NumLabels 0) (not $.Repository.IsArchived) }}
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index b347ad90e4c..ad3f0b5c862 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -185,7 +185,7 @@
{{end}} -
#{{.Index}}
+
#{{.Index}}
{{.Title}} {{range .Labels}} diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl index de541dcd174..e746400a8ff 100644 --- a/templates/user/settings/organization.tmpl +++ b/templates/user/settings/organization.tmpl @@ -7,7 +7,7 @@ {{.i18n.Tr "settings.orgs"}} {{if .SignedUser.CanCreateOrganization}}
- {{.i18n.Tr "admin.orgs.new_orga"}} + {{.i18n.Tr "admin.orgs.new_orga"}}
{{end}} diff --git a/web_src/less/themes/arc-green.less b/web_src/less/themes/arc-green.less index 43f4d9d1470..29a9723726d 100644 --- a/web_src/less/themes/arc-green.less +++ b/web_src/less/themes/arc-green.less @@ -1074,6 +1074,10 @@ input { color: #87ab63 !important; } +.repository.labels .ui.basic.black.label { + background-color: #bbbbbb !important; +} + .lines-commit { background: #2e323e !important; }