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

This commit is contained in:
Silke Pisulla 2017-01-10 09:57:49 +01:00
commit ca5760c2ba
3 changed files with 5 additions and 4 deletions

View file

@ -164,7 +164,7 @@
.content { .content {
.row > .col-xs-12{ .row > .col-xs-12{
width: auto; width: auto;
float: right; float: none;
} }
} }
&.showSidebar{ &.showSidebar{

View file

@ -4,10 +4,10 @@
$elem.wrapInner('<a href="#toggleMenu" class="toggler"></a>'); $elem.wrapInner('<a href="#toggleMenu" class="toggler"></a>');
}, },
setWideContent = function(){ setWideContent = function(){
$('body').addClass('wide-content');
}, },
setDefaultContent= function(){ setDefaultContent= function(){
$('body').removeClass('wide-content');
}, },
toggleState = function($toggler){ toggleState = function($toggler){
$toggler.toggleClass('closed'); $toggler.toggleClass('closed');

View file

@ -83,8 +83,9 @@ $showSidebar = true; /* */
/* #dokuwiki__top used as anchor for "back to top" button/link links */ /* #dokuwiki__top used as anchor for "back to top" button/link links */
$classWideContent = ($ACT === "show") ? "": "wide-content ";
?> ?>
<body id="dokuwiki__top" class="<?php echo tpl_classes(); ?> <?php echo ($ACT) ? 'do-'.$ACT : 'do-none'; ?> <?php echo ($showSidebar) ? 'showSidebar' : ''; ?>"> <body id="dokuwiki__top" class="<?php echo tpl_classes(); ?> <?php echo ($ACT) ? 'do-'.$ACT : 'do-none'; ?> <?php echo $classWideContent; ?><?php echo ($showSidebar) ? 'showSidebar' : ''; ?>">
<div id="dokuwiki__site"> <div id="dokuwiki__site">
<?php <?php