Merge branch 'master' into sidebar

* master:
  show license not copyright SPR-794
  use proper translation mechanism for JS SPR-798
  added type ints for other plugins
  SPR-797 fix ID uniqueness
This commit is contained in:
Andreas Gohr 2017-02-14 11:21:52 +01:00
commit eaccab8168
17 changed files with 31 additions and 137 deletions

View file

@ -1,4 +1,4 @@
#meta-box {
#spr__meta-box {
position: relative;
z-index: 10;
display: inline-block;

View file

@ -36,7 +36,7 @@
margin-bottom: 1.5rem;
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;
}
}