Change some label colors (#9051)

* Change label colors

* Override black basic label background for green theme on label list

diff --git a/public/css/theme-arc-green.css b/public/css/theme-arc-green.css
index d4d71ff086e6b83b59d10ca0129d15bd6849294d..53aa58b8b39c79c31781d52d9cac922e8a4c6521 100644 (file)
--- 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 e9dbc7f8777e1bf8f223350cac7c6686d2b5b2fc..26f91faa7430282381bd539e3cfaddedad174f52 100644 (file)
--- a/templates/admin/org/list.tmpl
+++ b/templates/admin/org/list.tmpl
@@ -6,7 +6,7 @@
                <h4 class="ui top attached header">
                        {{.i18n.Tr "admin.orgs.org_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
                        <div class="ui right">
-                               <a class="ui black tiny button" href="{{AppSubUrl}}/org/create">{{.i18n.Tr "admin.orgs.new_orga"}}</a>
+                               <a class="ui blue tiny button" href="{{AppSubUrl}}/org/create">{{.i18n.Tr "admin.orgs.new_orga"}}</a>
                        </div>
                </h4>
                <div class="ui attached segment">

diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
index d590526ca32d0715699e0fdd1bcd6ff4efb4cbea..538f9b7fed32326d72edd04843b3cab94b315be5 100644 (file)
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -6,7 +6,7 @@
                <h4 class="ui top attached header">
                        {{.i18n.Tr "admin.users.user_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
                        <div class="ui right">
-                               <a class="ui black tiny button" href="{{AppSubUrl}}/admin/users/new">{{.i18n.Tr "admin.users.new_account"}}</a>
+                               <a class="ui blue tiny button" href="{{AppSubUrl}}/admin/users/new">{{.i18n.Tr "admin.users.new_account"}}</a>
                        </div>
                </h4>
                <div class="ui attached segment">

diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl
index 93c321cbe7b78354768175e35da98ca3f7d25882..0e53936f0aefe4d642cffd3559d425355d73818c 100644 (file)
--- a/templates/repo/commits_table.tmpl
+++ b/templates/repo/commits_table.tmpl
@@ -18,7 +18,7 @@
                                                <input type="checkbox" name="all" id="all" value="true" {{.All}}>
                                                <label for="all">{{.i18n.Tr "repo.commits.search_all"}} &nbsp;&nbsp;</label>
                                        </div>
-                                       <button class="ui black tiny button" data-panel="#add-deploy-key-panel" data-tooltip={{.i18n.Tr "repo.commits.search.tooltip"}}>{{.i18n.Tr "repo.commits.find"}}</button>
+                                       <button class="ui blue tiny button" data-panel="#add-deploy-key-panel" data-tooltip={{.i18n.Tr "repo.commits.search.tooltip"}}>{{.i18n.Tr "repo.commits.find"}}</button>
                                </form>
                        {{else if .IsDiffCompare}}
                                <a href="{{$.CommitRepoLink}}/commit/{{.BeforeCommitID}}" class="ui green sha label">{{if not .BaseIsCommit}}{{if .BaseIsBranch}}<i class="octicon octicon-git-branch"></i>{{else if .BaseIsTag}}<i class="octicon octicon-tag"></i>{{end}}{{.BaseBranch}}{{else}}{{ShortSha .BaseBranch}}{{end}}</a>

diff --git a/templates/repo/issue/labels.tmpl b/templates/repo/issue/labels.tmpl
index 176304278fa68959281731c5649b79b5176760fe..c3bfc9ccc6742f8ecd0c014a41f89b25e182512c 100644 (file)
--- a/templates/repo/issue/labels.tmpl
+++ b/templates/repo/issue/labels.tmpl
@@ -57,7 +57,7 @@
                        </div>
                </div>
                {{template "base/alert" .}}
-               <div class="ui black label">{{.i18n.Tr "repo.issues.label_count" .NumLabels}}</div>
+               <div class="ui black basic label">{{.i18n.Tr "repo.issues.label_count" .NumLabels}}</div>
                <div class="label list">
                        {{if and (or $.CanWriteIssues $.CanWritePulls) (eq .NumLabels 0) (not $.Repository.IsArchived) }}
                                <div class="ui centered grid">

diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl
index b347ad90e4cd6d97d395fe92be021eedf9a15af2..ad3f0b5c8625b5943380972df294146db0d496b3 100644 (file)
--- a/templates/repo/issue/milestone_issues.tmpl
+++ b/templates/repo/issue/milestone_issues.tmpl
@@ -185,7 +185,7 @@
                                                <input type="checkbox" data-issue-id={{.ID}}></input>
                                        </div>
                                        {{end}}
-                                       <div class="ui {{if .IsRead}}black{{else}}green{{end}} label">#{{.Index}}</div>
+                                       <div class="ui {{if .IsRead}}gray{{else}}green{{end}} label">#{{.Index}}</div>
                                        <a class="title has-emoji" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title}}</a>
 
                                        {{range .Labels}}

diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl
index de541dcd1749762809ba39f82042c0a78c288749..e746400a8ffe2e0949424a5f31288ce7bbf2598a 100644 (file)
--- a/templates/user/settings/organization.tmpl
+++ b/templates/user/settings/organization.tmpl
@@ -7,7 +7,7 @@
                        {{.i18n.Tr "settings.orgs"}}
                        {{if .SignedUser.CanCreateOrganization}}
                        <div class="ui right">
-                               <a class="ui black tiny button" href="{{AppSubUrl}}/org/create">{{.i18n.Tr "admin.orgs.new_orga"}}</a>
+                               <a class="ui blue tiny button" href="{{AppSubUrl}}/org/create">{{.i18n.Tr "admin.orgs.new_orga"}}</a>
                        </div>
                        {{end}}
                </h4>

diff --git a/web_src/less/themes/arc-green.less b/web_src/less/themes/arc-green.less
index 43f4d9d147083533ca04588a1ef0f2af2c5c809a..29a9723726db2b15e1d7a16b732ce3fe7391c9eb 100644 (file)
--- 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;
 }