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/4] 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/4] 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: ?>

From 32cd25b73608ba6db964166fdf8ea0fe7238b84f Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Tue, 20 Feb 2024 21:18:18 +0100
Subject: [PATCH 3/4] update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3533d10..ed3c302 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## [Unreleased]
 
+### Fixed
+* move the logo inside #nextcloud element (fix #278 #239) [NC26]
+
 ## 3.11.7
 ### Added
 * update translations

From 56904c5aa0a3ed62d53dfe4fc1a69f149557b7a9 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Tue, 20 Feb 2024 21:22:05 +0100
Subject: [PATCH 4/4] release v3.11.8

---
 CHANGELOG.md     | 1 +
 appinfo/info.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed3c302..0af2b42 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## [Unreleased]
 
+## 3.11.8
 ### Fixed
 * move the logo inside #nextcloud element (fix #278 #239) [NC26]
 
diff --git a/appinfo/info.xml b/appinfo/info.xml
index c293e56..47667c3 100644
--- a/appinfo/info.xml
+++ b/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>