From afbf7662562dfe1ba38d1291957b1b5c67a41f75 Mon Sep 17 00:00:00 2001
From: vincent-peugnet <vincent-peugnet@riseup.net>
Date: Thu, 9 Nov 2023 11:16:54 +0100
Subject: [PATCH] clean editor top bars style

---
 app/view/templates/edittopbar.php |  6 ++++--
 assets/css/back.css               |  8 --------
 assets/css/base.css               |  5 +++++
 assets/css/edit.css               | 23 ++++++++++++-----------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/app/view/templates/edittopbar.php b/app/view/templates/edittopbar.php
index 6728378d..09f72e02 100644
--- a/app/view/templates/edittopbar.php
+++ b/app/view/templates/edittopbar.php
@@ -1,6 +1,6 @@
 <aside id="edittopbar">
 
-    <div id="editmenu">
+    <span class="menu" id="pagemenu">
         <span>
             <form
                 action="<?= $this->upage('pageupdate', $page->id()) ?>"
@@ -41,6 +41,8 @@
                     <span class="text">delete</span>
                 </a>
         </span>
+    </span>
+    <span class="menu" id="workspacemenu">
 
         <span id="fontsize">
             <label for="fontsize">
@@ -68,6 +70,6 @@
             </form>
         </span>
 
-    </div>
+</span>
 
 </aside>
diff --git a/assets/css/back.css b/assets/css/back.css
index 7c5a2dd3..aed7d3c4 100644
--- a/assets/css/back.css
+++ b/assets/css/back.css
@@ -201,14 +201,6 @@ main.font input, main.font  select, main.font  textarea {
     display: block;
 }
 
-span#user {
-    float: right;
-}
-
-span#search {
-    float: left;
-}
-
 img.icon {
     height: 12px;
 }
diff --git a/assets/css/base.css b/assets/css/base.css
index 10b1cd42..e63e83b9 100644
--- a/assets/css/base.css
+++ b/assets/css/base.css
@@ -62,6 +62,7 @@ h1, h2 {
     background-color: var(--main-color);
     width: 100%;
     padding: 4px 3px;
+    display: flex;
 }
 
 #topbar form {
@@ -81,6 +82,10 @@ h1, h2 {
     text-decoration: underline;
 }
 
+span#user {
+    margin-left: auto; /* align to the right */
+}
+
 aside {
     background-color: var(--secondary-background-color);
 }
diff --git a/assets/css/edit.css b/assets/css/edit.css
index aa582d7c..34476afa 100644
--- a/assets/css/edit.css
+++ b/assets/css/edit.css
@@ -105,13 +105,24 @@ input#editfontsize {
 }
 
 
-.editor div#editmenu {
+.editor aside {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     flex-wrap: nowrap;
+    padding: 2px 3px;
 }
 
+aside#edittopbar .menu {
+    display: flex;
+  }
+  aside #pagemenu > span {
+    margin-right: 14px;
+  }
+  aside #workspacemenu > span {
+    margin-left: 10px;
+  }
+
 .editor ul {
     list-style: none;
     padding: 0;
@@ -152,16 +163,6 @@ a:hover {
 
 
 
-span#user {
-    float: right;
-}
-
-span#search {
-    float: left;
-}
-
-
-
 
 img.icon {
     height: 15px;