Merge remote-tracking branch 'origin/master' into footnotes

css/area_header.less

@@ -213,6 +213,7 @@
 .header-compact {
     #dokuwiki__header {
         min-height: 2.7rem;
+        margin-bottom: 0.5rem;
 
         .main-title.desktop-only p.claim,
         p.claim {
@@ -234,7 +235,11 @@
 
             .main-title.desktop-only,
             .logo {
-                padding-top: 0.4rem
+                padding-top: 0.4rem;
+            }
+
+            .logo img {
+                height: 3.6rem;
             }
         }
 

css/area_main-sidebar-tabs.less

@@ -4,16 +4,24 @@
 
     border-bottom: 1px solid @ini_nav_menu_color;
 
+    white-space: nowrap;
+
     li {
         display: inline-block;
         border: 1px solid @ini_nav_menu_color;
         padding: 0.25em 0.5em;
         margin-bottom: -1px;
+        margin-left: 0.5em;
         border-top-right-radius: @fix_border-radius;
         border-top-left-radius: @fix_border-radius;
 
         &.active {
             border-bottom: 1px solid @ini_background_site;
+            font-weight: bold;
         }
     }
 }
+
+.wide-content #dokuwiki__aside ul.sidebar-tabs {
+    visibility: hidden;
+}

css/plugins/sitemapnavi.less

@@ -1,10 +1,17 @@
 #plugin__sitemapnavi {
-    padding-left: @nav-margin*2.5;
     padding-bottom: @nav-margin;
     margin-bottom: @nav-margin;
     border-bottom: 1px solid @ini_nav_menu_color;
 
+    label {
+        padding-left: 0.5em;
+    }
+
     li {
         line-height: @line-height-bigger;
     }
 }
+
+.wide-content #plugin__sitemapnavi {
+    display: none;
+}