Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

3 files changed, 47 insertions, 54 deletions

diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index b03e94e46..04516df78 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -46,7 +46,6 @@ class RedbasicConfig {
 		$arr['toolicon_colour'] = get_pconfig(local_channel(),'redbasic','toolicon_colour');
 		$arr['toolicon_activecolour'] = get_pconfig(local_channel(),'redbasic','toolicon_activecolour');
 		$arr['font_size'] = get_pconfig(local_channel(),'redbasic', 'font_size' );
-		$arr['body_font_size'] = get_pconfig(local_channel(),'redbasic', 'body_font_size' );
 		$arr['font_colour'] = get_pconfig(local_channel(),'redbasic', 'font_colour' );
 		$arr['radius'] = get_pconfig(local_channel(),'redbasic', 'radius' );
 		$arr['shadow'] = get_pconfig(local_channel(),'redbasic', 'photo_shadow' );
@@ -84,7 +83,6 @@ class RedbasicConfig {
 			set_pconfig(local_channel(), 'redbasic', 'toolicon_colour', $_POST['redbasic_toolicon_colour']);
 			set_pconfig(local_channel(), 'redbasic', 'toolicon_activecolour', $_POST['redbasic_toolicon_activecolour']);
 			set_pconfig(local_channel(), 'redbasic', 'font_size', $_POST['redbasic_font_size']);
-			set_pconfig(local_channel(), 'redbasic', 'body_font_size', $_POST['redbasic_body_font_size']);
 			set_pconfig(local_channel(), 'redbasic', 'font_colour', $_POST['redbasic_font_colour']);
 			set_pconfig(local_channel(), 'redbasic', 'radius', $_POST['redbasic_radius']);
 			set_pconfig(local_channel(), 'redbasic', 'photo_shadow', $_POST['redbasic_shadow']);
@@ -127,10 +125,9 @@ class RedbasicConfig {
 			'$comment_indent' => array('redbasic_comment_indent', t('Set the indent for comments'), $arr['comment_indent']),
 			'$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic color for item icons'),$arr['toolicon_colour']),
 			'$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover color for item icons'),$arr['toolicon_activecolour']),
-			'$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_font_size'], t('Example: 14px')),
-			'$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $arr['font_size']),
+			'$font_size' => array('redbasic_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 87.5%, 14px')),
 			'$font_colour' => array('redbasic_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']),
-			'$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius']),
+			'$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius'], t('Example: 4px')),
 			'$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']),
 			'$converse_width' => array('redbasic_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')),
 			'$align_left' => array('redbasic_align_left',t('Left align page content'),$arr['align_left'], '', array(t('No'),t('Yes'))),
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 9b994ebdf..6a993ac28 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -10,33 +10,32 @@ if(! App::$install) {
 	}
 
 	// Load the owners pconfig
-	$nav_bg = get_pconfig($uid, "redbasic", "nav_bg");
-	$nav_gradient_top = get_pconfig($uid, "redbasic", "nav_gradient_top");
-	$nav_gradient_bottom = get_pconfig($uid, "redbasic", "nav_gradient_bottom");
-	$nav_active_gradient_top = get_pconfig($uid, "redbasic", "nav_active_gradient_top");
-	$nav_active_gradient_bottom = get_pconfig($uid, "redbasic", "nav_active_gradient_bottom");
-	$nav_bd = get_pconfig($uid, "redbasic", "nav_bd");
-	$nav_icon_colour = get_pconfig($uid, "redbasic", "nav_icon_colour");
-	$nav_active_icon_colour = get_pconfig($uid, "redbasic", "nav_active_icon_colour");
+	$nav_bg = get_pconfig($uid, 'redbasic', 'nav_bg');
+	$nav_gradient_top = get_pconfig($uid, 'redbasic', 'nav_gradient_top');
+	$nav_gradient_bottom = get_pconfig($uid, 'redbasic', 'nav_gradient_bottom');
+	$nav_active_gradient_top = get_pconfig($uid, 'redbasic', 'nav_active_gradient_top');
+	$nav_active_gradient_bottom = get_pconfig($uid, 'redbasic', 'nav_active_gradient_bottom');
+	$nav_bd = get_pconfig($uid, 'redbasic', 'nav_bd');
+	$nav_icon_colour = get_pconfig($uid, 'redbasic', 'nav_icon_colour');
+	$nav_active_icon_colour = get_pconfig($uid, 'redbasic', 'nav_active_icon_colour');
 	$narrow_navbar = get_pconfig($uid,'redbasic','narrow_navbar');
 	$banner_colour = get_pconfig($uid,'redbasic','banner_colour');
-	$link_colour = get_pconfig($uid, "redbasic", "link_colour");
+	$link_colour = get_pconfig($uid, 'redbasic', 'link_colour');
 	$schema = get_pconfig($uid,'redbasic','schema');
-	$bgcolour = get_pconfig($uid, "redbasic", "background_colour");
-	$background_image = get_pconfig($uid, "redbasic", "background_image");
+	$bgcolour = get_pconfig($uid, 'redbasic', 'background_colour');
+	$background_image = get_pconfig($uid, 'redbasic', 'background_image');
 	$toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour');
 	$toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour');
-	$item_colour = get_pconfig($uid, "redbasic", "item_colour");
-	$comment_item_colour = get_pconfig($uid, "redbasic", "comment_item_colour");
-	$comment_border_colour = get_pconfig($uid, "redbasic", "comment_border_colour");
-	$comment_indent = get_pconfig($uid, "redbasic", "comment_indent");
-	$body_font_size = get_pconfig($uid, "redbasic", "body_font_size");
-	$font_size = get_pconfig($uid, "redbasic", "font_size");
-	$font_colour = get_pconfig($uid, "redbasic", "font_colour");
-	$radius = get_pconfig($uid, "redbasic", "radius");
-	$shadow = get_pconfig($uid,"redbasic","photo_shadow");
-	$converse_width=get_pconfig($uid,"redbasic","converse_width");
-	$align_left=get_pconfig($uid,"redbasic","align_left");
+	$item_colour = get_pconfig($uid, 'redbasic', 'item_colour');
+	$comment_item_colour = get_pconfig($uid, 'redbasic', 'comment_item_colour');
+	$comment_border_colour = get_pconfig($uid, 'redbasic', 'comment_border_colour');
+	$comment_indent = get_pconfig($uid, 'redbasic', 'comment_indent');
+	$font_size = get_pconfig($uid, 'redbasic', 'font_size');
+	$font_colour = get_pconfig($uid, 'redbasic', 'font_colour');
+	$radius = get_pconfig($uid, 'redbasic', 'radius');
+	$shadow = get_pconfig($uid,'redbasic','photo_shadow');
+	$converse_width=get_pconfig($uid,'redbasic','converse_width');
+	$align_left=get_pconfig($uid,'redbasic','align_left');
 	$nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity');
 	$top_photo=get_pconfig($uid,'redbasic','top_photo');
 	$reply_photo=get_pconfig($uid,'redbasic','reply_photo');
@@ -86,59 +85,57 @@ if (! $schema) {
 //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_bg)
-	$nav_bg = "#222";
+	$nav_bg = '#222';
 if (! $nav_gradient_top)
-	$nav_gradient_top = "#3c3c3c";
+	$nav_gradient_top = '#3c3c3c';
 if (! $nav_gradient_bottom)
-	$nav_gradient_bottom = "#222";
+	$nav_gradient_bottom = '#222';
 if (! $nav_active_gradient_top)
-	$nav_active_gradient_top = "#222";
+	$nav_active_gradient_top = '#222';
 if (! $nav_active_gradient_bottom)
-	$nav_active_gradient_bottom = "#282828";
+	$nav_active_gradient_bottom = '#282828';
 if (! $nav_bd)
-	$nav_bd = "#222";
+	$nav_bd = '#222';
 if (! $nav_icon_colour)
-	$nav_icon_colour = "#999";
+	$nav_icon_colour = '#999';
 if (! $nav_active_icon_colour)
-	$nav_active_icon_colour = "#fff";
+	$nav_active_icon_colour = '#fff';
 if (! $link_colour)
-	$link_colour = "#337AB7";
+	$link_colour = '#0275d8';
 if (! $banner_colour)
-	$banner_colour = "#fff";
+	$banner_colour = '#fff';
 if (! $bgcolour)
-	$bgcolour = "rgb(254,254,254)";
+	$bgcolour = 'rgb(254,254,254)';
 if (! $background_image)
 	$background_image ='';
 if (! $item_colour)
-	$item_colour = "rgb(238,238,238)";
+	$item_colour = 'rgb(238,238,238)';
 if (! $comment_item_colour)
-	$comment_item_colour = "rgb(255,255,255)";
+	$comment_item_colour = 'rgb(255,255,255)';
 if (! $comment_border_colour)
-	$comment_border_colour = "rgb(255,255,255)";
+	$comment_border_colour = 'rgb(255,255,255)';
 if (! $toolicon_colour)
 	$toolicon_colour = '#777';
 if (! $toolicon_activecolour)
 	$toolicon_activecolour = '#000';
 if (! $item_opacity)
-	$item_opacity = "1";
+	$item_opacity = '1';
 if (! $font_size)
-	$font_size = "0.9rem";
-if (! $body_font_size)
-	$body_font_size = "0.75rem";
+	$font_size = '1rem';
 if (! $font_colour)
-	$font_colour = "#4d4d4d";
+	$font_colour = '#4d4d4d';
 if (! $radius)
-	$radius = "4";
+	$radius = '0.25rem';
 if (! $shadow)
-	$shadow = "0";
+	$shadow = '0';
 if (! $converse_width)
-	$converse_width = "790";
+	$converse_width = '790';
 if(! $top_photo)
-	$top_photo = '48px';
+	$top_photo = '2.3rem';
 if(! $comment_indent)
 	$comment_indent = '0px';
 if(! $reply_photo)
-	$reply_photo = '32px';
+	$reply_photo = '2.3rem';
 if($nav_min_opacity === false || $nav_min_opacity === '') {
 	$nav_float_min_opacity = 1.0;
 	$nav_percent_min_opacity = 100;
@@ -197,7 +194,6 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
 		'$toolicon_activecolour' => $toolicon_activecolour,
 		'$font_size' => $font_size,
 		'$font_colour' => $font_colour,
-		'$body_font_size' => $body_font_size,
 		'$radius' => $radius,
 		'$shadow' => $shadow,
 		'$converse_width' => $converse_width,
diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php
index c76e77cf1..2b90ae85f 100644
--- a/view/theme/redbasic/php/theme.php
+++ b/view/theme/redbasic/php/theme.php
@@ -3,8 +3,8 @@
 /**
  *   * Name: Redbasic
  *   * Description: Hubzilla standard theme
- *   * Version: 2.0
- *   * MinVersion: 2.2RC
+ *   * Version: 2.1
+ *   * MinVersion: 2.3.1
  *   * MaxVersion: 6.0
  *   * Author: Fabrixxm
  *   * Maintainer: Mike Macgirvin