Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	doc/de/features.bb
	view/de/messages.po
	view/de/strings.php

2 files changed, 92 insertions, 0 deletions

diff --git a/view/theme/redbasic/schema/focus.css b/view/theme/redbasic/schema/focus.css
new file mode 100644
index 000000000..8d945a83e
--- /dev/null
+++ b/view/theme/redbasic/schema/focus.css
@@ -0,0 +1,27 @@
+.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;
+}
+
+#redbasic_converse_center_container {
+	display: none;
+}
+
+.wall-item-conv {
+	margin-bottom: 10px;
+	margin-top: 10px;
+	margin-left: 10px;
+}
diff --git a/view/theme/redbasic/schema/focus.php b/view/theme/redbasic/schema/focus.php
new file mode 100644
index 000000000..2a6900271
--- /dev/null
+++ b/view/theme/redbasic/schema/focus.php
@@ -0,0 +1,65 @@
+<?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 = "640";
+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;
+}
+
+$converse_center = "1";