diff options
| author | zotlabs <mike@macgirvin.com> | 2016-12-16 19:57:49 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-12-16 19:57:49 -0800 |
| commit | 0c665e11f11c081111411fa2938e8e3f00d02634 (patch) | |
| tree | e488c81a3aa5bd18982c5522240b01a449f40633 /view/php/default.php | |
| parent | 827d4c5fb094715a65d4559f8c6159eb5d31d5f7 (diff) | |
| parent | 6eed7eb54054502d438ea18a9411d3be7cdf14fc (diff) | |
| download | volse-hubzilla-0c665e11f11c081111411fa2938e8e3f00d02634.tar.gz volse-hubzilla-0c665e11f11c081111411fa2938e8e3f00d02634.tar.bz2 volse-hubzilla-0c665e11f11c081111411fa2938e8e3f00d02634.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/php/default.php')
| -rw-r--r-- | view/php/default.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/view/php/default.php b/view/php/default.php index f5be4fa35..839a36b5b 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -10,7 +10,7 @@ <header><?php if(x($page,'header')) echo $page['header']; ?></header> <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> <main> - <aside id="region_1"><?php if(x($page,'aside')) echo $page['aside']; ?></aside> + <aside id="region_1"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></aside> <section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?> <div id="page-footer"></div> <div id="pause"></div> |