Merge branch 'main' into feature/vue3-modals-with-router-4
# Conflicts: # src/router/index.ts # src/views/tasks/TaskDetailView.vue
This commit is contained in:
commit
e2d9aa3d7f
62 changed files with 1180 additions and 1107 deletions
|
|
@ -9,7 +9,7 @@
|
|||
class="app-container"
|
||||
>
|
||||
<navigation/>
|
||||
<div
|
||||
<main
|
||||
:class="[
|
||||
{ 'is-menu-enabled': menuActive },
|
||||
$route.name,
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
>
|
||||
<icon icon="keyboard"/>
|
||||
</a>
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
|||
Reference in a new issue