Merge remote-tracking branch 'origin/spis-master'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

css/area_main-sidebar.less

@@ -0,0 +1,121 @@
+/**
+ * This file provides the design styles for the sidebar (navmain).
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
+ */
+
+
+#dokuwiki__aside.main-sidebar {
+
+/* + + + + +  nav main  + + + + + */
+    .nav-main {
+        > ul {
+            @icon-size: 2rem;
+
+            margin: 0;
+            padding: 0;
+
+            ul {
+                margin-left: (@icon-size + .5);
+            }
+
+            li {
+                color: @color-nav;
+
+                &:first-of-type {
+                    padding-top: .3rem;
+                }
+            }
+
+            .li {
+                color: @color-nav;
+
+                a {
+                    color: inherit;
+                }
+            }
+
+
+/* + + +  first level  + + + */
+            > li {
+                list-style-type: none;
+                border-bottom: solid 1px @color-border;
+                margin: 0;
+                padding: 0 0 .3rem 0;
+
+                > .li { //background-color: pink;// hier activ !!!
+                    position: relative;
+                    padding: .5rem 0 .5rem (@icon-size + 1);
+
+                    &::before {                        background-color: gold;// test
+                        content: '?';
+                        position: absolute;
+                        top: 0;
+                        left: 0;
+                        display: flex;
+                        display: -webkit-flex;
+                        flex-direction: column;
+                        -webkit-flex-direction: column;
+                        justify-content: center;
+                        -webkit-justify-content: center;
+                        height: 100%;
+                        width: @icon-size;
+                        overflow: hidden;
+                        text-align: center;
+                        margin-top: auto;
+                        margin-bottom: auto;
+                    }
+
+                    &::after {
+                        content: '';
+                        position: absolute;
+                        top: 15%;
+                        bottom: 15%;
+                        width: 1px;
+                        left: (@icon-size + .5);
+                        background-color: @color-border;
+                        transition: @transition background-color;
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* min-width: 1440px */
+
+@media @screen_min-xlg {
+    #dokuwiki__aside.main-sidebar {
+        .nav-main {
+            .li {
+                font-size: .88rem;
+                padding: .1rem 0;
+
+                > * {
+                    font-size: .88rem;
+                }
+            }
+        }
+    }
+}
+
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* max-width: 1199px */
+
+@media @screen_max-xlg {
+    #dokuwiki__aside.main-sidebar {
+        .nav-main {
+            .li {
+                font-size: 1rem;
+                padding: .15rem .25rem;
+
+                > * {
+                    font-size: 1rem;
+                }
+            }
+        }
+    }
+}

css/area_nav-breadcrumb.less

@@ -53,6 +53,8 @@
         }
     }
 
+
+/* + + + + +  icon list  + + + + + */
     .page-attributes {
         float: right;
         display: inline-block;
@@ -67,8 +69,28 @@
 
             float: left;
 
+            > strong,
+            > a {
+                display: block;
+                width: auto;
+                min-height: 2em;
+                border: 1px solid @color-border;
+                border-radius: @border-radius;
+                color: @color-nav;
+                text-align: center;
+                margin: 0;
+            }
+
+            .prefix {
+                .btn-prefix ();
+                .icon-clipboard();
+            }
+
+/* check !!! */
             &.do_none {
-                &:not([class*="plugin__qc"]) {
+                position: relative;
+
+                strong {
                     background-color: @color-site-bg;
                 }
 
@@ -77,37 +99,15 @@
                     color: @color-nav;
                 }
             }
+/* end check !!! */
 
             &.plugin__qc {
                 display: inline-block;
                 overflow: visible;
             }
-
-            .prefix {
-                .fontello();
-                .hide-text-show-before();
-
-                height: auto;
-                width: 100%;
-                color: @color-nav;
-                text-align: center;
-                transition: @transition color;
-
-                &::before {
-                    width: 100%;
-                    margin: .35em 0 0;
-                }
-            }
         } // li
 
         a {
-            display: block;
-            width: auto;
-            min-height: 2em;
-            margin: 0;
-            border: 1px solid @color-border;
-            border-radius: @border-radius;
-            color: @color-nav;
             transition: @transition color, @transition border-color;
 
             &[aria-expanded="false"] + #plugin__qc__wrapper {
@@ -143,13 +143,18 @@
         }
 
         #plugin__qc__link {
-            font-size: .8rem;
             position: relative;
 
             .prefix {
                 .icon-emo-happy();
 
-                font-size: inherit;
+                width: 100%;
+                font-size: .9rem;
+
+                &::before {
+                    width: 100%;
+                    margin: .1em 0 0;
+                }
             }
         }
     }

css/area_nav-usertools.less

@@ -11,6 +11,8 @@
         padding-top: .5rem;
     }
 
+
+/* + + + + +  icon list  + + + + + */
     ul {
         float: right;
         padding: 0;
@@ -21,11 +23,6 @@
             .btn-usertools-num();
 
             float: right;
-            font-size: .8rem;
-
-            * {
-                font-size: .8rem;
-            }
 
             > strong,
             > a {
@@ -40,6 +37,10 @@
             }
 
             &.noopentasks {
+                strong {
+                    background-color: @color-site-bg;
+                }
+
                 .num {
                     background-color: @color-border;
                     color: @color-nav;
@@ -67,9 +68,8 @@
                         border: 4px solid @color-nav;
                         border-radius: 50%;
                         color: #fff;
-                        font-size: .5rem;
+                        font-size: .6rem;
-                        margin-top: -1px;
+                        margin: -2px 6px -2px 0;
-                        margin-right: 6px;
                     }
                 }
             } // user
@@ -84,18 +84,14 @@
                     text-indent: 0;
 
                     &::before {
-                        content: "";
+                        content: '';
                         position: absolute;
                     }
                 }
 
                 .prefix {
-                    .fontello();
+                    .btn-prefix ();
-                    .hide-text-show-before();
                     .icon-clipboard();
-
-                    color: @color-nav;
-                    margin-top: .3rem;
                 }
 
                 &.opentasks,
@@ -108,6 +104,8 @@
             } // user-task
         } // li
 
+
+/* + + +  icons  + + + */
         a {
             .fontello();
             .hide-text-show-before();
@@ -131,9 +129,9 @@
                 display: block;
                 width: 100%;
                 box-sizing: border-box;
-                font-size: 1.12em;
+                font-size: 1.4em;
                 cursor: pointer;
-                margin: .3rem 0;
+                margin: .2rem 0 0;
             }
 
             /* icon register new user */
@@ -154,9 +152,11 @@
             /* icon admin */
             &.admin {
                 .icon-cog();
-            }
 
-            /* add more icons if needed */
+                &::before {
+                    margin-top: .18rem;
                 }
             }
-}
+        } // a
+    } // ul
+} // nav-usertools

css/area_sidetools.less

@@ -0,0 +1,109 @@
+/**
+ * This file provides the design styles for the sitetools (nav).
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
+ */
+
+
+#dokuwiki__sitetools.nav-sitetools {
+    @icon-size: 2rem;
+
+    h6 { //background-color: pink;// hier activ !!!
+        position: relative;
+        width: auto;
+        height: auto;
+        color: @color-nav;
+        font-size: .88rem;
+        font-weight: normal;
+        margin: 0;
+        padding: .5rem 0 .5rem (@icon-size + 1);
+
+        &::before {
+            background-color: gold;
+            content: '?';
+            position: absolute;
+            top: 0;
+            left: 0;
+            display: flex;
+            display: -webkit-flex;
+            flex-direction: column;
+            -webkit-flex-direction: column;
+            justify-content: center;
+            -webkit-justify-content: center;
+            height: 100%;
+            width: @icon-size;
+            overflow: hidden;
+            text-align: center;
+            margin-top: auto;
+            margin-bottom: auto;
+        }
+
+        &::after {
+            content: '';
+            position: absolute;
+            top: 15%;
+            bottom: 15%;
+            width: 1px;
+            left: (@icon-size + .5);
+            background-color: @color-border;
+            transition: @transition background-color;
+        }
+    }
+
+/* + + +  linklist  + + + */
+    ul {
+        padding-left: (@icon-size + .5);
+    }
+
+    li {
+        color: @color-nav;
+
+        a {
+            color: inherit;
+        }
+
+        &:first-of-type {
+            padding-top: .3rem;
+        }
+    }
+}
+
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* min-width: 1440px */
+
+@media @screen_min-xlg {
+    #dokuwiki__sitetools.nav-sitetools {
+        li {
+            font-size: 100%;
+            padding-top: .1rem;
+            padding-bottom: .1rem;
+
+            > * {
+                font-size: .88rem;
+            }
+        }
+    }
+}
+
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* max-width: 1199px */
+
+@media @screen_max-xlg {
+    #dokuwiki__sitetools.nav-sitetools {
+        h6 {
+            font-size: 1rem;
+        }
+
+        li {
+            font-size: 1rem;
+            padding-top: .15rem;
+            padding-bottom: .15rem;
+
+            > * {
+                font-size: 1rem;
+            }
+        }
+    }
+}

css/base_mixins.less

@@ -151,6 +151,10 @@
     font-size: .8rem;
     padding: 0;
     margin: 0 .2rem 0 .1rem;
+
+    * {
+        font-size: .8rem;
+    }
 }
 
 .btn-usertools-num () {
@@ -181,6 +185,15 @@
     }
 }
 
+.btn-prefix () {
+    .fontello();
+    .hide-text-show-before();
+
+    color: @color-nav;
+    font-size: 1rem;
+    margin-top: .2rem;
+}
+
 
 .btn-default-size() {
     height: 1rem;

css/plugins/do_tasks.less

@@ -4,30 +4,6 @@
 
 ul.page-attributes {
     .plugin__do_pagetasks {
-        @icon-size: 2em;
+        &.do_none { }
-
-        .btn-usertools-num ();
-
-        .prefix {
-            .fontello();
-            .hide-text-show-before();
-            .icon-clipboard();
-
-            font-size: .8rem;
-            min-height: @icon-size;
-            min-width: @icon-size;
-            color: @color-nav;
-            transition: @transition color;
-        }
-
-        &.do_none {
-            position: relative;
-            height: 1rem;
-            width: 1rem;
-            box-sizing: border-box;
-            border: 1px solid @color-border;
-            border-radius: @border-radius;
-            padding: 0 .2em;
-        }
     }
 }

css/plugins/magic-matcher.less

@@ -32,6 +32,27 @@
     }
 }
 
+/* + + + + +  in content  + + + + + */
+a.jiralink {
+    font-size: @font-size-default;
+
+    img {
+        float: left;
+        display: inline-block;
+        margin-top: 2px;
+        margin-right: 3px;
+    }
+
+    span.mm__status {
+        display: inline-block;
+        font-size: @font-size-default;
+        margin-left: 5px;
+        padding: 1px 4px;
+    }
+}
+
+
+/* + + + + +  no js version  + + + + + */
 .no-js {
     #dokuwiki_magic-matcher {
         display: none;

style.ini

@@ -69,6 +69,8 @@ css/area_nav-breadcrumb.less          = all
 css/area_nav-usertools.less           = all
 css/area_sidebar-search.less          = all
 css/area_nav-pagetools.less           = all
+css/area_main-sidebar.less            = all
+css/area_sidetools.less               = all
 
 
 ; _____________  plugin styles _____________