Merge branch 'sidebar' into live

* sidebar:
  SPR-835 only show an icon until hover
  SVG dispatch: allow passing ini colors without underscores
  remove jumping on edit hover with h1

css/area_main-content.less

@@ -4,20 +4,19 @@
  * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 
-
 #dokuwiki__content.main-content {
 
     .level2 {
         p a.media {
-            img{
-                border:1px dotted @color-site-bg;
+            img {
+                border: 1px dotted @color-site-bg;
 
             }
-           &:hover,&:focus,&:active{
-               img{
-                   border:1px solid @color-link;
-               }
-           }
+            &:hover, &:focus, &:active {
+                img {
+                    border: 1px solid @color-link;
+                }
+            }
 
         }
     }
@@ -34,19 +33,41 @@
         float: right;
         margin-top: 0;
         position: relative;
-        z-index:2;
+        z-index: 2;
         top: 0;
+
+        button {
+            background-color: transparent;
+            color: transparent;
+            border-color: transparent;
+
+            &::after {
+                content: '';
+                display: inline-block;
+                background: transparent url("svg.php?svg=pencil.svg&f=link") center center no-repeat;
+                height: 1em;
+                width: 1em;
+                background-size: contain;
+                margin-left: 0.5rem; // FIXME hard coded in plugins/edit.less
+            }
+
+            &:hover,
+            &:active,
+            &:focus {
+                background-color: @button_color;
+                color: @button_background;
+                border-color: @button_background;
+            }
+        }
     }
 }
 
-
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* min-width: 1440px */
 
 @media @screen_min-xlg {
 }
 
-
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* max-width: 1199px */
 

css/base_design.less

@@ -131,9 +131,6 @@ h1 {
     font-size: @font-size-head1;
     margin: 0 0 @font-size-head1;
     padding-top: 1em;
-    #dokuwiki__content > & {
-        padding-top: 1.5em;
-    }
 }
 
 h2 {

img/pencil.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M20.71 7.04c.39-.39.39-1.04 0-1.41l-2.34-2.34c-.37-.39-1.02-.39-1.41 0l-1.84 1.83 3.75 3.75M3 17.25V21h3.75L17.81 9.93l-3.75-3.75L3 17.25z"/></svg>

svg.php

@@ -272,6 +272,9 @@ class SVG {
             if(isset($this->replacements[$color])) {
                 return $this->replacements[$color];
             }
+            if(isset($this->replacements['__' . $color . '__'])) {
+                return $this->replacements['__' . $color . '__'];
+            }
             return '';
         }