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

# Conflicts:
#	css/plugins/edit.less
This commit is contained in:
Silke Pisulla 2017-02-14 09:26:02 +01:00
commit e1a580f40a
7 changed files with 16 additions and 16 deletions

View file

@ -44,7 +44,7 @@
clear: both;
}
#meta-box {
#spr__meta-box {
display: none;
}
}

View file

@ -6,7 +6,7 @@
/* + + + + + + + + + + + + + + + + + + + + + + + */
/* magic matcher bar with form on top of page */
#dokuwiki_magic-matcher {
#spr__magic-matcher {
position: fixed;
top: 0;
left: 0;
@ -98,7 +98,7 @@ a.jiralink {
/* + + + + + no js version + + + + + */
.no-js {
#dokuwiki_magic-matcher {
#spr__magic-matcher {
display: none;
}
}
@ -108,7 +108,7 @@ a.jiralink {
/* max-width: 1023px */
@media @screen_max-lg {
#dokuwiki_magic-matcher {
#spr__magic-matcher {
#magicmatcher__context {
.chosen-container-single {
width: 20% !important;
@ -122,7 +122,7 @@ a.jiralink {
}
@media @screen_max-md {
#dokuwiki_magic-matcher {
#spr__magic-matcher {
position: relative;
.container {
@ -142,7 +142,7 @@ a.jiralink {
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
@media print {
#dokuwiki_magic-matcher {
#spr__magic-matcher {
display: none;
}
}