aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-10-11 20:44:54 -0700
committerfriendica <info@friendica.com>2013-10-11 20:44:54 -0700
commit0bfcc31bf9f647152c6b64e1025aa481f4b4cbc0 (patch)
tree297b7be84af49503284ee393d7a6431c60e82a68 /view
parent7cd1bd59b2544aae52a399761849f46bd7b8a066 (diff)
parent899ebe9cbc99b143a485e10e8c246bd6411eefc3 (diff)
downloadvolse-hubzilla-0bfcc31bf9f647152c6b64e1025aa481f4b4cbc0.tar.gz
volse-hubzilla-0bfcc31bf9f647152c6b64e1025aa481f4b4cbc0.tar.bz2
volse-hubzilla-0bfcc31bf9f647152c6b64e1025aa481f4b4cbc0.zip
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'view')
-rw-r--r--view/theme/redbasic/css/style.css1
-rw-r--r--view/theme/redbasic/php/config.php2
-rw-r--r--view/theme/redbasic/php/style.php43
-rw-r--r--view/theme/redbasic/schema/dark.php10
4 files changed, 36 insertions, 20 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index f1f58cc44..467c2c59d 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -74,6 +74,7 @@ blockquote {
background-color: #f4f8f9;
border-left: 4px solid #dae4ee;
padding: 0.4em;
+ color: #000;
}
.ccollapse-wrapper {
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index be021e85c..faf6c6f35 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -5,7 +5,7 @@ function theme_content(&$a) {
$schema = get_pconfig(local_user(),'redbasic', 'schema' );
$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' );
$item_colour = get_pconfig(local_user(),'redbasic', 'item_colour' );
$item_opacity = get_pconfig(local_user(),'redbasic', 'item_opacity' );
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index b80a3e764..b5d020937 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -11,25 +11,6 @@
// A further two - $nav_bg_3 and $nav_bg_4 are used to create the hover, if any particular scheme
// wants to implement that
$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
$schema = get_pconfig($uid,'redbasic','schema');
@@ -90,7 +71,31 @@
if(! $active_colour)
$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
if(file_exists('view/theme/' . current_theme() . '/css/style.css')) {
$x = file_get_contents('view/theme/' . current_theme() . '/css/style.css');
diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php
new file mode 100644
index 000000000..bd3642914
--- /dev/null
+++ b/view/theme/redbasic/schema/dark.php
@@ -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';