Merge pull request 'release v2.3.5' (#100) from develop into master

Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/100

CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## 2.3.5
+### Fixed
+* fix white square (#99)
+
+## 2.3.4
+### Fixed
+* fix blank line when settings are open (#96)
+
 ## 2.3.3
 ### Added
 * hide the scrollbar when mouse is out (menu always displayed)

README.md

@@ -15,6 +15,8 @@ You can customize colors depending of the theme (Dark theme and Breeze Dark). Co
 
 You like this app and you want to support me? ☕ [Buy me a coffee](https://www.buymeacoffee.com/deblan) or [Donate with liberapay](https://liberapay.com/deblan)
 
+[![Build Status](https://ci2.gitnet.fr/api/badges/deblan/side_menu/status.svg)](https://ci2.gitnet.fr/deblan/side_menu)
+
 Requirements
 ------------
 

appinfo/info.xml

@@ -26,7 +26,7 @@ If you like this application and if you want to support the development:
 * [Donate with liberapay](https://liberapay.com/deblan)
 * [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
 ]]></description>
-    <version>2.3.3</version>
+    <version>2.3.5</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>
@@ -46,7 +46,7 @@ If you like this application and if you want to support the development:
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc20_big_menu_responsive.png</screenshot>
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/personal_settings.png</screenshot>
     <dependencies>
-        <nextcloud min-version="19" max-version="23"/>
+        <nextcloud min-version="19" max-version="24"/>
         <php min-version="7.3"/>
     </dependencies>
     <settings>

css/sideMenu.css

@@ -79,7 +79,7 @@
 }
 
 .side-menu-opener:active {
-    background-color: var(--color-background-dark) !important;
+    background-color: var(--side-menu-current-app-background-color, #444) !important;
 }
 
 .side-menu-closer {
@@ -298,6 +298,10 @@
     padding: 10px 0;
 }
 
+.side-menu-always-displayed #body-settings, #body-settings.body-settings-side-menu {
+    overflow-x: visible;
+}
+
 @media screen and (max-width: 1024px) {
     #side-menu.side-menu-big {
         max-width: 290px;

package.json

@@ -21,7 +21,7 @@
 		"extends @nextcloud/browserslist-config"
 	],
 	"engines": {
-		"node": ">=10.0.0"
+		"node": ">=16.0.0"
 	},
 	"devDependencies": {
 		"@babel/core": "^7.9.0",
@@ -43,9 +43,9 @@
 		"eslint-plugin-standard": "^4.0.1",
 		"eslint-plugin-vue": "^5.2.3",
 		"file-loader": "^6.0.0",
-		"node-sass": "^4.13.1",
 		"sass-loader": "^8.0.2",
 		"stylelint": "^8.4.0",
+		"sass": "^1.49.9",
 		"stylelint-config-recommended-scss": "^3.3.0",
 		"stylelint-scss": "^3.16.0",
 		"stylelint-webpack-plugin": "^0.10.5",

templates/js/_topMenuApps.js

@@ -71,7 +71,6 @@ const updateTopMenu = function() {
         if (targetBlankApps.indexOf(dataId) !== -1) {
             querySelector('a', app).setAttribute('target', '_blank')
         }
-
     }
 
     navigationApps.innerHTML = navigationAppsHtml

templates/js/script.php

@@ -171,6 +171,21 @@ if ($_['always-displayed']) {
                 sideMenuFocus()
             }
         })
+
+        const sideMenuObserver = new MutationObserver((e) => {
+            if (body.getAttribute('id') !== 'body-settings') {
+                return
+            }
+
+            body.classList.toggle('body-settings-side-menu', sideMenu.classList.contains('open'))
+        })
+
+        sideMenuObserver.observe(sideMenu, {
+            attributes: true,
+            attributeFilter: ['class'],
+            childList: false,
+            characterData: false
+        })
     })
 
     body.appendChild(sideMenuContainer)