Merge pull request #9687 from annando/drop-unused

[friendica.git] / view / theme / frio / style.php

diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index 0309daf94a38a0ecfba5edeb41a378d7137cf44b..b70f5657ab4e0fee6aa8ad941e1f1234fee263c7 100644 (file)
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -22,6 +22,7 @@
 use Friendica\DI;
 use Friendica\Util\Strings;
 
+require_once 'view/theme/frio/theme.php';
 require_once 'view/theme/frio/php/PHPColors/Color.php';
 
 $scheme = '';
@@ -33,6 +34,7 @@ DI::config()->load('frio');
 
 // Default to hard-coded values for empty settings
 $scheme           = DI::config()->get('frio', 'scheme', DI::config()->get('frio', 'schema'));
+$scheme_accent    = DI::config()->get('frio', 'scheme_accent')    ?: FRIO_SCHEME_ACCENT_BLUE;
 $nav_bg           = DI::config()->get('frio', 'nav_bg')           ?: '#708fa0';
 $nav_icon_color   = DI::config()->get('frio', 'nav_icon_color')   ?: '#ffffff';
 $link_color       = DI::config()->get('frio', 'link_color')       ?: '#6fdbe8';
@@ -56,6 +58,7 @@ if ($uid) {
 
        // Only override display settings that have actually been set
        $scheme           = DI::pConfig()->get($uid, 'frio', 'scheme', DI::pConfig()->get($uid, 'frio', 'schema')) ?: $scheme;
+       $scheme_accent    = DI::pConfig()->get($uid, 'frio', 'scheme_accent')    ?: $scheme_accent;
        $nav_bg           = DI::pConfig()->get($uid, 'frio', 'nav_bg')           ?: $nav_bg;
        $nav_icon_color   = DI::pConfig()->get($uid, 'frio', 'nav_icon_color')   ?: $nav_icon_color;
        $link_color       = DI::pConfig()->get($uid, 'frio', 'link_color')       ?: $link_color;
@@ -123,7 +126,7 @@ if (!isset($nav_icon_hover_color)) {
        if ($nihc->isLight()) {
                $nav_icon_hover_color = '#' . $nihc->darken(10);
        } else {
-               $nav_icon_hover_color = '#' . $nihc->lighten(10);
+               $nav_icon_hover_color = '#' . $nihc->lighten(20);
        }
 }
 if (!isset($link_hover_color)) {
@@ -184,7 +187,9 @@ $options = [
        '$background_size_img'         => $background_size_img,
        '$background_repeat'           => $background_repeat,
        '$login_bg_image'              => $login_bg_image,
-       '$login_bg_color'              => $login_bg_color
+       '$login_bg_color'              => $login_bg_color,
+       '$font_color_darker'           => $font_color_darker ?? '#555',
+       '$font_color'                  => $font_color ?? '#777',
 ];
 
 $css_tpl = file_get_contents('view/theme/frio/css/style.css');