From 4147cc91ed07666613fa84cd8caffde9b1a8b916 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alexey=20=E3=80=92erentyev?= <axifnx@gmail.com>
Date: Thu, 19 Dec 2019 06:35:03 +0300
Subject: [PATCH] Fix background reactions in the arc-green theme (#9421)

* Fixed arc-green theme reactions background

Signed-off-by: Alexey Terentyev <axifnx@gmail.com>

* Added MD5 AppVer

Signed-off-by: Alexey Terentyev <axifnx@gmail.com>
---
 templates/base/head.tmpl            | 4 ++--
 templates/pwa/serviceworker_js.tmpl | 4 ++--
 web_src/less/themes/arc-green.less  | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index b8fb6d29ef..72ca779e91 100644
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -163,10 +163,10 @@
 <meta property="og:site_name" content="{{AppName}}" />
 {{if .IsSigned }}
 	{{ if ne .SignedUser.Theme "gitea" }}
-		<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/theme-{{.SignedUser.Theme}}.css">
+		<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/theme-{{.SignedUser.Theme}}.css?v={{MD5 AppVer}}">
 	{{end}}
 {{else if ne DefaultTheme "gitea"}}
-	<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/theme-{{DefaultTheme}}.css">
+	<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/theme-{{DefaultTheme}}.css?v={{MD5 AppVer}}">
 {{end}}
 {{template "custom/header" .}}
 </head>
diff --git a/templates/pwa/serviceworker_js.tmpl b/templates/pwa/serviceworker_js.tmpl
index c33b7fdb0e..c3e97030c1 100644
--- a/templates/pwa/serviceworker_js.tmpl
+++ b/templates/pwa/serviceworker_js.tmpl
@@ -33,10 +33,10 @@ var urlsToCache = [
   '{{StaticUrlPrefix}}/vendor/plugins/dropzone/dropzone.css',
 {{if .IsSigned }}
 	{{ if ne .SignedUser.Theme "gitea" }}
-		'{{StaticUrlPrefix}}/css/theme-{{.SignedUser.Theme}}.css',
+		'{{StaticUrlPrefix}}/css/theme-{{.SignedUser.Theme}}.css?v={{MD5 AppVer}}',
 	{{end}}
 {{else if ne DefaultTheme "gitea"}}
-	'{{StaticUrlPrefix}}/css/theme-{{DefaultTheme}}.css',
+	'{{StaticUrlPrefix}}/css/theme-{{DefaultTheme}}.css?v={{MD5 AppVer}}',
 {{end}}
 
   // img
diff --git a/web_src/less/themes/arc-green.less b/web_src/less/themes/arc-green.less
index 7bb39a6281..69e8963fbb 100644
--- a/web_src/less/themes/arc-green.less
+++ b/web_src/less/themes/arc-green.less
@@ -305,7 +305,8 @@ footer {
     color: #dbdbdb;
 }
 
-.ui.label {
+.ui.label,
+.ui.label.basic {
     color: #dbdbdb;
     background-color: #404552;
 }
@@ -400,7 +401,8 @@ a.ui.basic.green.label:hover {
 }
 
 .ui.blue.label,
-.ui.blue.labels .label {
+.ui.blue.labels .label,
+.repository .segment.reactions .ui.label.basic.blue {
     background-color: #26577b !important;
     border-color: #26577b !important;
 }
-- 
2.39.5