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-10-11 20:44:54 -07:00
commit 0bfcc31bf9
5 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/text.php
View File

@ -364,7 +364,7 @@ function alt_pager(&$a, $i, $more = '', $less = '') {
return replace_macros(get_markup_template('alt_pager.tpl'),array( return replace_macros(get_markup_template('alt_pager.tpl'),array(
'$has_less' => (($a->pager['page'] > 1) ? true : false), '$has_less' => (($a->pager['page'] > 1) ? true : false),
'$has_more' => (($i > 0 && $i == $a->pager['itemspage']) ? true : false), '$has_more' => (($i > 0 && $i >= $a->pager['itemspage']) ? true : false),
'$less' => $less, '$less' => $less,
'$more' => $more, '$more' => $more,
'$url' => $url, '$url' => $url,

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

@ -74,6 +74,7 @@ blockquote {
background-color: #f4f8f9; background-color: #f4f8f9;
border-left: 4px solid #dae4ee; border-left: 4px solid #dae4ee;
padding: 0.4em; padding: 0.4em;
color: #000;
} }
.ccollapse-wrapper { .ccollapse-wrapper {

2
view/theme/redbasic/php/config.php
View File

@ -5,7 +5,7 @@ function theme_content(&$a) {
$schema = get_pconfig(local_user(),'redbasic', 'schema' ); $schema = get_pconfig(local_user(),'redbasic', 'schema' );
$nav_colour = get_pconfig(local_user(),'redbasic', 'nav_colour' ); $nav_colour = get_pconfig(local_user(),'redbasic', 'nav_colour' );
$bgcolour = get_pconfig(local_user(),'redbasic', 'bgcolour' ); $bgcolour = get_pconfig(local_user(),'redbasic', 'background_colour' );
$background_image = get_pconfig(local_user(),'redbasic', 'background_image' ); $background_image = get_pconfig(local_user(),'redbasic', 'background_image' );
$item_colour = get_pconfig(local_user(),'redbasic', 'item_colour' ); $item_colour = get_pconfig(local_user(),'redbasic', 'item_colour' );
$item_opacity = get_pconfig(local_user(),'redbasic', 'item_opacity' ); $item_opacity = get_pconfig(local_user(),'redbasic', 'item_opacity' );

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

@ -11,25 +11,6 @@
// A further two - $nav_bg_3 and $nav_bg_4 are used to create the hover, if any particular scheme // A further two - $nav_bg_3 and $nav_bg_4 are used to create the hover, if any particular scheme
// wants to implement that // wants to implement that
$nav_colour = get_pconfig($uid, "redbasic", "nav_colour"); $nav_colour = get_pconfig($uid, "redbasic", "nav_colour");
if ($nav_colour == "red") {
$nav_bg_1 = "#f88";
$nav_bg_2 = "#b00";
$nav_bg_3 = "#f00";
$nav_bg_4 = "#b00";
$search_background = '#FFDDDD';
$active_colour = '#444444';
}
if ($nav_colour == "black") {
$nav_bg_1 = $nav_bg_3 = "#000";
$nav_bg_2 = $nav_bg_4 = "#222";
$search_background = '#EEEEEE';
$active_colour = '#AAAAAA';
}
if ($nav_colour == "silver") {
$nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver";
$search_background = '#EEEEEE';
}
// Load the owners pconfig // Load the owners pconfig
$schema = get_pconfig($uid,'redbasic','schema'); $schema = get_pconfig($uid,'redbasic','schema');
@ -91,6 +72,30 @@
$active_colour = '#FFFFFF'; $active_colour = '#FFFFFF';
// Nav colours have nested values, so we have to define the actual variables
// used in the CSS from the higher level "red", "black", etc here
if ($nav_colour == "red") {
$nav_bg_1 = "#f88";
$nav_bg_2 = "#b00";
$nav_bg_3 = "#f00";
$nav_bg_4 = "#b00";
$search_background = '#FFDDDD';
$active_colour = '#444444';
}
if ($nav_colour == "black") {
$nav_bg_1 = $nav_bg_3 = "#000";
$nav_bg_2 = $nav_bg_4 = "#222";
$search_background = '#EEEEEE';
$active_colour = '#AAAAAA';
}
if ($nav_colour == "silver") {
$nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver";
$search_background = '#EEEEEE';
}
// Apply the settings // Apply the settings
if(file_exists('view/theme/' . current_theme() . '/css/style.css')) { if(file_exists('view/theme/' . current_theme() . '/css/style.css')) {
$x = file_get_contents('view/theme/' . current_theme() . '/css/style.css'); $x = file_get_contents('view/theme/' . current_theme() . '/css/style.css');

10
view/theme/redbasic/schema/dark.php Normal file
View File

@ -0,0 +1,10 @@
<?php
if (! $nav_colour)
$nav_colour = "black";
if (! $bgcolour)
$bgcolour = '#010101';
if (! $item_colour)
$item_colour = '#111';
if (! $font_colour)
$font_colour = '#fff';