2.15.1 Tweaks to toolbar positioning

classaxe · Jul 7, 2020 · fda761b · fda761b
1 parent fc5662b
commit fda761b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 16 deletions.
diff --git a/public/css/style.css b/public/css/style.css
@@ -1,7 +1,7 @@
 /*
  * Project:    RXX - NDB Logging Database
  * Homepage:   https://rxx.classaxe.com
- * Version:    2.50.0
+ * Version:    2.15.1
  * Date:       2020-07-06
  * Licence:    LGPL
  * Copyright:  2020 Martin Francis
@@ -263,19 +263,22 @@ tr.other td {
   }
 }
 @media (min-width: 61em) {
+  .topbar {
+    margin: 0 0.5em;
+  }
   .topbar div.toolbar {
     padding: 0 0.5em;
     background-color: #eeeeee;
     border: 1px solid #cccccc;
   }
   .topbar div.toolbar ul ul {
-    right: 0;
+    left: 0.5em;
   }
   .topbar .version-switcher {
-    float: left;
+    float: right;
   }
   .topbar .userStatus {
-    float: right;
+    float: left;
   }
 }
 .topbar .userStatus ul {

diff --git a/public/css/style.min.css b/public/css/style.min.css
diff --git a/src/Repository/ModeRepository.php b/src/Repository/ModeRepository.php
@@ -113,13 +113,6 @@ class ModeRepository
                 'title' =>  'Logon',
                 'url'=>     false
             ],
-            'logoff' => [
-                'admin' =>  true,
-                'guest' =>  false,
-                'menu' =>   'Log Off',
-                'title' =>  'Log Off',
-                'url'=>     false
-            ],
         ],
         [
             'admin/tools' => [

diff --git a/src/css/include/topbar.less b/src/css/include/topbar.less
@@ -11,21 +11,22 @@
         }
     }
     @media (min-width: 61em) {
+        margin: 0 0.5em;
         div.toolbar {
             padding: 0 0.5em;
             background-color: #eeeeee;
             border: 1px solid #cccccc;
             ul {
                 ul {
-                    right: 0;
+                    left: 0.5em;
                 }
             }
         }
         .version-switcher {
-            float: left;
+            float: right;
         }
         .userStatus {
-            float: right;
+            float: left;
         }
     }
     .userStatus {

diff --git a/templates/topbar.html.twig b/templates/topbar.html.twig
@@ -1,6 +1,6 @@
 <div class="topbar">
-    {% include 'version_switcher.html.twig' %}
     {% include 'user_status.html.twig' %}
+    {% include 'version_switcher.html.twig' %}
 </div>
 <script>
     $(document).ready(function() {