nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #7377 from friendica/revert-7374-task/frio/default-to-login

Browse source 
Revert "Default theme = login theme"
This commit is contained in:
Hypolite Petovan 2019-07-14 15:19:08 -04:00 committed by GitHub
parent 1f2047d703 2b8a99fabe
commit 06f6bc8a4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
view/theme/frio/style.php
View file

@ -96,12 +96,12 @@ if (!$scheme) {
//Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting
//individually. If we don't, we'll have problems if a user has set one, but not all options. //individually. If we don't, we'll have problems if a user has set one, but not all options.
$nav_bg = (empty($nav_bg) ? Config::get('frio', 'nav_bg', '#708fa0') : $nav_bg); $nav_bg = (empty($nav_bg) ? '#708fa0' : $nav_bg);
$nav_icon_color = (empty($nav_icon_color) ? Config::get('frio', 'nav_icon_color', '#fff') : $nav_icon_color); $nav_icon_color = (empty($nav_icon_color) ? '#fff' : $nav_icon_color);
$link_color = (empty($link_color) ? Config::get('frio', 'link_color', '#6fdbe8') : $link_color); $link_color = (empty($link_color) ? '#6fdbe8' : $link_color);
$background_color = (empty($background_color) ? Config::get('frio', 'background_color', '#ededed') : $background_color); $background_color = (empty($background_color) ? '#ededed' : $background_color);
// The background image can not be empty. So we use a dummy jpg if no image was set. // The background image can not be empty. So we use a dummy jpg if no image was set.
$background_image = (empty($background_image) ? Config::get('frio', 'background_image', 'img/none.png') : $background_image); $background_image = (empty($background_image) ? 'img/none.png' : $background_image);
$modified = (empty($modified) ? time() : $modified); $modified = (empty($modified) ? time() : $modified);