Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge

2 files changed, 3 insertions, 15 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 943b27637..0a879cb71 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -32,13 +32,9 @@ aside #region_1 {
 	border-right: 1px solid transparent;
 }
 
-aside #left_aside_wrapper {
-	/*margin-bottom: 10px;*/
-        margin-bottom: $bottom_margin;
-}
+aside #left_aside_wrapper,
 aside #right_aside_wrapper {
-	/*margin-bottom: 10px;*/
-        margin-bottom: $bottom_margin;
+	margin-bottom: 10px;
 }
 
 main {
@@ -47,10 +43,6 @@ main {
 	max-width: $main_widthpx;
 }
 
-main #region_2 {
-        margin-bottom: $bottom_margin;
-}
-
 #overlay {
 	position: absolute;
 	top: 0;
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 0631fa142..91cc0b85b 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -106,8 +106,6 @@ if(! $top_photo)
 	$top_photo = '2.3rem';
 if(! $reply_photo)
 	$reply_photo = '2.3rem';
-if(! $bottom_margin)
-        $bottom_margin = '200px';
 
 // Apply the settings
 if(file_exists('view/theme/redbasic/css/style.css')) {
@@ -152,9 +150,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
 		'$pmenu_top' => $pmenu_top,
 		'$pmenu_reply' => $pmenu_reply,
 		'$main_width' => $main_width,
-		'$aside_width' => $aside_width,
-                '$bottom_margin' => $bottom_margin
-
+		'$aside_width' => $aside_width
 	);
 
 	echo str_replace(array_keys($options), array_values($options), $x);