Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master

# Conflicts:
#	css/plugins/do_tasks.less

css/area_content.less

@@ -10,14 +10,12 @@
 
         #dokuwiki__content {
             position: relative;
-            z-index: 10;
 
             &::before {
                 content: '';
                 position: absolute;
                 top: 0;
                 left: 0;
-                z-index: -1;
                 height: @page-header_height;
                 box-sizing: border-box;
                 width: 100%;

css/area_footer.less

@@ -38,9 +38,9 @@
     #dokuwiki__footer {
         .main-footer {
             position: relative;
-            z-index: 2;
             box-sizing: border-box;
             background-color: @ini_background_site;
+            margin-top: 5px; // for box-shadow of content
         }
 
         p {

css/area_header.less

@@ -136,7 +136,6 @@
 /* + + +  mobile nav togglelink  + + + */
     .menu-togglelink {
         position: relative;
-        z-index: 1;
         margin: @headericons-margin-xxs -(@very-small-spacing) 0 0;
 
         a {

css/area_main-content-secedit.less

@@ -6,7 +6,6 @@
 #dokuwiki__content.main-content {
     .secedit:not([class*="plugin"]):not([class*="table"]) {
         position: relative;
-        z-index: 2;
         top: 0;
         float: right;
         margin-top: 0; // for best position of edit-tab beneeth table

css/area_main-sidebar-nav.less

@@ -125,7 +125,6 @@
             &:focus,
             &:active {
                 position: relative; // always show label, even with collapsed sidebar
-                z-index: 100;
                 width: 100%;
                 background-color: @ini_nav_menu_hover_bg;
                 border-color: @ini_nav_menu_hover_color;
@@ -323,7 +322,6 @@
             display: block !important;
             position: absolute;
             left: 1.25rem; // left margin of content container
-            z-index: 200; // above all
             box-shadow: @box-shadow-right-bottom;
             min-width: 45%;
             max-width: 90%;
@@ -332,7 +330,6 @@
 
             > nav {
                 position: relative;
-                z-index: 2;
 
                 &:first-child {
                     margin-top: 1.2rem;

css/area_main-sidebar-search.less

@@ -191,7 +191,6 @@
         .search.main-sidebar {
             p.toggleSearch {
                 position: relative;
-                z-index: 1;
                 display: block;
                 float: left;
                 width: auto;
@@ -233,7 +232,6 @@
         .search.main-sidebar {
             display: block !important;
             position: relative;
-            z-index: 1;
             margin-left: -1px;
             margin-right: -1px;
 

css/area_nav-metabox.less

@@ -12,7 +12,6 @@
     .justify-content(flex-end);
 
     position: relative;
-    z-index: 10;
     float: right;
     max-width: 40%;
     margin-top: -(@page_padding-top); // reverse padding-top of .page container
@@ -158,7 +157,6 @@
             }
 
             &.active {
-                z-index: 1;
 
                 > a {
                     cursor: default;
@@ -306,7 +304,7 @@
         ul.mmissuelist {
             padding-left: 0;
             margin-top: 1rem;
-        
+
             li {
                 &.noissue {
                     list-style-type: none;

css/area_nav-pagetools.less

@@ -32,7 +32,6 @@ nav#dokuwiki__pagetools {
     @toolbox-size: 30px;
 
     top: 3.05rem;
-    z-index: 100;
 
     @media @screen_min-md {
         right: -2.5rem;

css/area_togglelink.less

@@ -12,7 +12,6 @@
         bottom: -1px;
         width: 2rem;
         left: -(@margin-default);
-        z-index: 1;
 
         @media @screen_max-md {
             display: none;

css/base_structure.less

@@ -63,16 +63,68 @@
     }
 }
 
-/* + + + + +  z-indeces  + + + + + */
+/* + + + + +  z-indices  + + + + + */
-@media @screen_min-md {
+@media screen {
     .nav-direct p {
-        z-index: 1000;
+        z-index: 1000; // keyboard-navigation overlays always on top
     }
 
     .top-header {
-        z-index: 900;
+        z-index: 2; // put MagicMatcher-Dropdowns above .content and metabox-tabs
     }
 
+    #dokuwiki__aside div.nav a {
+        &:hover, &:focus, &:active {
+            z-index: 100; // show label/link above content on hover etc.
+        }
+    }
+
+    #spr__meta-box {
+        z-index: 1; // put meta-box above positioned content-elements such as aggregations, edit-buttons
+        ul.meta-tabs > li.active {
+            z-index: 1; // put the active tab above the meta-content in .tab-pane.active
+        }
+    }
+
+    nav#dokuwiki__pagetools {
+        z-index: 100; // put labels of the pagetools above content on hover etc.
+    }
+
+    #dokuwiki__detail .img-link a::before {
+        z-index: 2; // put 'view original file'-overlay above image
+    }
+
+    /* plug-in do_tasks */
+    .plugin__do_usertasks_list {
+        z-index: 200; // put tasks-list above pagetools
+    }
+
+    /* plug-in editable */
+    #dokuwiki__content.main-content div.editbutton_table {
+        z-index: 1; // for IE
+    }
+
+    /* plug-in tabinclude */
+    div#dwpl-ti-container li.dwpl-ti-tab div.selected {
+        z-index: 1; // put .slected tab above div.dwpl-ti-content-box
+    }
+}
+
+@media @screen_min-md {
+    .wide-content .search.main-sidebar p.toggleSearch {
+        z-index: 1; // put search-toggle-button above #dw__search
+    }
+}
+
+@media @screen_max-md {
+    body.show-mobile-sidebar #dokuwiki__aside {
+            z-index: 200; // mobile sidebar above all except nav-direct
+    }
+}
+/* + + + + +  end of z-indices  + + + + + */
+
+@media @screen_min-md {
+
     .content .row > .col-xs-12 {
         border-radius: 0 @ini_default_border_radius @fix_border-radius @fix_border-radius; // @ini_default_border_radius vs. @fix_border-radius
     }

css/plugins/edittable.less

@@ -8,7 +8,6 @@
 #dokuwiki__content.main-content {
     div.editbutton_table {
         position: relative; // for IE
-        z-index: 1; // for IE
         float: left;
         margin-top: -1.4em !important; // overwrite inline stales
 

css/plugins/magic-matcher.less

@@ -47,7 +47,6 @@
 
     #magicmatcher__context {
         position: relative;
-        z-index: 100;
         width: 100%;
         min-height: @height-context-bar;
         box-sizing: border-box;

css/plugins/struct.less

@@ -101,7 +101,6 @@
 /* + + + + +  struct inline-editor  + + + + + */
 .dokuwiki {
     .struct_inlineditor {
-        z-index: 3;
         box-shadow: @box-shadow-bottom;
 
         p.hint {

css/plugins/tabinclude.less

@@ -34,7 +34,6 @@ div#dwpl-ti-container {
 
             &.selected {
                 position: relative;
-                z-index: 1;
                 background-color: @ini_background;
                 color: @ini_text;
             }
@@ -45,7 +44,6 @@ div#dwpl-ti-container {
 /* + + +  content box  + + + */
     div.dwpl-ti-content-box {
         position: relative;
-        z-index: 0;
         overflow: auto;
         box-shadow: @box-shadow;
         background-color: @ini_background;

css/print.less

@@ -4,3 +4,138 @@
  * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 
+@color-print: #000;
+@background-print: transparent;
+@border-color-print: #ccc;
+html, body {
+    background: @background-print;
+}
+
+a:link, a:visited {
+    text-decoration: underline;
+    color: @color-print  !important;
+    background: @background-print  !important;
+}
+
+#spr__direct,
+.top-header,
+.main-footer,
+.menu-togglelink,
+.main-title.desktop-only,
+#spr__meta-box,
+.content .row > .col-xs-12 #dokuwiki__content::before,
+.page-wrapper > .tools,
+.breadcrumbs {
+    display: none !important;
+}
+
+.content .row > .col-xs-12 {
+    box-shadow: none;
+}
+
+.dokuwiki div.page,
+.main-sidebar.claim,
+.page-footer{
+    padding: 20pt 20pt 0;
+}
+
+/* admin  */
+
+// Extension Manager
+#extension__manager {
+    form.search {
+        margin-bottom: 20pt;
+        display: inline-block;
+    }
+}
+
+#extension__list {
+    .extensionList {
+        padding: 0;
+        border-bottom: 1pt solid @border-color-print;
+
+        li {
+            border-top: 1pt solid @border-color-print;
+            margin-left: 0;
+
+            list-style-type: none;
+            &::after {
+                display: table;
+                content: ' ';
+                clear: both;
+                height: 10pt;
+            }
+
+            a.info,
+            .actions.col{
+                display: none;
+            }
+
+            .screenshot {
+                float: left;
+                margin: 0 10pt 5pt 0;
+                border: 1pt solid @border-color-print;
+            }
+        }
+    }
+}
+
+
+
+// Configuration Settings
+#dokuwiki__content #config__manager td.label {
+
+}
+
+
+.do-admin div.ui-admin ul.admin_tasks,
+.do-admin div.ui-admin ul.admin_plugins{
+    li {
+        list-style-type: none;
+        min-height: 2em;
+
+        a {
+            span.icon {
+                width: 22pt;
+                height: 22pt;
+                border: 1pt solid @border-color-print;
+                display: inline-block;
+                float: left;
+                clear: left;
+                margin: 0 10pt 0 0;
+
+                &:empty {
+                    &:before {
+                        content: "?";
+                        display: inline-block;
+                        padding-top: 1pt;
+                    }
+                }
+
+                svg {
+                    width: 20pt;
+                    height: 20pt;
+                    path {
+                        fill: @color-print;
+                    }
+
+                }
+            }
+            span.prompt {
+                min-height: 26pt;
+                display: inline-block;
+                margin: 0;
+                padding-top: 4pt;
+            }
+        }
+
+    }
+
+}
+
+/*Template Style Settings*/
+#plugin__styling {
+    button {
+        display: none !important;
+    }
+}

css/template_detail.less

@@ -24,7 +24,6 @@
                 position: absolute;
                 top: 0;
                 left: 0;
-                z-index: 2;
                 display: block;
                 width: 100%;
                 box-sizing: border-box;
@@ -38,7 +37,6 @@
                 display: block;
                 border: 1px dotted @ini_background_site;
                 position: relative;
-                z-index: 1;
             }
 
             &:hover,

style.ini

@@ -112,7 +112,7 @@ css/plugins/data.less                 = all
 
 ; _____________  print styles  _____________
 
-css/print.css                         = print
+css/print.less                        = print