From 67f27e0ef4180ee55b74553aeb65a9a3919db17c Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 26 Apr 2020 23:30:43 +0200 Subject: [PATCH 1/5] fix #13: add alternate hamburger icon --- css/sideMenu.css | 5 +++++ img/side-menu-opener-hamburger-2.svg | 6 ++++++ templates/settings/admin-form.php | 1 + 3 files changed, 12 insertions(+) create mode 100644 img/side-menu-opener-hamburger-2.svg diff --git a/css/sideMenu.css b/css/sideMenu.css index c1930c2..f7661e4 100644 --- a/css/sideMenu.css +++ b/css/sideMenu.css @@ -37,6 +37,10 @@ display: block; } +#header .side-menu-opener { + margin-left: 5px; +} + .side-menu-opener { background: var(--side-menu-opener, url('../img/side-menu-opener.svg')); height: 40px; @@ -96,6 +100,7 @@ max-width: 250px; position: fixed; padding-top: 2px; + padding-left: 5px; top: 0; } diff --git a/img/side-menu-opener-hamburger-2.svg b/img/side-menu-opener-hamburger-2.svg new file mode 100644 index 0000000..fec4cf8 --- /dev/null +++ b/img/side-menu-opener-hamburger-2.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/templates/settings/admin-form.php b/templates/settings/admin-form.php index ccd0da1..733e321 100644 --- a/templates/settings/admin-form.php +++ b/templates/settings/admin-form.php @@ -93,6 +93,7 @@ $choicesSizes = [ $choices = [ 'Default' => 'side-menu-opener', 'Hamburger' => 'side-menu-opener-hamburger', + 'Hamburger 2' => 'side-menu-opener-hamburger-2', ]; ?> From 26e737e2d7bef43076c78a9a21b997d96f646eb3 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 26 Apr 2020 23:32:30 +0200 Subject: [PATCH 2/5] fix #13: add alternate hamburger icon --- img/side-menu-opener-hamburger-2.svg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/img/side-menu-opener-hamburger-2.svg b/img/side-menu-opener-hamburger-2.svg index fec4cf8..b67c303 100644 --- a/img/side-menu-opener-hamburger-2.svg +++ b/img/side-menu-opener-hamburger-2.svg @@ -1,6 +1,6 @@ - - - - + + + + From 9b060d1a4ba9b393eee77c1fb0255c5a4fbb2a67 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 26 Apr 2020 23:45:33 +0200 Subject: [PATCH 3/5] fix #13: add option to show only the opener --- lib/Controller/CssController.php | 1 + lib/Settings/Admin.php | 1 + src/admin.js | 1 + templates/css/stylesheet.php | 6 ++++++ templates/settings/admin-form.php | 16 ++++++++++++++++ 5 files changed, 25 insertions(+) diff --git a/lib/Controller/CssController.php b/lib/Controller/CssController.php index 4fa1ab5..4f360a1 100644 --- a/lib/Controller/CssController.php +++ b/lib/Controller/CssController.php @@ -63,6 +63,7 @@ class CssController extends Controller 'opener' => $this->config->getAppValue('side_menu', 'opener', 'side-menu-opener'), ], 'display-logo' => (bool) $this->config->getAppValue('side_menu', 'display-logo', 1), + 'opener-only' => (bool) $this->config->getAppValue('side_menu', 'opener-only', 0), 'size-icon' => $this->config->getAppValue('side_menu', 'size-icon', 'normal'), 'size-text' => $this->config->getAppValue('side_menu', 'size-text', 'normal'), ]; diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php index b984305..fd889db 100644 --- a/lib/Settings/Admin.php +++ b/lib/Settings/Admin.php @@ -60,6 +60,7 @@ class Admin implements ISettings 'display-logo' => $this->config->getAppValue('side_menu', 'display-logo', '1'), 'opener-position' => $this->config->getAppValue('side_menu', 'opener-position', 'before'), 'opener-hover' => $this->config->getAppValue('side_menu', 'opener-hover', '0'), + 'opener-only' => $this->config->getAppValue('side_menu', 'opener-only', '0'), 'size-icon' => $this->config->getAppValue('side_menu', 'size-icon', 'normal'), 'size-text' => $this->config->getAppValue('side_menu', 'size-text', 'normal'), ]; diff --git a/src/admin.js b/src/admin.js index 1a60b51..a05bd00 100644 --- a/src/admin.js +++ b/src/admin.js @@ -23,6 +23,7 @@ const elements = [ 'side-menu-opener', 'side-menu-opener-position', 'side-menu-opener-hover', + 'side-menu-opener-only', 'side-menu-display-logo', 'side-menu-size-icon', 'side-menu-size-text', diff --git a/templates/css/stylesheet.php b/templates/css/stylesheet.php index 4ddb0aa..7e46e48 100644 --- a/templates/css/stylesheet.php +++ b/templates/css/stylesheet.php @@ -8,6 +8,12 @@ } + + #nextcloud { + display: none; + } + + .side-menu-logo { display: none; diff --git a/templates/settings/admin-form.php b/templates/settings/admin-form.php index 733e321..20cdb31 100644 --- a/templates/settings/admin-form.php +++ b/templates/settings/admin-form.php @@ -135,6 +135,22 @@ $choicesSizes = [ + +
+ +
+ +
+ +
From c84ce6a615f05df11b483bc18c70abb674f5bce8 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 26 Apr 2020 23:46:38 +0200 Subject: [PATCH 4/5] release v1.4.0 --- appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 72e9898..32c1408 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -13,7 +13,7 @@ You can report a bug or request a feature by opening an issue ]]> agpl Simon Vieille - 1.3.3 + 1.4.0 SideMenu customization https://gitnet.fr/deblan/side_menu From ef22990f4bb2f93dbbf7c6131efb34eddb486614 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Mon, 27 Apr 2020 08:48:48 +0200 Subject: [PATCH 5/5] release v1.3.4 --- README.md | 2 +- appinfo/info.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 206930e..e2eaef9 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ $ unzip -d side_menu /path/to/side_menu_vX.Y.Z.zip ![](https://upload.deblan.org/u/2020-03/5e81b219.jpg) -![](https://upload.deblan.org/u/2020-04/5ea42d1a.png) +![](https://upload.deblan.org/u/2020-04/5ea68025.png) How to contribute? diff --git a/appinfo/info.xml b/appinfo/info.xml index 32c1408..06a338c 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -13,7 +13,7 @@ You can report a bug or request a feature by opening an issue ]]> agpl Simon Vieille - 1.4.0 + 1.3.4 SideMenu customization https://gitnet.fr/deblan/side_menu @@ -21,7 +21,7 @@ You can report a bug or request a feature by opening an issue https://gitnet.fr/deblan/side_menu https://upload.deblan.org/u/2020-03/5e7fab2b.jpg https://upload.deblan.org/u/2020-03/5e81b219.jpg - https://upload.deblan.org/u/2020-04/5ea42d1a.png + https://upload.deblan.org/u/2020-04/5ea68025.png