aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/redbasic/php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-09-05 21:02:06 -0700
committerzotlabs <mike@macgirvin.com>2018-09-05 21:02:06 -0700
commitc5bc4fe24519079664b8f63a5e9082f0a7ffc945 (patch)
tree9039d12215106b92b21f42977abbcdb44b529f65 /view/theme/redbasic/php
parentbc4a92b702618aa83991ea65eb24d653cfc6601a (diff)
parentea381d918021a33a73df40de95fd0c57f0edc5c2 (diff)
downloadvolse-hubzilla-c5bc4fe24519079664b8f63a5e9082f0a7ffc945.tar.gz
volse-hubzilla-c5bc4fe24519079664b8f63a5e9082f0a7ffc945.tar.bz2
volse-hubzilla-c5bc4fe24519079664b8f63a5e9082f0a7ffc945.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'view/theme/redbasic/php')
-rw-r--r--view/theme/redbasic/php/style.php6
1 files changed, 1 insertions, 5 deletions
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);