Merge pull request 'move the logo inside #nextcloud element (fix #278 #239) [NC26]' (#335) from bugfix/issue278-239 into develop

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

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: ?>