diff --git a/CHANGELOG.md b/CHANGELOG.md index 78324bf..d59a7d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ ## [Unreleased] +## 3.9.1 +### Fixed +* fix fixed menu on dashboard (#262) + +## 3.9.0 +### Added +* add compatibility with NC27 +### Fixed +* fix app redirect (#261) + ## 3.8.0 ### Added * add option to show hovered label only on top menu (fix #253) diff --git a/appinfo/info.xml b/appinfo/info.xml index 34af52c..4acf6f4 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -32,7 +32,7 @@ Notice Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**. In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/). ]]> - 3.8.0 + 3.9.1 agpl Simon Vieille SideMenu @@ -54,7 +54,7 @@ In case of downtime, you can download **Custom Menu** from [here](https://kim.de https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_big_menu.png https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_default_menu.png - + diff --git a/css/sideMenu.css b/css/sideMenu.css index 7224803..7fc71a2 100644 --- a/css/sideMenu.css +++ b/css/sideMenu.css @@ -239,14 +239,23 @@ left: 50px; } +.side-menu-always-displayed #header { + position: absolute !important; +} + .side-menu-always-displayed #side-menu { display: block; } .side-menu-always-displayed .side-menu-apps-list { + height: 100vh; + top: 0; + overflow: hidden; +} + +.side-menu-always-displayed .side-menu-apps-list--with-settings { height: calc(100vh - 49px); top: 49px; - overflow: hidden; } .side-menu-always-displayed .side-menu-apps-list:hover { diff --git a/lib/Controller/AppController.php b/lib/Controller/AppController.php index 5516090..588911f 100644 --- a/lib/Controller/AppController.php +++ b/lib/Controller/AppController.php @@ -74,7 +74,7 @@ class AppController extends Controller $inTopMenuApps = in_array($app['id'], $topMenuApps); $inHiddenApps = in_array($app['id'], $hiddenApps); - if (!$inTopMenuApps || $inHiddenApps) { + if (!$inTopMenuApps && $inHiddenApps) { continue; } diff --git a/src/SideMenu.vue b/src/SideMenu.vue index fd2f24e..de7065d 100644 --- a/src/SideMenu.vue +++ b/src/SideMenu.vue @@ -16,7 +16,7 @@ along with this program. If not, see . -->