harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into zpull

Browse Source
This commit is contained in:
friendica 2013-06-09 16:27:39 -07:00
commit 6914a4eeac
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mod/acl.php
View File

@ -251,6 +251,7 @@ function navbar_complete(&$a) {
} }
if(! $url) { if(! $url) {
require_once("include/dir_fns.php");
$directory = find_upstream_directory($dirmode); $directory = find_upstream_directory($dirmode);
if($directory) { if($directory) {

4
view/theme/redbasic/css/style.css
View File

@ -3389,6 +3389,8 @@ color-stop(0.82, #b00)
); );
} }
/*
nav:hover { nav:hover {
background-image: linear-gradient(bottom, #f00 26%, #b00 82%); background-image: linear-gradient(bottom, #f00 26%, #b00 82%);
@ -3406,6 +3408,8 @@ color-stop(0.82, #b00)
); );
} }
*/
nav a, nav a,
nav a:active, nav a:active,
nav a:visited, nav a:visited,

1
view/theme/redbasic/php/style.php
View File

@ -44,6 +44,7 @@
if ($colour_scheme === 'fancyred') {$shadows = true; $navcolour = 'black'; $displaystyle = 'fancy'; $linkcolour = 'f00'; $shiny = "opaque";} if ($colour_scheme === 'fancyred') {$shadows = true; $navcolour = 'black'; $displaystyle = 'fancy'; $linkcolour = 'f00'; $shiny = "opaque";}
// Dark themes are very different - we need to do some of these from scratch, so don't bother setting vars for anything else // Dark themes are very different - we need to do some of these from scratch, so don't bother setting vars for anything else
if ($colour_scheme === 'dark') {$colour = 'dark'; $navcolour = 'black';} if ($colour_scheme === 'dark') {$colour = 'dark'; $navcolour = 'black';}
if ($colour_scheme === 'redbasic'){$navcolour = 'red';}
} }
// This is probably the easiest place to apply global settings. Don't bother with site line height and such. Instead, check pconfig for global user settings. // This is probably the easiest place to apply global settings. Don't bother with site line height and such. Instead, check pconfig for global user settings.