Update translation fie after adding a string

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

diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index 3d9c7743ab8e1a6161d929b10e887f483e159c85..b39cef10294d96c910d51685b1ac9204794e5d90 100644 (file)
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -20,8 +20,10 @@
  */
 
 use Friendica\DI;
+use Friendica\Network\HTTPException\NotModifiedException;
 use Friendica\Util\Strings;
 
+require_once 'view/theme/frio/theme.php';
 require_once 'view/theme/frio/php/PHPColors/Color.php';
 
 $scheme = '';
@@ -33,11 +35,12 @@ 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';
 $background_color = DI::config()->get('frio', 'background_color') ?: '#ededed';
-$contentbg_transp = DI::config()->get('frio', 'contentbg_transp') ?: '';
+$contentbg_transp = DI::config()->get('frio', 'contentbg_transp') ?? 100;
 $background_image = DI::config()->get('frio', 'background_image') ?: 'img/none.png';
 $bg_image_option  = DI::config()->get('frio', 'bg_image_option')  ?: '';
 $login_bg_image   = DI::config()->get('frio', 'login_bg_image')   ?: '';
@@ -56,11 +59,12 @@ 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;
        $background_color = DI::pConfig()->get($uid, 'frio', 'background_color') ?: $background_color;
-       $contentbg_transp = DI::pConfig()->get($uid, 'frio', 'contentbg_transp') ?: $contentbg_transp;
+       $contentbg_transp = DI::pConfig()->get($uid, 'frio', 'contentbg_transp') ?? $contentbg_transp;
        $background_image = DI::pConfig()->get($uid, 'frio', 'background_image') ?: $background_image;
        $bg_image_option  = DI::pConfig()->get($uid, 'frio', 'bg_image_option')  ?: $bg_image_option;
        $modified         = DI::pConfig()->get($uid, 'frio', 'css_modified')     ?: $modified;
@@ -123,7 +127,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 +188,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 ?? '#222',
+       '$font_color'                  => $font_color ?? '#444',
 ];
 
 $css_tpl = file_get_contents('view/theme/frio/css/style.css');
@@ -220,8 +226,7 @@ if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && isset($_SERVER['HTTP_IF_NONE_MA
                                stripslashes($_SERVER['HTTP_IF_NONE_MATCH']));
 
        if (($cached_modified == $modified) && ($cached_etag == $etag)) {
-               header('HTTP/1.1 304 Not Modified');
-               exit();
+               throw new NotModifiedException();
        }
 }