From b75c756b49b30e9a1267bec26d1a72d9e8c86c09 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <daisho7308+f@gmail.com>
Date: Sun, 24 Sep 2023 21:03:39 +0900
Subject: [PATCH] (fix) iroiro

---
 components/content/Fukidashi.vue | 2 +-
 components/docs/PrevNext.vue     | 8 ++++----
 layouts/docs.vue                 | 3 +++
 nuxt.config.ts                   | 1 +
 package.json                     | 2 +-
 pages/docs/[...slug].vue         | 6 +++++-
 pnpm-lock.yaml                   | 8 ++++----
 7 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/components/content/Fukidashi.vue b/components/content/Fukidashi.vue
index 00d1a769..1f4a6486 100644
--- a/components/content/Fukidashi.vue
+++ b/components/content/Fukidashi.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="flex gap-4 mb-4" :class="direction">
         <div class="flex-shrink-0" :class="direction === 'right' && 'order-2'">
-            <div class="w-20 h-20 rounded-full bg-slate-100 dark:bg-slate-800 border-[3px] border-slate-300 dark:border-slate-500">
+            <div class="w-14 h-14 rounded-full bg-slate-100 dark:bg-slate-800 border-[3px] border-slate-300 dark:border-slate-500">
                 <img :src="`/img/docs/fukidashi/${chara}.webp`" :class="direction === 'left' && '-scale-x-100'" class="w-full h-full rounded-full object-cover" />
             </div>
             <div v-if="charaName" class="mt-1 text-sm text-center">{{ charaName }}</div>
diff --git a/components/docs/PrevNext.vue b/components/docs/PrevNext.vue
index a8a4d4e2..90c69b3e 100644
--- a/components/docs/PrevNext.vue
+++ b/components/docs/PrevNext.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="flex flex-col lg:flex-row justify-between items-center">
 		<div class="order-2 mt-4 lg:mt-0 lg:order-1 w-full lg:w-2/5">
-			<GNuxtLink v-if="prev && (ignoreDirBasedNav || prev._path.includes(currentDirectory))" :to="prev._path" class="rounded-lg transition-colors p-4 border dark:border-slate-800 hover:bg-slate-200 dark:hover:bg-slate-800 text-start flex justify-start items-center">
+			<GNuxtLink v-if="prev && prev._path.includes(currentDirectory)" :to="prev._path" class="rounded-lg transition-colors p-4 border dark:border-slate-800 hover:bg-slate-200 dark:hover:bg-slate-800 text-start flex justify-start items-center">
 				<div class="mr-3"><LeftIco /></div>
 				<div>
 					<div class="mb-1 text-sm">{{ $t('_docs._prevNext.prev') }}</div>
@@ -10,7 +10,7 @@
 			</GNuxtLink>
 		</div>
 		<div class="order-1 lg:order-2 w-full lg:w-2/5">
-			<GNuxtLink v-if="next && (ignoreDirBasedNav || next._path.includes(currentDirectory))" :to="next._path" class="rounded-lg transition-colors p-4 border dark:border-slate-800 hover:bg-slate-200 dark:hover:bg-slate-800 text-end flex justify-end items-center">
+			<GNuxtLink v-if="next && next._path.includes(currentDirectory)" :to="next._path" class="rounded-lg transition-colors p-4 border dark:border-slate-800 hover:bg-slate-200 dark:hover:bg-slate-800 text-end flex justify-end items-center">
 				<div>
 					<div class="mb-1 text-sm">{{ $t('_docs._prevNext.next') }}</div>
 					<div class="font-bold text-lg">{{ next.title }}</div>
@@ -38,9 +38,9 @@ const props = withDefaults(defineProps<{
 });
 
 const currentPath = `/${locale.value}/docs/${slugs.join('/')}`;
-const currentDirectory = props.isDir ? `/${locale.value}/docs/${slugs.join('/')}` : `/${locale.value}/docs/${slugs.slice(0, -1).join('/')}`;
+const currentDirectory = props.ignoreDirBasedNav ? `/${locale.value}/docs/` : props.isDir ? `/${locale.value}/docs/${slugs.join('/')}` : `/${locale.value}/docs/${slugs.slice(0, -1).join('/')}`;
 
-const [prev, next] = await queryContent().only(['_path', 'title']).where({ _path: { $contains: 'docs' }, _partial: false }).findSurround(currentPath);
+const [prev, next] = await queryContent().where({ _partial: { $eq: false } }).findSurround(currentPath);
 </script>
 
 <style scoped>
diff --git a/layouts/docs.vue b/layouts/docs.vue
index 0a9afa4e..8f672d36 100644
--- a/layouts/docs.vue
+++ b/layouts/docs.vue
@@ -29,6 +29,9 @@ const { data: navigation } = await useAsyncData('navigation', () => fetchContent
 </template>
 
 <style scoped>
+.docs-root {
+    grid-template-columns: 1fr;
+}
 @screen lg {
     .docs-root {
         grid-template-columns: 16rem 1fr;
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 480d05c0..986e0e57 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -51,6 +51,7 @@ export default defineNuxtConfig({
 			]
 		},
 		highlight: {
+			preload: ['ini', ],
 			theme: {
 				// Default theme (same as single string)
 				default: 'github-light',
diff --git a/package.json b/package.json
index e4dd9bbf..6e797f88 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@babel/parser": "^7.22.16",
     "@modyfi/vite-plugin-yaml": "^1.0.4",
-    "@nuxt/content": "^2.8.0",
+    "@nuxt/content": "npm:@nuxt/content-edge@2.8.2-28233414.6d70135",
     "@nuxtjs/color-mode": "^3.3.0",
     "@nuxtjs/i18n": "8.0.0-beta.13",
     "@types/js-yaml": "^4.0.5",
diff --git a/pages/docs/[...slug].vue b/pages/docs/[...slug].vue
index 2deeb36e..411cfded 100644
--- a/pages/docs/[...slug].vue
+++ b/pages/docs/[...slug].vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="lg:grid docs-main">
+    <div class="grid docs-main">
         <div v-if="data?.body" class="lg:hidden sticky top-16 -mx-6 -mt-6 bg-white px-6 bg-opacity-60 backdrop-blur-lg z-[9890] border-b text-sm">
             <details :open="openState">
                 <summary class="py-4 cursor-pointer">
@@ -61,6 +61,10 @@ route.meta.title = data.value?.title;
 </script>
 
 <style scoped>
+.docs-main {
+    grid-template-columns: 1fr;
+}
+
 @screen lg {
     .docs-main {
         grid-template-columns: 1fr 14rem;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 11c38893..4f047713 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -17,8 +17,8 @@ devDependencies:
     specifier: ^1.0.4
     version: 1.0.4(vite@4.4.9)
   '@nuxt/content':
-    specifier: ^2.8.0
-    version: 2.8.2(vue@3.3.4)
+    specifier: npm:@nuxt/content-edge@2.8.2-28233414.6d70135
+    version: /@nuxt/content-edge@2.8.2-28233414.6d70135(vue@3.3.4)
   '@nuxtjs/color-mode':
     specifier: ^3.3.0
     version: 3.3.0
@@ -1092,8 +1092,8 @@ packages:
       fastq: 1.15.0
     dev: true
 
-  /@nuxt/content@2.8.2(vue@3.3.4):
-    resolution: {integrity: sha512-fi5/axuYNGccJ/dXyaf5C/WqgEd5wSijpGHZ9O+pH7754S2NeKyx8fUFGfXsLN9VyJP+Mx8EUihfWKJm09SCRA==}
+  /@nuxt/content-edge@2.8.2-28233414.6d70135(vue@3.3.4):
+    resolution: {integrity: sha512-JBhIByJpVsIi/NJnNrNjiEWygP81K1CMaqOdhmSnPukYE+Mawp6CeYEsm2baYXKsLISAUDsC9h17JAxdVOJCRA==}
     dependencies:
       '@nuxt/kit': 3.7.3
       '@nuxtjs/mdc': 0.1.6