fix custom fontsize for app

4 files changed, 11 insertions, 19 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index decaf0d4e..4ab2fe036 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -8,12 +8,12 @@
 
 /* generals */
 html {
-	font-size: 100%;
+	font-size: $font_size;
 }
 
 body {
 	font-family: sans-serif, arial, freesans;
-	font-size: $body_font_size;
+	font-size: 0.9rem;
 	background-color: $bgcolour;
 	background-image: url('$background_image');
 	background-attachment: fixed;
@@ -284,7 +284,7 @@ footer {
 
 .fn {
 	font-weight: bold;
-	font-size: $font_size;
+	font-size: 1rem;
 	color: #444444;
 }
 
@@ -751,7 +751,7 @@ div.jGrowl div.jGrowl-notification {
 
 .jslider .jslider-scale ins {
 	color: #333;
-	font-size: $body_font_size;
+	font-size: 0.9rem;
 	width: 100px;
 	text-align: center;
 }
@@ -1160,7 +1160,7 @@ img.mail-conv-sender-photo {
 .page-body,
 .chat-item-text,
 .chat-item-text-self {
-	font-size: $font_size;
+	font-size: 1rem;
 }
 
 .item-tool {
@@ -1288,7 +1288,7 @@ img.mail-conv-sender-photo {
 #avatar {
 	width: 2.2rem;
 	height: 2.2rem;
-	border-radius: $radius;
+	border-radius: 50%;
 }
 
 .page-title {
@@ -1446,7 +1446,7 @@ main.fullscreen .section-content-wrapper-np {
 /* bootstrap overrides */
 
 blockquote {
-	font-size: $font_size;
+	font-size: 1rem;
 	font-style: italic;
 	border-left: 3px solid #ccc;
 	padding: 1em 0px 1em 1.5em;
@@ -1454,7 +1454,7 @@ blockquote {
 }
 
 .dropdown-menu {
-	font-size: $body_font_size;
+	font-size: 0.9rem;
 	border-radius: $radius;
 }
 
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index b03e94e46..419dd20b2 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('Example: 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 f4e6d8046..6a993ac28 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -30,7 +30,6 @@ if(! App::$install) {
 	$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');
@@ -123,8 +122,6 @@ if (! $item_opacity)
 	$item_opacity = '1';
 if (! $font_size)
 	$font_size = '1rem';
-if (! $body_font_size)
-	$body_font_size = '0.9rem';
 if (! $font_colour)
 	$font_colour = '#4d4d4d';
 if (! $radius)
@@ -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/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index 9672d3d05..3d748464c 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -1,6 +1,7 @@
 {{include file="field_checkbox.tpl" field=$align_left}}
 {{include file="field_checkbox.tpl" field=$narrow_navbar}}
 {{include file="field_input.tpl" field=$converse_width}}
+{{include file="field_input.tpl" field=$font_size}}
 {{if $expert}}
 	{{include file="field_colorinput.tpl" field=$nav_bg}}
 	{{include file="field_colorinput.tpl" field=$nav_gradient_top}}
@@ -17,8 +18,6 @@
 	{{include file="field_colorinput.tpl" field=$comment_item_colour}}
 	{{*include file="field_colorinput.tpl" field=$comment_border_colour*}}
 	{{*include file="field_input.tpl" field=$comment_indent*}}
-	{{include file="field_input.tpl" field=$body_font_size}}
-	{{include file="field_input.tpl" field=$font_size}}
 	{{include file="field_colorinput.tpl" field=$font_colour}}
 	{{include file="field_colorinput.tpl" field=$link_colour}}
 	{{include file="field_colorinput.tpl" field=$banner_colour}}