aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-09-05 12:34:30 +0200
committerMario Vavti <mario@mariovavti.com>2018-09-05 12:34:30 +0200
commite494a76b33baae47aee671951cc4459a3f225c86 (patch)
treef26d2a0b3c6790d3a1ad2a0a9f044f4469edfdf0 /view/theme
parent1753e404668b272a284bc922d3102acf04a6d6d1 (diff)
downloadvolse-hubzilla-e494a76b33baae47aee671951cc4459a3f225c86.tar.gz
volse-hubzilla-e494a76b33baae47aee671951cc4459a3f225c86.tar.bz2
volse-hubzilla-e494a76b33baae47aee671951cc4459a3f225c86.zip
revert "Add bottom margin on aside elements and main to allow for viewport footer."
This reverts commit 1d7d604016e6728725c4b857cec85c3d5a050268.
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/redbasic/css/style.css8
-rw-r--r--view/theme/redbasic/php/style.php6
2 files changed, 2 insertions, 12 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 82d0cf761..970e4bc89 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -33,19 +33,13 @@ aside #region_1 {
}
aside #left_aside_wrapper {
- /*margin-bottom: 10px;*/
- margin-bottom: $bottom_margin;
-}
-aside #right_aside_wrapper {
- /*margin-bottom: 10px;*/
- margin-bottom: $bottom_margin;
+ margin-bottom: 10px;
}
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 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);