From e1338f5a7fc06cd87d62ffaa8d7ad0f17ab7c625 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 10 Sep 2015 22:19:51 +0200
Subject: make redmatrix focus scheme default for hubzilla

---
 view/theme/redbasic/css/style.css                  | 31 ++++++-----
 view/theme/redbasic/php/style.php                  | 10 ++--
 view/theme/redbasic/schema/boxy.css                |  4 +-
 view/theme/redbasic/schema/boxy.php                |  2 +
 view/theme/redbasic/schema/dark.css                |  6 +++
 view/theme/redbasic/schema/focus.css               | 22 --------
 view/theme/redbasic/schema/focus.php               | 63 ----------------------
 .../redbasic/schema/simple_black_on_white.css      |  6 +++
 .../redbasic/schema/simple_green_on_black.css      |  6 +++
 .../redbasic/schema/simple_white_on_black.css      | 10 ++--
 10 files changed, 52 insertions(+), 108 deletions(-)
 delete mode 100644 view/theme/redbasic/schema/focus.css
 delete mode 100644 view/theme/redbasic/schema/focus.php

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 25436db5f..f989c6bf9 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -347,7 +347,7 @@ footer {
 .vcard {
 	margin-bottom: 10px;
 	padding: 10px;
-	background-color: $comment_item_colour;
+	background-color: rgba(254,254,254,0.5);
 	border-bottom: 1px solid rgba(238,238,238,0.8);
 	-moz-border-radius: $radiuspx;
 	-webkit-border-radius: $radiuspx;
@@ -698,7 +698,7 @@ a.rateme, div.rateme {
 #contact-block {
 	width: 100%;
 	float: left;
-	background-color: $comment_item_colour;
+	background-color: rgba(254,254,254,0.5);
 	border-bottom: 1px solid rgba(238,238,238,0.8);
 	-moz-border-radius: $radiuspx;
 	-webkit-border-radius: $radiuspx;
@@ -751,8 +751,8 @@ a.rateme, div.rateme {
 }
 
 .wall-item-conv {
-	padding-top: 5px;
-	padding-bottom: 10px;
+	padding-top: 10px;
+	padding-left: 10px;
 }
 
 
@@ -1655,12 +1655,6 @@ img.mail-list-sender-photo {
 	border-top-left-radius: $radiuspx;
 }
 
-.generic-content-wrapper-styled {
-	background-color: $comment_item_colour;
-	padding: 10px;
-	border-radius: $radiuspx;
-}
-
 .wall-item-content-wrapper.comment {
 	background-color: $comment_item_colour;
 	border-color: $comment_border_colour;
@@ -1786,7 +1780,7 @@ img.mail-list-sender-photo {
 /* widgets */
 
 .widget {
-	background-color: $comment_item_colour;
+	background-color: rgba(254,254,254,0.5);
 	border-bottom: 1px solid rgba(238,238,238,0.8);
 	-moz-border-radius: $radiuspx;
 	-webkit-border-radius: $radiuspx;
@@ -1867,6 +1861,19 @@ nav .dropdown-menu {
 	margin: 7px 0px;
 }
 
+.generic-content-wrapper-styled {
+	background-color: $bgcolour;
+	padding: 10px;
+	border-radius: $radiuspx;
+}
+
+.generic-content-wrapper {
+	border: 1px solid #ccc;
+	box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.2);
+	border-radius: 4px;
+	background-color: #fff;
+}
+
 .section-title-wrapper {
 	padding: 7px 10px;
 	background-color: $item_colour;
@@ -2303,4 +2310,4 @@ nav .badge.mail-update:hover {
 
 .help-searchlist a {
 	font-size: 130%;
-}
\ No newline at end of file
+}
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 96dba59e5..f542e8e12 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -107,15 +107,15 @@ if (! $link_colour)
 if (! $banner_colour)
 	$banner_colour = "#fff";
 if (! $bgcolour)
-	$bgcolour = "#fdfdfd";
+	$bgcolour = "rgb(254,254,254)";
 if (! $background_image)
 	$background_image ='';
 if (! $item_colour)
-	$item_colour = "rgba(238,238,238,0.8)";
+	$item_colour = "rgb(238,238,238)";
 if (! $comment_item_colour)
-	$comment_item_colour = "rgba(254,254,254,0.4)";
+	$comment_item_colour = "rgb(255,255,255)";
 if (! $comment_border_colour)
-	$comment_border_colour = "rgba(238,238,238,0.8)";
+	$comment_border_colour = "rgb(255,255,255)";
 if (! $toolicon_colour)
 	$toolicon_colour = '#777';
 if (! $toolicon_activecolour)
@@ -133,7 +133,7 @@ if (! $radius)
 if (! $shadow)
 	$shadow = "0";
 if (! $converse_width)
-	$converse_width = "1024";
+	$converse_width = "790";
 if(! $top_photo)
 	$top_photo = '48px';
 if(! $comment_indent)
diff --git a/view/theme/redbasic/schema/boxy.css b/view/theme/redbasic/schema/boxy.css
index f3da9b262..ad3e587f0 100644
--- a/view/theme/redbasic/schema/boxy.css
+++ b/view/theme/redbasic/schema/boxy.css
@@ -3,9 +3,9 @@
 }
 
 .wall-item-content-wrapper.comment {
-	border-width: 0px 1px 1px 1px;
+	border-width: 0px 0px 1px 0px;
 }
 
 .hide-comments-outer {
-	border-width: 1px 1px 1px 1px;
+	border-width: 1px 0px 1px 0px;
 }
diff --git a/view/theme/redbasic/schema/boxy.php b/view/theme/redbasic/schema/boxy.php
index d609ccd25..f298a0def 100644
--- a/view/theme/redbasic/schema/boxy.php
+++ b/view/theme/redbasic/schema/boxy.php
@@ -2,3 +2,5 @@
 
 if (! $radiuspx)
 	$radiuspx = "4";
+if (! $comment_border_colour)
+	$comment_border_colour = "rgb(238,238,238)";
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index 02ee4707e..4e8e23de5 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -1,4 +1,10 @@
+.generic-content-wrapper {
+	border: 1px solid #111;
+	background-color: transparent;
+}
+
 .vcard, #contact-block, .widget {
+	background-color: transparent;
 	border-bottom: 1px solid #fff;
 }
 
diff --git a/view/theme/redbasic/schema/focus.css b/view/theme/redbasic/schema/focus.css
deleted file mode 100644
index ea983ffc8..000000000
--- a/view/theme/redbasic/schema/focus.css
+++ /dev/null
@@ -1,22 +0,0 @@
-.generic-content-wrapper {
-	border: 1px solid #ccc;
-	box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.2);
-	border-radius: 4px;
-	background-color: #fff;
-}
-
-.wall-item-content-wrapper.comment {
-	background-color: #fff;
-}
-
-.section-content-tools-wrapper,
-.section-content-wrapper,
-.section-content-wrapper-np,
-.hide-comments-outer {
-	background-color: #fff;
-}
-
-.wall-item-conv {
-	padding-top: 10px;
-	padding-left: 10px;
-}
diff --git a/view/theme/redbasic/schema/focus.php b/view/theme/redbasic/schema/focus.php
deleted file mode 100644
index 1f1963764..000000000
--- a/view/theme/redbasic/schema/focus.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-if (! $nav_bg)
-	$nav_bg = "#222";
-if (! $nav_gradient_top)
-	$nav_gradient_top = "#3c3c3c";
-if (! $nav_gradient_bottom)
-	$nav_gradient_bottom = "#222";
-if (! $nav_active_gradient_top)
-	$nav_active_gradient_top = "#222";
-if (! $nav_active_gradient_bottom)
-	$nav_active_gradient_bottom = "#282828";
-if (! $nav_bd)
-	$nav_bd = "#222";
-if (! $nav_icon_colour)
-	$nav_icon_colour = "#999";
-if (! $nav_active_icon_colour)
-	$nav_active_icon_colour = "#fff";
-if (! $link_colour)
-	$link_colour = "#337AB7";
-if (! $banner_colour)
-	$banner_colour = "#fff";
-if (! $bgcolour)
-	$bgcolour = "#fdfdfd";
-if (! $background_image)
-	$background_image ='';
-if (! $item_colour)
-	$item_colour = "rgb(238,238,238)";
-if (! $comment_item_colour)
-	$comment_item_colour = "rgba(254,254,254,0.4)";
-if (! $comment_border_colour)
-	$comment_border_colour = "transparent";
-if (! $toolicon_colour)
-	$toolicon_colour = '#777';
-if (! $toolicon_activecolour)
-	$toolicon_activecolour = '#000';
-if (! $item_opacity)
-	$item_opacity = "1";
-if (! $font_size)
-	$font_size = "0.9rem";
-if (! $body_font_size)
-	$body_font_size = "0.75rem";
-if (! $font_colour)
-	$font_colour = "#4d4d4d";
-if (! $radius)
-	$radius = "4";
-if (! $shadow)
-	$shadow = "0";
-if (! $converse_width)
-	$converse_width = "790";
-if(! $top_photo)
-	$top_photo = '48px';
-if(! $comment_indent)
-	$comment_indent = '0px';
-if(! $reply_photo)
-	$reply_photo = '32px';
-if($nav_min_opacity === false || $nav_min_opacity === '') {
-	$nav_float_min_opacity = 1.0;
-	$nav_percent_min_opacity = 100;
-}
-else {
-	$nav_float_min_opacity = (float) $nav_min_opacity;
-	$nav_percent_min_opacity = (int) 100 * $nav_min_opacity;
-}
diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css
index c00f3c260..f69ba3450 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.css
+++ b/view/theme/redbasic/schema/simple_black_on_white.css
@@ -1,4 +1,10 @@
+.generic-content-wrapper {
+	border: 1px solid #fff;
+	background-color: transparent;
+}
+
 .vcard, #contact-block, .widget {
+	background-color: transparent;
 	border-bottom: 1px solid #fff;
 }
 
diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css
index ce4465930..1f0a2f1e6 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.css
+++ b/view/theme/redbasic/schema/simple_green_on_black.css
@@ -1,4 +1,10 @@
+.generic-content-wrapper {
+	border: 1px solid #000;
+	background-color: transparent;
+}
+
 .vcard, #contact-block, .widget {
+	background-color: transparent;
 	border-bottom: 1px solid #fff;
 }
 
diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css
index 3504265b9..627f3ee5c 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.css
+++ b/view/theme/redbasic/schema/simple_white_on_black.css
@@ -1,9 +1,11 @@
-.vcard, #contact-block, .widget {
-	border-bottom: 1px solid #fff;
+.generic-content-wrapper {
+	border: 1px solid #000;
+	background-color: transparent;
 }
 
-.abook-pending-contact, .abook-permschange {
-	background: #000;
+.vcard, #contact-block, .widget {
+	background-color: transparent;
+	border-bottom: 1px solid #fff;
 }
 
 #cboxContent a {
-- 
cgit v1.2.3


From 5e576bff63df2b13912d225944424a998c2f7293 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 10 Sep 2015 22:22:51 +0200
Subject: fix radius setting

---
 view/theme/redbasic/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index f989c6bf9..0446269c7 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1870,7 +1870,7 @@ nav .dropdown-menu {
 .generic-content-wrapper {
 	border: 1px solid #ccc;
 	box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.2);
-	border-radius: 4px;
+	border-radius:  $radiuspx;
 	background-color: #fff;
 }
 
-- 
cgit v1.2.3