From e0eeee013e62d0cb2ffbb1f81679ad5430ff5654 Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Sat, 14 Aug 2021 17:00:32 +0200 Subject: [PATCH] Fix secondary color on dark themes and theme 7 secondary buttons, formatting --- resources/assets/themes/dark.scss | 1 + resources/assets/themes/theme7.scss | 12 ++++++++++++ src/Renderer/Twig/Extensions/Globals.php | 1 + 3 files changed, 14 insertions(+) diff --git a/resources/assets/themes/dark.scss b/resources/assets/themes/dark.scss index 03e4c6cc..13267a8e 100644 --- a/resources/assets/themes/dark.scss +++ b/resources/assets/themes/dark.scss @@ -2,3 +2,4 @@ $input-group-addon-color: #222; $input-disabled-bg: #111; $alert-bg-scale: 70%; +$secondary: #222; diff --git a/resources/assets/themes/theme7.scss b/resources/assets/themes/theme7.scss index f4c60b20..cac5c8d9 100644 --- a/resources/assets/themes/theme7.scss +++ b/resources/assets/themes/theme7.scss @@ -246,6 +246,18 @@ table, background-image: linear-gradient(to right, rgb(0, 132, 176) , rgb(0, 163, 86)); } +.btn-secondary { + color: $primary; + background-color: #000; + border-color: $primary; + + &:hover { + color: $primary; + background-color: #000; + border-color: darken($primary, 10%); + } +} + .bg-warning { color: #000; } diff --git a/src/Renderer/Twig/Extensions/Globals.php b/src/Renderer/Twig/Extensions/Globals.php index 3ece603a..1b21d241 100644 --- a/src/Renderer/Twig/Extensions/Globals.php +++ b/src/Renderer/Twig/Extensions/Globals.php @@ -6,6 +6,7 @@ use Engelsystem\Helpers\Authenticator; use Engelsystem\Http\Request; use Twig\Extension\AbstractExtension as TwigExtension; use Twig\Extension\GlobalsInterface as GlobalsInterface; + use function array_key_exists; class Globals extends TwigExtension implements GlobalsInterface