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