Merge branch 'dev'

3 files changed, 25 insertions, 49 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 346e46c6b..16a7624f8 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -24,15 +24,15 @@ body {
 
 aside#region_1 {
 	border-right: 1px solid transparent;
-	width: $left_aside_widthpx;
-	min-width: $left_aside_widthpx;
-	max-width: $left_aside_widthpx;
+	width: $left_aside_widthrem;
+	min-width: $left_aside_widthrem;
+	max-width: $left_aside_widthrem;
 }
 
 aside#region_3 {
-	width: $right_aside_widthpx;
-	min-width: $left_aside_widthpx;
-	max-width: $right_aside_widthpx;
+	width: $right_aside_widthrem;
+	min-width: $left_aside_widthrem;
+	max-width: $right_aside_widthrem;
 }
 
 aside#left_aside_wrapper,
@@ -49,7 +49,7 @@ main {
 #overlay {
 	position: fixed;
 	top: 0;
-	left: $left_aside_widthpx;
+	left: $left_aside_widthrem;
 	width: 100vw;
 	height: 100vh;
 	background: rgba(0, 0, 0, .3);
@@ -400,34 +400,20 @@ footer {
 	color: #444444;
 }
 
-.vcard {
-	margin-bottom: 10px;
-	padding: 0px 10px 10px 10px;
+.vcard-card {
 	background-color: rgba(254,254,254,0.5);
-	border: 1px solid rgba(254,254,254,0.5);
-	border-radius: $radius;
-	word-wrap: break-word;
-}
-
-.vcard dl,
-.vcard .title {
-	margin-top: 10px;
-	margin-bottom: 0px;
 }
 
-.connect-btn-wrapper {
-	margin-bottom: 10px;
-
+.vcard {
+	word-wrap: break-word;
 }
 
 .profile-edit-side-link {
-	padding: 3px 0px;
 	opacity: 0;
-	filter:alpha(opacity=30);
-	float: right;
+	filter:alpha(opacity=0);
 }
 
-.vcard:hover .profile-edit-side-link {
+.card:hover .profile-edit-side-link {
 	opacity: 1;
 	filter:alpha(opacity=100);
 }
@@ -435,15 +421,6 @@ footer {
 #profile-photo-wrapper img {
 	width: 100%;
 	height: 100%;
-	max-width: 300px;
-	max-height: 300px;
-}
-
-#profile-photo-wrapper {
-	width: 251px;
-	height: 251px;
-	margin-bottom: 10px;
-	border-radius: $radius;
 }
 
 #hide-friends-yes-label,
@@ -571,8 +548,8 @@ footer {
 }
 
 .contact-block-img {
-	width:47px;
-	height:47px;
+	width: 2.95rem;
+	height: 2.95rem;
 	margin-bottom: 3px;
 }
 
@@ -1191,7 +1168,6 @@ img.mail-conv-sender-photo {
 
 .widget {
 	background-color: rgba(254,254,254,.5);
-	border: 1px solid rgba(254,254,254,.5);
 	border-radius: $radius;
 }
 
@@ -1530,8 +1506,8 @@ blockquote {
 	}
 
 	main {
-		left: -$left_aside_widthpx;
-		width: calc( 100% + $left_aside_widthpx );
+		left: -$left_aside_widthrem;
+		width: calc( 100% + $left_aside_widthrem );
 	}
 
 	main.region_1-on {
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 0a779529d..0de475fe5 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -32,7 +32,7 @@ class RedbasicConfig {
 	}
 
 	function get() {
-		if(! local_channel()) { 
+		if(! local_channel()) {
 			return;
 		}
 
@@ -59,7 +59,7 @@ class RedbasicConfig {
 	}
 
 	function post() {
-		if(!local_channel()) { 
+		if(!local_channel()) {
 			return;
 		}
 
@@ -89,7 +89,7 @@ class RedbasicConfig {
 
 		if(get_pconfig(local_channel(), 'redbasic', 'advanced_theming'))
 			$expert = 1;
-					
+
 	  	$o .= replace_macros(get_markup_template('theme_settings.tpl'), array(
 			'$submit' => t('Submit'),
 			'$baseurl' => z_root(),
@@ -98,19 +98,19 @@ class RedbasicConfig {
 			'$title' => t("Theme settings"),
 			'$narrow_navbar' => array('redbasic_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))),
 			'$nav_bg' => array('redbasic_nav_bg', t('Navigation bar background color'), $arr['nav_bg']),
-			'$nav_icon_colour' => array('redbasic_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']),	
+			'$nav_icon_colour' => array('redbasic_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']),
 			'$nav_active_icon_colour' => array('redbasic_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']),
 			'$link_colour' => array('redbasic_link_colour', t('Link color'), $arr['link_colour'], '', $link_colours),
 			'$banner_colour' => array('redbasic_banner_colour', t('Set font-color for banner'), $arr['banner_colour']),
 			'$bgcolour' => array('redbasic_background_colour', t('Set the background color'), $arr['bgcolour']),
-			'$background_image' => array('redbasic_background_image', t('Set the background image'), $arr['background_image']),	
+			'$background_image' => array('redbasic_background_image', t('Set the background image'), $arr['background_image']),
 			'$item_colour' => array('redbasic_item_colour', t('Set the background color of items'), $arr['item_colour']),
 			'$comment_item_colour' => array('redbasic_comment_item_colour', t('Set the background color of comments'), $arr['comment_item_colour']),
 			'$font_size' => array('redbasic_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 1rem, 100%, 16px')),
 			'$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'], 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')),
+			'$converse_width' => array('redbasic_converse_width',t('Set maximum width of content region in rem'),$arr['converse_width'], t('Leave empty for default width')),
 			'$top_photo' => array('redbasic_top_photo', t('Set size of conversation author photo'), $arr['top_photo']),
 			'$reply_photo' => array('redbasic_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),
 			'$advanced_theming' => ['redbasic_advanced_theming', t('Show advanced settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]]
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 3ea94f9aa..6ba0d569e 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -101,7 +101,7 @@ if (! $radius)
 if (! $shadow)
 	$shadow = '0';
 if (! $converse_width)
-	$converse_width = '790';
+	$converse_width = '1250'; //unit: rem
 if(! $top_photo)
 	$top_photo = '2.3rem';
 if(! $reply_photo)
@@ -120,8 +120,8 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
 		$x .= $schemecss;
 	}
 
-	$left_aside_width = 288;
-	$right_aside_width = 288;
+	$left_aside_width = 21; //unit: rem
+	$right_aside_width = 21; //unit: rem
 
 	$main_width = $left_aside_width + $right_aside_width + intval($converse_width);