diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-25 14:40:31 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-25 14:40:31 -0700 |
| commit | e5e0a6b31f7870a46766c1e8ff87886fdb14b6de (patch) | |
| tree | 7035d84f2edbc6b6efa435527ffdc3cd38b8027a /view/php | |
| parent | 5c63f7dd58c5b3b88efcc47120c791f92527f720 (diff) | |
| parent | 2115eb26a7fd2ca937286bd4e98ab74c7d6e9525 (diff) | |
| download | volse-hubzilla-e5e0a6b31f7870a46766c1e8ff87886fdb14b6de.tar.gz volse-hubzilla-e5e0a6b31f7870a46766c1e8ff87886fdb14b6de.tar.bz2 volse-hubzilla-e5e0a6b31f7870a46766c1e8ff87886fdb14b6de.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view/php')
| -rw-r--r-- | view/php/default.php | 4 | ||||
| -rw-r--r-- | view/php/full.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/view/php/default.php b/view/php/default.php index 373fa2fd0..950dfbc99 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -8,14 +8,14 @@ <body <?php if($page['direction']) echo 'dir="rtl"' ?> > <?php if(x($page,'banner')) echo $page['banner']; ?> <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> + <nav class="navbar fixed-top navbar-toggleable-sm navbar-inverse bg-inverse"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> <main> <aside id="region_1"><div id="left_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="hidden-sm hidden-xs hidden-md"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside> + <aside id="region_3" class="d-none d-xl-table-cell"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside> </main> <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> </body> diff --git a/view/php/full.php b/view/php/full.php index 9cf567a67..a528781c0 100644 --- a/view/php/full.php +++ b/view/php/full.php @@ -7,7 +7,7 @@ </head> <body> <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> + <nav class="navbar fixed-top navbar-toggleable-sm navbar-inverse bg-inverse"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> <section><?php if(x($page,'content')) echo $page['content']; ?> <div id="page-footer"></div> </section> |