From 68545ceeb61cd833f6560156cf2ced9c9ecd6c43 Mon Sep 17 00:00:00 2001
From: jeroenpraat <jeroenpraat@xs4all.nl>
Date: Wed, 16 Apr 2014 21:51:13 +0000
Subject: [PATCH] Dark schema: fixed code view, ACL window and preview

---
 view/theme/redbasic/css/style.css             |  23 +++++++++-----
 ...k_diagonal_stripes_background_seamless.gif | Bin 0 -> 4970 bytes
 view/theme/redbasic/php/style.php             |  28 ++++++++++++++++--
 view/theme/redbasic/schema/dark.php           |  16 ++++++++++
 4 files changed, 58 insertions(+), 9 deletions(-)
 create mode 100644 view/theme/redbasic/img/gray_and_black_diagonal_stripes_background_seamless.gif

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 8d91e0169..60d0f4bc6 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -92,9 +92,9 @@ code {
 	font-family: Courier, monospace;
 	display: block;
 	overflow: auto;
-	border: 1px solid #444;
-	background: #EEE;
-	color: #444;
+	border: 1px solid $code_borderc;
+	background: $code_bgcolour;
+	color: $code_txtcolour;
 	padding: 10px;
 	margin-top: 20px; 
 	max-width: 80%;
@@ -216,7 +216,7 @@ footer {
 }
 
 .preview {
-	background: url('../img/gray_and_white_diagonal_stripes_background_seamless.gif');
+	background: url('../img/$preview_backgroundimg');
 }
 
 #theme-preview {
@@ -1592,6 +1592,10 @@ header {
 	clear: both;
 }
 
+.modal-content {
+    background-color: $acl_bgcolour;
+}
+
 #acl-search {
 	margin-top: 20px;
 	padding: 8px;
@@ -1609,7 +1613,7 @@ header {
 
 #acl-list {
 	display: block;
-	border: 1px solid #cccccc;
+	border: 1px solid $acl_bordercolour;
 	overflow: auto;
 	clear: both;
 	min-height: 62px;
@@ -1622,7 +1626,7 @@ header {
 
 .acl-list-item {
 	width: calc(50% - 10px);
-	border: 1px solid #cccccc;
+	border: 1px solid $acl_bordercolour;
 	margin: 0px 0px 10px 10px;
 	padding: 5px;
 	float: left;
@@ -1658,6 +1662,11 @@ header {
 .acl-button-hide {
 	float: right;
 	margin-left: 5px;
+	$aclbutton_linkcolour
+}
+
+#acl-showall {
+	$aclbutton_linkcolour
 }
 
 .contact-block-content {
@@ -2109,7 +2118,7 @@ img.mail-list-sender-photo {
 }
 
 .abook-self {
-	background-color: #ffdddd;
+	background-color: $abookself_bgcolour;
 }
 
 .online-now {
diff --git a/view/theme/redbasic/img/gray_and_black_diagonal_stripes_background_seamless.gif b/view/theme/redbasic/img/gray_and_black_diagonal_stripes_background_seamless.gif
new file mode 100644
index 0000000000000000000000000000000000000000..615c986bda90d04b0b769fb5c50f70704530134a
GIT binary patch
literal 4970
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

literal 0
HcmV?d00001

diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 8984df788..f25d7228a 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -137,6 +137,12 @@ if(! $a->install) {
 		$blockquote_bgcolour = "#f4f8f9";
 	if (! $blockquote_bordercolour)
 		$blockquote_bordercolour = "#dae4ee";
+	if (! $code_borderc)
+		$code_borderc = "#444";
+	if (! $code_bgcolour)
+		$code_bgcolour = "#EEE";
+	if (! $code_txtcolour)
+		$code_txtcolour = "#444";
 	if (! $notif_itemcolour)
 		$notif_itemcolour = "#000";
 	if (! $notif_itemhovercolour)
@@ -147,6 +153,8 @@ if(! $a->install) {
 		$editbuttons_bordercolour = "#ccc";
 	if (! $editbuttons_bghover)
 		$editbuttons_bghover = "#ebebeb";
+	if (! $preview_backgroundimg)
+		$preview_backgroundimg = "gray_and_white_diagonal_stripes_background_seamless.gif";
 	if (! $acpopup_bgcolour)
 		$acpopup_bgcolour = "#fff";
 	if (! $acpopup_bordercolour)
@@ -184,10 +192,18 @@ if(! $a->install) {
 	if (! $shadow)
 		$shadow = "0";
 	if(! $active_colour)
-		$active_colour = '#fff';
+		$active_colour = "#fff";
 	if (! $converse_width) {
-		$converse_width="1024px";
+		$converse_width = "1024px";
 	}
+	if (! $acl_bgcolour)
+		$acl_bgcolour = "#fff";
+	if (! $acl_bordercolour)
+		$acl_bordercolour = "#ccc";
+	if (! $aclbutton_linkcolour)
+		$aclbutton_linkcolour = "";
+	if (! $abookself_bgcolour)
+		$abookself_bgcolour = "#ffdddd";
 	if(! $top_photo)
 		$top_photo = '48px';
 	$pmenu_top = intval($top_photo) - 16 . 'px';
@@ -248,11 +264,15 @@ $options = array (
 '$blockquote_bgcolour' => $blockquote_bgcolour,
 '$blockquote_bordercolour' => $blockquote_bordercolour,
 '$blockquote_bgcolourhover' => $blockquote_bgcolourhover,
+'$code_borderc' => $code_borderc,
+'$code_bgcolour' => $code_bgcolour,
+'$code_txtcolour' => $code_txtcolour,
 '$notif_itemcolour' => $notif_itemcolour,
 '$notif_itemhovercolour' => $notif_itemhovercolour,
 '$editbuttons_bgcolour' => $editbuttons_bgcolour,
 '$editbuttons_bordercolour' => $editbuttons_bordercolour,
 '$editbuttons_bghover' => $editbuttons_bghover,
+'$preview_backgroundimg' => $preview_backgroundimg,
 '$acpopup_bgcolour' => $acpopup_bgcolour,
 '$acpopup_bordercolour' => $acpopup_bordercolour,
 '$acpopup_tgbl_bgcolour' => $acpopup_tgbl_bgcolour,
@@ -273,6 +293,10 @@ $options = array (
 '$shadow' => $shadow,
 '$active_colour' => $active_colour,
 '$converse_width' => $converse_width,
+'$acl_bgcolour' => $acl_bgcolour,
+'$acl_bordercolour' => $acl_bordercolour,
+'$aclbutton_linkcolour' => $aclbutton_linkcolour,
+'$abookself_bgcolour' => $abookself_bgcolour,
 '$nav_float_min_opacity' => $nav_float_min_opacity,
 '$nav_percent_min_opacity' => $nav_percent_min_opacity,
 '$top_photo' => $top_photo,
diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php
index 27fbd26fc..1572ea9b0 100644
--- a/view/theme/redbasic/schema/dark.php
+++ b/view/theme/redbasic/schema/dark.php
@@ -56,6 +56,12 @@
 		$blockquote_bgcolour = "#1e1e1e";
 	if (! $blockquote_bordercolour)
 		$blockquote_bordercolour = "#666";
+	if (! $code_borderc)
+		$code_borderc = "#090909";
+	if (! $code_bgcolour)
+		$code_bgcolour = "#000";
+	if (! $code_txtcolour)
+		$code_txtcolour = "#fff";
 	if (! $item_bordercolour)
 		$item_bordercolour = "#333";
 	if (! $notif_itemcolour)
@@ -76,6 +82,8 @@
 		$editbuttons_bordercolour = "#222";
 	if (! $editbuttons_bghover)
 		$editbuttons_bghover = "#222";
+	if (! $preview_backgroundimg)
+		$preview_backgroundimg = "gray_and_black_diagonal_stripes_background_seamless.gif";
 	if (! $notify_bgcolour)
 		$notify_bgcolour = "#000";
 	if (! $notify_linkcolour)
@@ -100,3 +108,11 @@
 		$input_colourhover = "#fff";
 	if (! $input_decohover)
 		$input_decohover = "underline";
+	if (! $acl_bgcolour)
+		$acl_bgcolour = "#111";
+	if (! $acl_bordercolour)
+		$acl_bordercolour = "#333";
+	if (! $aclbutton_linkcolour)
+		$aclbutton_linkcolour = "color: #fff;";
+	if (! $abookself_bgcolour)
+		$abookself_bgcolour = "#251111";