diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-08-16 10:32:35 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-08-16 10:32:35 +0200 |
| commit | 4a7384bc0ce1893a432bf4b7d67bca23796fe9db (patch) | |
| tree | 5623c66a3f66445284529d6207e4ab4a2edb2810 /view/php | |
| parent | c664a4bdcd1bd578f5ec3c2884f7c97e9f68d2d7 (diff) | |
| parent | 90bc21f2d560d879d7eaf05a85af6d6dca53ebac (diff) | |
| download | volse-hubzilla-2.6.tar.gz volse-hubzilla-2.6.tar.bz2 volse-hubzilla-2.6.zip | |
Merge branch '2.6RC'2.6
Diffstat (limited to 'view/php')
| -rw-r--r-- | view/php/default.php | 2 | ||||
| -rw-r--r-- | view/php/full.php | 2 | ||||
| -rw-r--r-- | view/php/mod_import.php | 2 | ||||
| -rw-r--r-- | view/php/mod_setup.php | 2 | ||||
| -rw-r--r-- | view/php/theme_init.php | 1 |
5 files changed, 4 insertions, 5 deletions
diff --git a/view/php/default.php b/view/php/default.php index e4553a17f..bd4d7dc22 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -8,7 +8,7 @@ <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 fixed-top navbar-expand-md navbar-inverse bg-inverse"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> + <nav class="navbar fixed-top navbar-expand-md navbar-dark bg-dark"><?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']; ?> diff --git a/view/php/full.php b/view/php/full.php index 64e32c5bd..094874766 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 fixed-top navbar-expand-md navbar-inverse bg-inverse"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> + <nav class="navbar fixed-top navbar-expand-md navbar-dark bg-dark"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> <section><?php if(x($page,'content')) echo $page['content']; ?> <div id="page-footer"></div> </section> diff --git a/view/php/mod_import.php b/view/php/mod_import.php deleted file mode 100644 index 56c4eff86..000000000 --- a/view/php/mod_import.php +++ /dev/null @@ -1,2 +0,0 @@ -<?php -App::$page['template'] = 'full'; diff --git a/view/php/mod_setup.php b/view/php/mod_setup.php new file mode 100644 index 000000000..f0ed2742d --- /dev/null +++ b/view/php/mod_setup.php @@ -0,0 +1,2 @@ +<?php +App::$page['template'] = 'zen'; diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 869b97473..ff37023cf 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -10,7 +10,6 @@ head_add_css('/view/css/conversation.css'); head_add_css('/view/css/widgets.css'); head_add_css('/view/css/colorbox.css'); head_add_css('/library/justifiedGallery/justifiedGallery.min.css'); -head_add_css('/library/Text_Highlighter/sample.css'); head_add_js('jquery.js'); head_add_js('/library/justifiedGallery/jquery.justifiedGallery.min.js'); |