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

5 files changed, 43 insertions, 23 deletions

diff --git a/view/theme/redbasic/css/dark.css b/view/theme/redbasic/css/dark.css
index 43912be69..3bcf15bc9 100644
--- a/view/theme/redbasic/css/dark.css
+++ b/view/theme/redbasic/css/dark.css
@@ -1,3 +1,7 @@
+/* This file is deprecated.  We'll keep it here as reference until somebody
+defines a dark colour scheme */
+
+
 body {	font-family: sans-serif;
 	font-size: 12px;
 	background-color: #101010;
diff --git a/view/theme/redbasic/css/fancy.css b/view/theme/redbasic/css/fancy.css
index 2da9d68d1..9b8899d2f 100644
--- a/view/theme/redbasic/css/fancy.css
+++ b/view/theme/redbasic/css/fancy.css
@@ -1,4 +1,5 @@
-/* There's probably some stuff in here we don't need, and maybe some missing stuff we do need.  We can clean it up incrementaly, just get the heavy lifting done for now */
+/*This file is deprecated.  We'll keep it for reference until we provide window decorations */
+
 
 aside {
 border-radius: $radiuspx;}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index bc8014978..868da0a03 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -117,17 +117,17 @@ blockquote {
 	filter:alpha(opacity=100);
 }
 
-nav {background-image: linear-gradient(bottom, #$nav_bg_1 26%, #$nav_bg_2 82%) !important;
-	      background-image: -o-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%) !important;
-	      background-image: -moz-linear-gradient(bottom,$nav_bg_1 26%, $nav_bg_2 82%) !important;
-	      background-image: -webkit-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%) !important;
-	      background-image: -ms-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%) !important;
+nav {background-image: linear-gradient(bottom, #$nav_bg_1 26%, #$nav_bg_2 82%);
+	      background-image: -o-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
+	      background-image: -moz-linear-gradient(bottom,$nav_bg_1 26%, $nav_bg_2 82%);
+	      background-image: -webkit-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
+	      background-image: -ms-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%);
 }
 
 
 nav:hover {background-image: linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
 	      background-image: -o-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
-	      background-image: -moz-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%) !important;
+	      background-image: -moz-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
 	      background-image: -webkit-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
 	      background-image: -ms-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%);
 }
@@ -1405,7 +1405,7 @@ tr.mceLast {
 .wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
     border-radius: $radiuspx;
     -moz-border-radius: $radiuspx;
-    box-shadow: 4px 4px 3px 0 #444444;
+    /*box-shadow: 4px 4px 3px 0 #444444; */
 }
 
 
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 2502bb675..7470c399a 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -36,6 +36,7 @@ function redbasic_form(&$a, $nav_colour, $background_colour, $background_image,
 		$nav_colours = array (
 		  'red' => 'red',
 		  'black' => 'black',	
+		  'silver' => 'silver',	
 		);
 
 	  $t = get_markup_template('theme_settings.tpl');
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index e9ee57268..88bf2ceb0 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -1,20 +1,5 @@
 <?php
 
-//Set some defaults
-
-	$nav_colour = "red";
-		$nav_bg_1 = "#f88";
-		$nav_bg_2 = "#b00";
-		$nav_bg_3 = "#f00";
-		$nav_bg_4 = "#b00";
-	$background_colour = "fff";
-	$background_image ='';
-	$item_colour = "fff";
-	$item_opacity = "1";
-	$font_size = "12";
-	$font_colour = "000";
-	$radius = "5";
-
 // Get the UID of the channel owner
 	$uid = get_theme_uid();
 
@@ -37,6 +22,9 @@
 				    $nav_bg_1 = $nav_bg_3 = "#000";
 		      		    $nav_bg_2 = $nav_bg_4 = "#222";
 		}
+		if ($nav_colour == "silver") {
+				    $nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver";
+		}
 
 	    $background_colour = get_pconfig($uid, "redbasic", "background_colour");	
 	    $background_image = get_pconfig($uid, "redbasic", "background_image");	
@@ -46,6 +34,32 @@
 	    $font_colour = get_pconfig($uid, "redbasic", "font_colour");	
 	    $radius = get_pconfig($uid, "redbasic", "radius");	
 
+//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.
+
+	if (! $nav_colour) {
+		$nav_colour = "red";
+			$nav_bg_1 = "#f88";
+			$nav_bg_2 = "#b00";
+			$nav_bg_3 = "#f00";
+			$nav_bg_4 = "#b00";
+		}
+	if (! $background_colour)
+		$background_colour = "fff";
+	if (! $background_image)
+		$background_image ='';
+	if (! $item_colour)
+		$item_colour = "fff";
+	if (! $item_opacity)
+		$item_opacity = "1";
+	if (! $font_size)
+		$font_size = "12";
+	if (! $font_colour)
+		$font_colour = "000";
+	if (! $radius)
+		$radius = "5";
+
+
 
 // Apply the settings
 	if(file_exists('view/theme/' . current_theme() . '/css/style.css')) {