friendica
/
themes-community
7
1
Fork 2
Code Issues Pull Requests Releases Activity

fix merge

This commit is contained in:
Jakobus Schürz 2024-02-19 09:06:04 +01:00
parent 33cf47be50
commit eb4dd7c27a
1 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
frio-with-threadview/threadview.php
View File

@ -1,6 +1,6 @@
<?php
/*
* Name: Light
* Name: Threadview
* Licence: AGPL
* Author: Jakob Schürz <jakob@schuerz.at>
* Overwrites: nav_bg, nav_icon_color, link_color, background_color, background_image, login_bg_color, contentbg_transp
@ -19,27 +19,3 @@ $background_color = "#ededed";
$login_bg_color = "#ededed";
$contentbg_transp = 100;
$background_image = '';
||||||| parent of dbdcb07 (Add Threadview to Frio)
=======
<?php
/*
* Name: Light
* Licence: AGPL
* Author: Hypolite Petovan <hypolite@friendica.mrpetovan.com>
* Overwrites: nav_bg, nav_icon_color, link_color, background_color, background_image, login_bg_color, contentbg_transp
* Accented: yes
*/
require_once 'view/theme/frio/php/PHPColors/Color.php';
$accentColor = new Color($scheme_accent);
$nav_bg = '#' . $accentColor->darken(10);
$menu_background_hover_color = '#' . $accentColor->darken(5);
$nav_icon_color = "#fff";
$link_color = '#' . $accentColor->getHex();
$background_color = "#ededed";
$login_bg_color = "#ededed";
$contentbg_transp = 100;
$background_image = '';
>>>>>>> dbdcb07 (Add Threadview to Frio)