merge develop into main issues #9 list #64

Merged
jorge merged 17 commits from develop into main 2022-04-27 14:50:50 +02:00
3 changed files with 3 additions and 3 deletions
Showing only changes of commit a93513ff0c - Show all commits

File diff suppressed because one or more lines are too long

View File

@ -145,7 +145,7 @@
background-color: scale-color($white, $alpha: 90%); background-color: scale-color($white, $alpha: 90%);
} }
&.is-at-top { &.is-at-top {
margin-top: 0; margin-top: 0 !important;
} }
} }
} }

View File

@ -64,7 +64,7 @@ if ($activePage):
<?php if ($activePage): ?> <?php if ($activePage): ?>
<?php if ($this->displayNavigation && $activePage['page']->hasPages()): ?> <?php if ($this->displayNavigation && $activePage['page']->hasPages()): ?>
<nav class="sub-menu wide" data-sticky-container> <nav class="sub-menu wide" data-sticky-container>
<div class="sticky" data-sticky data-anchor="blocks"> <div class="no-sticky" no-data-sticky no-data-anchor="blocks">
<?php echo $nav->menu()->setUlClass('horizontal menu')->renderSubMenu(); ?> <?php echo $nav->menu()->setUlClass('horizontal menu')->renderSubMenu(); ?>
</div> </div>
</nav> </nav>