Merge pull request 'release v3.11.8' (#336) from develop into master

Reviewed-on: #336

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## 3.11.8
+### Fixed
+* move the logo inside #nextcloud element (fix #278 #239) [NC26]
+
 ## 3.11.7
 ### Added
 * update translations

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/).
 ]]></description>
-    <version>3.11.7</version>
+    <version>3.11.8</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>

templates/css/stylesheet.php

@@ -42,13 +42,11 @@
     top: 49px;
   }
 
-  #side-menu.hide-opener .side-menu-header .side-menu-opener.side-menu-closer
-  {
+  #side-menu.hide-opener .side-menu-header .side-menu-opener.side-menu-closer {
     visibility: hidden;
   }
 
-  #side-menu.hide-opener.side-menu-with-categories .side-menu-search
-  {
+  #side-menu.hide-opener.side-menu-with-categories .side-menu-search {
     float: none;
   }
 

templates/js/script.php

@@ -24,6 +24,7 @@ if ($_['always-displayed']) {
   const body = document.querySelector('body')
   const html = document.querySelector('html')
   const nextcloud = document.querySelector('#nextcloud')
+  const logo = document.querySelector('.header-left .logo')
 
   const isTouchDevice = window.matchMedia("(pointer: coarse)").matches
 
@@ -170,6 +171,10 @@ if ($_['always-displayed']) {
   <?php endif; ?>
 
   if (nextcloud) {
+    if (logo && logo.parentNode !== nextcloud) {
+      nextcloud.appendChild(logo)
+    }
+
     <?php if ($_['opener-position'] === 'before'): ?>
       nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud)
     <?php else: ?>