forked from friendica/themes-community
fix merge
This commit is contained in:
parent
c2f2460c07
commit
2019000e8c
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue