From 220b8a20866d9b7398996bd30dbc61f61345209c Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 31 Jan 2017 19:06:29 +0100
Subject: [PATCH] improve admin styling

* use inline-block instead of flexbox
* fix RTL alignments
---
 inc/Ui/Admin.php                 |  6 ++--
 lib/tpl/dokuwiki/css/_admin.less | 51 ++++++++++++++++----------------
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/inc/Ui/Admin.php b/inc/Ui/Admin.php
index efaf3aa7c5..b79ade03b0 100644
--- a/inc/Ui/Admin.php
+++ b/inc/Ui/Admin.php
@@ -118,11 +118,13 @@ protected function showMenuItem($item) {
         global $ID;
         if(blank($item['prompt'])) return;
         echo '<li><div class="li">';
-        echo '<span>';
+        echo '<a href="' . wl($ID, 'do=admin&amp;page=' . $item['plugin']) . '">';
+        echo '<span class="icon">';
         embedSVG($item['icon']);
         echo '</span>';
-        echo '<a href="' . wl($ID, 'do=admin&amp;page=' . $item['plugin']) . '">';
+        echo '<span class="prompt">';
         echo $item['prompt'];
+        echo '</span>';
         echo '</a>';
         echo '</div></li>';
     }
diff --git a/lib/tpl/dokuwiki/css/_admin.less b/lib/tpl/dokuwiki/css/_admin.less
index c01e84d647..cf219215f6 100644
--- a/lib/tpl/dokuwiki/css/_admin.less
+++ b/lib/tpl/dokuwiki/css/_admin.less
@@ -7,40 +7,39 @@
         list-style-type: none;
         font-size: 1.125em;
     }
-    [dir=rtl] ul.admin_tasks {
+    [dir=rtl] & ul.admin_tasks {
         float: right;
     }
 
     /* general menu item styling */
-    ul li {
-        margin: 0 0 1em 0;
-        font-weight: bold;
-        list-style-type: none;
-
-        div {
-            // flexbox takes care of RTL alignment
-            display: flex;
-            flex-direction: row;
-            flex-wrap: nowrap;
-            justify-content: flex-start;
-            align-content: flex-start;
-            align-items: flex-start;
+    ul {
+        padding: 0;
+        li {
+            margin: 0 0 1em 0;
+            font-weight: bold;
+            list-style-type: none;
+            white-space: nowrap;
 
-            span {
-                width: 1.5em;
-                align-self: center;
+            a span {
+                display: inline-block;
 
-                svg {
+                &.icon {
                     width: 1.5em;
-                    height: 1.5em;
-                    fill: @ini_link;
+                    min-height: 1.5em;
+                    margin: 0 0.5em;
+                    vertical-align: top;
+
+                    svg {
+                        width: 1.5em;
+                        height: 1.5em;
+                        fill: @ini_link;
+                        display: inline-block;
+                    }
                 }
-            }
 
-            a {
-                flex-grow: 1;
-                align-self: center;
-                margin: 0 0.5em;
+                &.prompt {
+                    white-space: normal;
+                }
             }
         }
     }
@@ -52,7 +51,7 @@
         color: @ini_text_neu;
         background-color: inherit;
     }
-    [dir=rtl] #admin__version {
+    [dir=rtl] & #admin__version {
         clear: right;
         float: left;
     }