From 00b2afb2224f1319af367539c9db8bc484c1f8bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 27 Mar 2019 16:03:31 +0100
Subject: [PATCH] Darken element color and add exception for primary buttons
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
apps/theming/css/theming.scss | 22 ++++++++++++++++++++++
apps/theming/lib/Util.php | 2 +-
core/img/actions/checkbox-mixed-dark.svg | 1 +
3 files changed, 24 insertions(+), 1 deletion(-)
create mode 100644 core/img/actions/checkbox-mixed-dark.svg
diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss
index 7db64924f34..ae0e7ad2f8b 100644
--- a/apps/theming/css/theming.scss
+++ b/apps/theming/css/theming.scss
@@ -203,6 +203,28 @@ input.primary,
}
}
+/** Handle primary buttons for bright colors */
+@if (luma($color-primary) > 0.8) {
+ select,
+ button, .button,
+ input:not([type='range']),
+ textarea,
+ div[contenteditable=true],
+ .pager li a {
+ &.primary:not(:disabled) {
+ background-color: var(--color-background-dark);
+ color: var(--color-main-text);
+ border: 1px solid var(--color-background-darker);
+
+ &:hover, &:focus, &:active {
+ background-color: var(--color-background-darker);
+ color: var(--color-main-text);
+ }
+ }
+ }
+
+}
+
@if ($color-primary == #ffffff) {
/* show grey border below header */
#body-user #header,
diff --git a/apps/theming/lib/Util.php b/apps/theming/lib/Util.php
index 38b876f3610..75abea142c8 100644
--- a/apps/theming/lib/Util.php
+++ b/apps/theming/lib/Util.php
@@ -79,7 +79,7 @@ class Util {
public function elementColor($color) {
$l = $this->calculateLuminance($color);
if($l>0.8) {
- return '#dddddd';
+ return '#aaaaaa';
}
return $color;
}
diff --git a/core/img/actions/checkbox-mixed-dark.svg b/core/img/actions/checkbox-mixed-dark.svg
new file mode 100644
index 00000000000..2f3fd3fa82d
--- /dev/null
+++ b/core/img/actions/checkbox-mixed-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M4 7v2h8V7H4z" fill="#fff"/></svg>
--
GitLab