aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2018-08-21 13:17:14 +0200
committerMario <mario@mariovavti.com>2018-08-21 13:17:14 +0200
commit218029ee578ed40f37ec093e6bb7eafa7127263c (patch)
tree98489c324febd16ee5cc7d3b2cfbd9b7246d65d0 /view
parent0985adb7701a128966ecff3620624603b1e06449 (diff)
parent1d7d604016e6728725c4b857cec85c3d5a050268 (diff)
downloadvolse-hubzilla-218029ee578ed40f37ec093e6bb7eafa7127263c.tar.gz
volse-hubzilla-218029ee578ed40f37ec093e6bb7eafa7127263c.tar.bz2
volse-hubzilla-218029ee578ed40f37ec093e6bb7eafa7127263c.zip
Merge branch 'redbasic-addroomforfooter' into 'dev'
Add bottom margin on aside elements and main to allow for viewport footer. See merge request hubzilla/core!1259
Diffstat (limited to 'view')
-rw-r--r--view/theme/redbasic/css/style.css8
-rw-r--r--view/theme/redbasic/php/style.php6
2 files changed, 12 insertions, 2 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 970e4bc89..82d0cf761 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -33,13 +33,19 @@ aside #region_1 {
}
aside #left_aside_wrapper {
- margin-bottom: 10px;
+ /*margin-bottom: 10px;*/
+ margin-bottom: $bottom_margin;
+}
+aside #right_aside_wrapper {
+ /*margin-bottom: 10px;*/
+ margin-bottom: $bottom_margin;
}
main {
margin-left: auto;
margin-right: auto;
max-width: $main_widthpx;
+ margin-bottom: $bottom_margin;
}
#overlay {
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 91cc0b85b..0631fa142 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -106,6 +106,8 @@ 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')) {
@@ -150,7 +152,9 @@ 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
+ '$aside_width' => $aside_width,
+ '$bottom_margin' => $bottom_margin
+
);
echo str_replace(array_keys($options), array_values($options), $x);