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

# Conflicts:
#	css/plugins/do_tasks.less
This commit is contained in:
Silke Pisulla 2017-05-11 15:18:51 +02:00
commit 4a2396d1fd
17 changed files with 194 additions and 27 deletions

View file

@ -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

View file

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

View file

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

View file

@ -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;