EH22/dokuwiki-template-sprintdoc-modified
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
# 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
Download patch file Download diff file Expand all files Collapse all files

2
css/area_nav-metabox.less
View file

@ -1,4 +1,4 @@
#meta-box {
#spr__meta-box {
position: relative;
z-index: 10;
float: right;

2
css/plugins/edit.less
View file

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

10
css/plugins/magic-matcher.less
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;
}
}

2
main.php
View file

@ -319,7 +319,7 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
</div>
<div id="dokuwiki__content" class="page main-content">
<div id="meta-box">
<div id="spr__meta-box">
<h6 class="sr-only" role="heading" aria-level="2"><?php echo tpl_getLang('head_meta_box') ?></h6>
<?php

2
tpl/nav-direct.php
View file

@ -2,7 +2,7 @@
if (!defined('DOKU_INC')) die();
?>
<div id="dokuwiki_direct" class="nav-direct no-print">
<div id="spr__direct" class="nav-direct no-print">
<div class="container">
<div class="row">
<div class="col-xs-12">

2
tpl/nav-magicmatcher.php
View file

@ -2,7 +2,7 @@
if (!defined('DOKU_INC')) die();
?>
<div id="dokuwiki_magic-matcher" class="magic-matcher no-print">
<div id="spr__magic-matcher" class="magic-matcher no-print">
<div class="container">
<?php
echo "<h6 class=\"sr-only\" role=\"heading\" aria-level=\"2\">".tpl_getLang('head_magic_matcher')."</h6>";

12
tpl/nav-meta-box.php
View file

@ -5,19 +5,19 @@
<div class="tab-container">
<ul class="meta-tabs">
<li><a href="#tab-toc" aria-expanded="false"><span class="prefix"><?php echo $lang['toc']?></span></a></li>
<li><a href="#tab-tags" aria-expanded="false"><span class="prefix">Tags <span class="num">0</span></span></a></li>
<li><a href="#tab-jira" aria-expanded="false"><span class="prefix">Jira <span class="num">0</span></span></a></li>
<li><a href="#spr__tab-toc" aria-expanded="false"><span class="prefix"><?php echo $lang['toc']?></span></a></li>
<li><a href="#spr__tab-tags" aria-expanded="false"><span class="prefix">Tags <span class="num">0</span></span></a></li>
<li><a href="#spr__tab-jira" aria-expanded="false"><span class="prefix">Jira <span class="num">0</span></span></a></li>
</ul>
<div class="meta-content">
<div class="box-content">
<div id="tab-toc" class="tab-pane" aria-hidden="true">
<div id="spr__tab-toc" class="tab-pane" aria-hidden="true">
<?php tpl_toc(); ?>
</div>
<div id="tab-tags" class="tab-pane" aria-hidden="true">
<div id="spr__tab-tags" class="tab-pane" aria-hidden="true">
<div>
<?php
if ($tags !== null) {
@ -29,7 +29,7 @@
</div>
</div>
<div id="tab-jira" class="tab-pane" aria-hidden="true">
<div id="spr__tab-jira" class="tab-pane" aria-hidden="true">
<div>
<p><?php echo tpl_getLang('meta_box_jira_tickets_none') ?></p>
</div>