Merge branch 'main' into sonar
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<div class="mx-auto px-4 h-14 z-50">
|
||||
<div id='header.vue' class="mx-auto px-4 h-14 z-50">
|
||||
<div class="flex justify-between items-center h-full">
|
||||
<figure>
|
||||
<DspLogo />
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<template>
|
||||
<nav class="bg-neutral-700">
|
||||
<nav id='nav_bar' class="bg-neutral-700">
|
||||
<div class="mx-auto px-4" :class="[showNavbarBreadcrumb? 'min-h-12': 'h-12']">
|
||||
<div class="flex justify-between items-center flex-wrap relative" v-show="showNavbarBreadcrumb">
|
||||
<div id="nav_bar" class="flex flex-1 items-center">
|
||||
<div id="nav_bar_logged_in" class="flex flex-1 items-center">
|
||||
<!-- 回 Files 頁 -->
|
||||
<router-link to="/files" class="mr-4" v-if="showIcon" id="backPage">
|
||||
<span class="material-symbols-outlined text-neutral-10 !leading-loose">
|
||||
@@ -39,7 +39,7 @@
|
||||
Save
|
||||
</button>
|
||||
</div>
|
||||
<AcctMenu/>
|
||||
<AcctMenu v-if="showNavbarBreadcrumb"/>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<header>
|
||||
<header id="authcontainer_header_navbar_container">
|
||||
<Header />
|
||||
<Navbar />
|
||||
</header>
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
<template>
|
||||
<ModalContainer/>
|
||||
<header class="sticky inset-x-0 top-0 w-full bg-neutral-10 z-10">
|
||||
<header id='header_inside_maincontainer' class="sticky inset-x-0 top-0 w-full bg-neutral-10 z-10">
|
||||
<Header/>
|
||||
<Navbar/>
|
||||
</header>
|
||||
<main class="w-full">
|
||||
<main id='loading_and_router_view_container_in_maincontainer' class="w-full">
|
||||
<Loading v-if="loadingStore.isLoading" />
|
||||
<router-view></router-view>
|
||||
</main>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<header>
|
||||
<header id="notfound_404">
|
||||
<Header/>
|
||||
<Navbar/>
|
||||
</header>
|
||||
|
||||
Reference in New Issue
Block a user