From 15414564bef1e979f98de7f44e5313e7e9f4247c Mon Sep 17 00:00:00 2001 From: Damien Pollet Date: Tue, 5 Nov 2019 13:56:40 +0100 Subject: [PATCH 1/4] Theme arc-green: reverse heatmap colors This uses the same colors as the updated palette in the base theme. See #8709 and #5864, in particular [my comment showing the problem](https://github.com/go-gitea/gitea/issues/5864#issuecomment-462334171) --- public/less/themes/arc-green.less | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/public/less/themes/arc-green.less b/public/less/themes/arc-green.less index 27c32728a2f61..20fb56f08996c 100644 --- a/public/less/themes/arc-green.less +++ b/public/less/themes/arc-green.less @@ -1298,6 +1298,26 @@ a.ui.labels .label:hover { background-color: #2d303b; } +.heatmap-color-1 { + background-color: #025900; +} + +.heatmap-color-2 { + background-color: #609926; +} + +.heatmap-color-3 { + background-color: #66c74b; +} + +.heatmap-color-4 { + background-color: #9fdb81; +} + +.heatmap-color-5 { + background-color: #d8efbf; +} + /* code mirror dark theme */ .CodeMirror { From 3248ca31f1f42ea3f6019fdde22402a22b617b53 Mon Sep 17 00:00:00 2001 From: Damien Pollet Date: Wed, 6 Nov 2019 15:21:28 +0100 Subject: [PATCH 2/4] Use link color as hot, interpolate between hot and cold colors --- public/less/themes/arc-green.less | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/public/less/themes/arc-green.less b/public/less/themes/arc-green.less index 20fb56f08996c..bfdb96af1b0d7 100644 --- a/public/less/themes/arc-green.less +++ b/public/less/themes/arc-green.less @@ -1294,28 +1294,34 @@ a.ui.labels .label:hover { } } +.heatmap(@heat) { + @heatmap-cold: #2d303b; + @heatmap-hot: #87ab63; + background-color: mix(@heatmap-hot, @heatmap-cold, @heat); +} + .heatmap-color-0 { - background-color: #2d303b; + .heatmap(0%); } .heatmap-color-1 { - background-color: #025900; + .heatmap(20%); } .heatmap-color-2 { - background-color: #609926; + .heatmap(40%); } .heatmap-color-3 { - background-color: #66c74b; + .heatmap(60%); } .heatmap-color-4 { - background-color: #9fdb81; + .heatmap(80%); } .heatmap-color-5 { - background-color: #d8efbf; + .heatmap(100%); } /* code mirror dark theme */ From da1a0ed25447036d2a0530f8d5ac9a5365f1f91c Mon Sep 17 00:00:00 2001 From: Damien Pollet Date: Tue, 5 Nov 2019 14:03:00 +0100 Subject: [PATCH 3/4] Rebuild CSS --- public/css/theme-arc-green.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/css/theme-arc-green.css b/public/css/theme-arc-green.css index 28a127a3dd7b1..97142b9b4ae4b 100644 --- a/public/css/theme-arc-green.css +++ b/public/css/theme-arc-green.css @@ -249,6 +249,11 @@ a.ui.label:hover,a.ui.labels .label:hover{background-color:#505667!important;col .xdsoft_datetimepicker .xdsoft_datepicker .xdsoft_calendar td,.xdsoft_datetimepicker .xdsoft_datepicker .xdsoft_calendar th{border-color:#4c505c;background-color:#2a2e39} .xdsoft_datetimepicker .xdsoft_datepicker .xdsoft_calendar td.xdsoft_disabled,.xdsoft_datetimepicker .xdsoft_datepicker .xdsoft_calendar td.xdsoft_other_month{opacity:.8;background:#a0cc75;color:#000} .heatmap-color-0{background-color:#2d303b} +.heatmap-color-1{background-color:#3f4943} +.heatmap-color-2{background-color:#51614b} +.heatmap-color-3{background-color:#637a53} +.heatmap-color-4{background-color:#75925b} +.heatmap-color-5{background-color:#87ab63} .CodeMirror{color:#9daccc;background-color:#2b2b2b;border-top:0} .CodeMirror div.CodeMirror-cursor{border-left:1px solid #9e9e9e} .CodeMirror .CodeMirror-gutters{background-color:#2b2b2b} From 0ba375d1ba1a1d411beafe4960e66fdf91261d89 Mon Sep 17 00:00:00 2001 From: Damien Pollet Date: Wed, 6 Nov 2019 16:19:20 +0100 Subject: [PATCH 4/4] Use color from a:hover --- public/css/theme-arc-green.css | 10 +++++----- public/less/themes/arc-green.less | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/css/theme-arc-green.css b/public/css/theme-arc-green.css index 97142b9b4ae4b..74a7c3ddc3157 100644 --- a/public/css/theme-arc-green.css +++ b/public/css/theme-arc-green.css @@ -249,11 +249,11 @@ a.ui.label:hover,a.ui.labels .label:hover{background-color:#505667!important;col .xdsoft_datetimepicker .xdsoft_datepicker .xdsoft_calendar td,.xdsoft_datetimepicker .xdsoft_datepicker .xdsoft_calendar th{border-color:#4c505c;background-color:#2a2e39} .xdsoft_datetimepicker .xdsoft_datepicker .xdsoft_calendar td.xdsoft_disabled,.xdsoft_datetimepicker .xdsoft_datepicker .xdsoft_calendar td.xdsoft_other_month{opacity:.8;background:#a0cc75;color:#000} .heatmap-color-0{background-color:#2d303b} -.heatmap-color-1{background-color:#3f4943} -.heatmap-color-2{background-color:#51614b} -.heatmap-color-3{background-color:#637a53} -.heatmap-color-4{background-color:#75925b} -.heatmap-color-5{background-color:#87ab63} +.heatmap-color-1{background-color:#444f47} +.heatmap-color-2{background-color:#5b6e52} +.heatmap-color-3{background-color:#728e5e} +.heatmap-color-4{background-color:#89ad69} +.heatmap-color-5{background-color:#a0cc75} .CodeMirror{color:#9daccc;background-color:#2b2b2b;border-top:0} .CodeMirror div.CodeMirror-cursor{border-left:1px solid #9e9e9e} .CodeMirror .CodeMirror-gutters{background-color:#2b2b2b} diff --git a/public/less/themes/arc-green.less b/public/less/themes/arc-green.less index bfdb96af1b0d7..06e7c78d41b71 100644 --- a/public/less/themes/arc-green.less +++ b/public/less/themes/arc-green.less @@ -1296,7 +1296,7 @@ a.ui.labels .label:hover { .heatmap(@heat) { @heatmap-cold: #2d303b; - @heatmap-hot: #87ab63; + @heatmap-hot: #a0cc75; background-color: mix(@heatmap-hot, @heatmap-cold, @heat); }