diff --git a/resources/assets/stylesheets/scss/contentbar.scss b/resources/assets/stylesheets/scss/contentbar.scss index 1322097ba746788b570950e6a24ac50985d31ad6..a7df7f734d07fe03e5b85c51c23847d25b62e3a8 100644 --- a/resources/assets/stylesheets/scss/contentbar.scss +++ b/resources/assets/stylesheets/scss/contentbar.scss @@ -2,7 +2,7 @@ background-color: var(--dark-gray-color-5); border: solid thin var(--dark-gray-color-30); display: flex; - flex-wrap: wrap; + flex-wrap: nowrap; height: auto; justify-content: flex-start; margin-bottom: 15px; @@ -70,10 +70,15 @@ } .contentbar-wrapper-right { + align-items: center; display: flex; justify-content: flex-end; position: relative; + .contentbar-info { + flex: 0 1 auto; + } + .contentbar-button-wrapper { height: 24px; margin: 0 7px; diff --git a/templates/contentbar/contentbar.php b/templates/contentbar/contentbar.php index a6e51a37b9d6d729a7a88ca63f8a5a9c91bb1f3f..fef7fd8c0f4bc46fc0bc563d6956ce148757fdda 100644 --- a/templates/contentbar/contentbar.php +++ b/templates/contentbar/contentbar.php @@ -1,19 +1,32 @@ +<?php +/** + * @var TOCItem $toc + * @var Icon $icon + * @var Flexi_Template $breadcrumbs + * @var string $info + * @var ActionMenu $actionMenu + * @var Flexi_Template $ttpl + */ +?> <section> <header class="contentbar"> <nav class="contentbar-nav"></nav> <div class="contentbar-wrapper-left"> <nav class="contentbar-breadcrumb"> - <? if (!$toc->isActive()) : ?> + <? if (!$toc->isActive()) : ?> <a href="<?= $toc->getUrl() ?>" title="<?= htmlReady($toc->getTitle()) ?>" class="contentbar-icon"> - <? endif ?> + <? endif ?> <?= $icon->asImg(24, ['class' => 'text-bottom']) ?> - <? if (!$toc->isActive()) : ?> + <? if (!$toc->isActive()) : ?> </a> <? endif ?> <?= $breadcrumbs->render() ?> </nav> </div> <div class="contentbar-wrapper-right"> + <? if (trim($info)): ?> + <div class="contentbar-info"><?= $info ?></div> + <? endif; ?> <? if ($toc->hasChildren()) : ?> <div class="contentbar-button-wrapper contentbar-toc-wrapper"> <input type="checkbox" id="cb-toc">