Skip to content

Commit

Permalink
refactor: remove NuxtLayout
Browse files Browse the repository at this point in the history
Signed-off-by: ZTL-UwU <[email protected]>
  • Loading branch information
ZTL-UwU committed May 30, 2024
1 parent 67dc752 commit 5a0dc5e
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 15 deletions.
4 changes: 1 addition & 3 deletions app.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<template>
<NuxtLoadingIndicator :color="false" class="z-100 bg-primary" />
<NuxtLayout>
<NuxtPage />
</NuxtLayout>
<NuxtPage />
</template>
8 changes: 4 additions & 4 deletions components/content/Badge.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ const props = withDefaults(defineProps<{
const typeTwClass = {
default: '',
info: `${props.variant !== 'outline' && 'bg-sky-500 hover:bg-sky-600'} ${props.variant === 'outline' && 'border-sky-500 text-sky-500'}`,
warning: `${props.variant !== 'outline' && 'bg-amber-500 hover:bg-amber-600'} ${props.variant === 'outline' && 'border-amber-500 text-amber-500'}`,
success: `${props.variant !== 'outline' && 'bg-green-500 hover:bg-green-600'} ${props.variant === 'outline' && 'border-green-500 text-green-500'}`,
danger: `${props.variant !== 'outline' && 'bg-red-500 hover:bg-red-600'} ${props.variant === 'outline' && 'border-red-500 text-red-500'}`,
info: `${props.variant !== 'outline' && 'bg-sky-500 hover:bg-sky-400'} ${props.variant === 'outline' && 'border-sky-500 text-sky-500'}`,
warning: `${props.variant !== 'outline' && 'bg-amber-500 hover:bg-amber-400'} ${props.variant === 'outline' && 'border-amber-500 text-amber-500'}`,
success: `${props.variant !== 'outline' && 'bg-green-500 hover:bg-green-400'} ${props.variant === 'outline' && 'border-green-500 text-green-500'}`,
danger: `${props.variant !== 'outline' && 'bg-red-500 hover:bg-red-400'} ${props.variant === 'outline' && 'border-red-500 text-red-500'}`,
};
</script>
7 changes: 0 additions & 7 deletions layouts/default.vue

This file was deleted.

4 changes: 3 additions & 1 deletion pages/[...slug].vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<template>
<div class="border-b">
<LayoutHeader />
<div class="border-b min-h-screen">
<div class="container px-4 md:px-8 flex-1 items-start md:grid md:grid-cols-[220px_minmax(0,1fr)] md:gap-6 lg:grid-cols-[240px_minmax(0,1fr)] lg:gap-10">
<aside class="fixed top-[102px] lg:top-[60px] z-30 -ml-2 hidden h-[calc(100vh-3.5rem)] w-full shrink-0 md:sticky md:block overflow-y-auto">
<LayoutAside :is-mobile="false" />
Expand Down Expand Up @@ -42,6 +43,7 @@
</main>
</div>
</div>
<LayoutFooter />
</template>

<script setup lang="ts">
Expand Down
2 changes: 2 additions & 0 deletions pages/index.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<template>
<LayoutHeader />
<div class="container px-4 md:px-8 py-6">
<ContentRenderer
:key="page._id"
:value="page"
/>
</div>
<LayoutFooter />
</template>

<script setup lang="ts">
Expand Down

0 comments on commit 5a0dc5e

Please sign in to comment.