aboutsummaryrefslogtreecommitdiffstats
path: root/view/php/default.php
diff options
context:
space:
mode:
authorM. Dent <dentm42@gmail.com>2018-11-28 04:03:39 +0100
committerM. Dent <dentm42@gmail.com>2018-11-28 04:03:39 +0100
commit19f0ce7e37df2ad6605246ca89dcf5890cbc1a3b (patch)
tree630ce5fa123b5e49d6013afe2136ccea1e24f0ae /view/php/default.php
parenta88a515fa0a447f238299aa2ee5f609b64ff3961 (diff)
parent3775be4ce9c56639146efa877eefabb9e9f23b3c (diff)
downloadvolse-hubzilla-19f0ce7e37df2ad6605246ca89dcf5890cbc1a3b.tar.gz
volse-hubzilla-19f0ce7e37df2ad6605246ca89dcf5890cbc1a3b.tar.bz2
volse-hubzilla-19f0ce7e37df2ad6605246ca89dcf5890cbc1a3b.zip
Merge branch 'default2flex-conversion' into 'dev'
use flex for the default template See merge request hubzilla/core!1409
Diffstat (limited to 'view/php/default.php')
-rw-r--r--view/php/default.php14
1 files changed, 9 insertions, 5 deletions
diff --git a/view/php/default.php b/view/php/default.php
index 60f3f6a6f..388c94382 100644
--- a/view/php/default.php
+++ b/view/php/default.php
@@ -10,12 +10,16 @@
<header><?php if(x($page,'header')) echo $page['header']; ?></header>
<nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
<main>
- <aside id="region_1"><div class="aside_spacer"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></div></aside>
- <section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
+ <div class="content">
+ <div class="columns">
+ <aside id="region_1"><div class="aside_spacer"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></div></aside>
+ <section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
<div id="page-footer"></div>
- <div id="pause"></div>
- </section>
- <aside id="region_3" class="d-none d-xl-table-cell"><div class="aside_spacer"><div id="right_aside_wrapper"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></div></div></aside>
+ <div id="pause"></div>
+ </section>
+ <aside id="region_3" class="d-none d-xl-table-cell"><div class="aside_spacer"><div id="right_aside_wrapper"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></div></div></aside>
+ </div>
+ </div>
</main>
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
</body>