Merge branch 'master' into cis40_2026-09_ma_rc

This commit is contained in:
Harald Bamberger
2026-10-01 12:43:17 +02:00
4 changed files with 32 additions and 14 deletions
+17 -1
View File
@@ -853,4 +853,20 @@ html {
border: 1px solid rgba(0, 0, 0, 0.15);
border-radius: 0.5rem;
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.25);
}
}
.cis-main-menu {
max-width: 100vw;
}
.cis-main-menu ul {
list-style: none;
margin: 0;
padding: 0;
}
.cis-main-menu ul li {
margin: 0;
padding: 0;
width: 100%;
}
+1 -1
View File
@@ -318,7 +318,7 @@ export default {
</div>
</div>
<nav id="nav-main" class="offcanvas offcanvas-start" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
<nav id="nav-main" class="cis-main-menu offcanvas offcanvas-start" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
<div id="nav-main-sticky">
<div class="d-flex flex-row h-100">
<div class="offcanvas-body p-0">
+12 -10
View File
@@ -183,16 +183,18 @@ export default {
</button>
</div>
<ul v-if="hasChilds" ref="children" class="nav w-100 collapse" >
<cis-menu-entry
v-for="child in entry.childs"
:key="child"
:highestMatchingUrlCount="highestMatchingUrlCount"
:activeContent="activeContent"
:entry="child"
:level="level + 1"
:openMenuHierarchy="$props.openMenuHierarchy.slice(1)"
:precedingMenuHierarchy="menuHierarchy"
/>
<li>
<cis-menu-entry
v-for="child in entry.childs"
:key="child"
:highestMatchingUrlCount="highestMatchingUrlCount"
:activeContent="activeContent"
:entry="child"
:level="level + 1"
:openMenuHierarchy="$props.openMenuHierarchy.slice(1)"
:precedingMenuHierarchy="menuHierarchy"
/>
</li>
</ul>
</template>`
};
+2 -2
View File
@@ -40,10 +40,10 @@ export default {
}
},
template: `
<router-link v-if="resolvedRoute !== null" :to="resolvedRoute">
<router-link v-if="resolvedRoute !== null" :to="resolvedRoute" draggable="false">
<slot></slot>
</router-link>
<a v-else :href="href">
<a v-else :href="href" draggable="false">
<slot></slot>
</a>
`