From 28085d9aa791b0a3c48f181847c262a791156921 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Tue, 20 Feb 2024 21:08:12 +0100
Subject: [PATCH 1/2] remove line breaks

---
 templates/css/stylesheet.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/templates/css/stylesheet.php b/templates/css/stylesheet.php
index c7eb453..5638629 100644
--- a/templates/css/stylesheet.php
+++ b/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;
   }
 

From 2cecd0d6f4fe82b82278f5645496a84e7d583ce0 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Tue, 20 Feb 2024 21:08:46 +0100
Subject: [PATCH 2/2] move the logo inside #nextcloud element (fix #278 #239)
 [NC26]

---
 templates/js/script.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/templates/js/script.php b/templates/js/script.php
index b67c9b2..77fcc95 100644
--- a/templates/js/script.php
+++ b/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: ?>