docs(en): merging all conflicts

Author: docschina-bot

.vitepress/config.ts

@@ -30,8 +30,25 @@ const Guide: DefaultTheme.NavItemWithLink[] = [
     link: '/guide/animations',
   },
   {
+<<<<<<< HEAD
     text: 'Εξαγωγή',
     link: '/guide/exporting',
+=======
+    text: 'Draggable Elements',
+    link: '/guide/draggable',
+  },
+  {
+    text: 'Presenter Mode',
+    link: '/guide/presenter-mode',
+  },
+  {
+    text: 'Slides Overview',
+    link: '/guide/overview',
+  },
+  {
+    text: 'Drawing & Annotations',
+    link: '/guide/drawing',
+>>>>>>> 21fdadc17cd2018f65c637e5727de640db5036e3
   },
   {
     text: 'Στατική Φιλοξενία',
@@ -142,9 +159,25 @@ const Customizations: (DefaultTheme.NavItemWithLink | DefaultTheme.NavItemChildr
     link: '/custom/config-parser',
   },
   {
+<<<<<<< HEAD
     text: 'Ρυθμίστε Συντομεύσεις',
+=======
+    text: 'Configure Routes',
+    link: '/custom/config-routes',
+  },
+  {
+    text: 'Configure Shortcuts',
+>>>>>>> 21fdadc17cd2018f65c637e5727de640db5036e3
     link: '/custom/config-shortcuts',
   },
+  {
+    text: 'Configure Code Runners',
+    link: '/custom/config-code-runners',
+  },
+  {
+    text: 'Configure Context Menu',
+    link: '/custom/config-context-menu',
+  },
   {
     text: 'Vue Global Context',
     link: '/custom/vue-context',
@@ -191,6 +224,10 @@ const slidebars: DefaultTheme.SidebarItem[] = [
     text: 'Ενσωματωμένα',
     items: BuiltIn,
   },
+  {
+    text: 'Resources',
+    items: Resources,
+  },
 ]
 
 export default defineConfig({
@@ -230,8 +267,13 @@ export default defineConfig({
   themeConfig: {
     logo: '/logo.svg',
     editLink: {
+<<<<<<< HEAD
       pattern: 'https://github.com/slidevjs/docs-el/edit/main/:path',
       text: 'Προτείνετε αλλαγές σε αυτή τη σελίδα',
+=======
+      pattern: 'https://github.com/slidevjs/slidev/edit/main/docs/:path',
+      text: 'Suggest changes to this page',
+>>>>>>> 21fdadc17cd2018f65c637e5727de640db5036e3
     },
 
     search: {

.vitepress/showcases.ts

@@ -20,8 +20,8 @@ export const showcases: ShowCaseInfo[] = [
       name: 'Anthony Fu',
       link: 'https://github.com/antfu',
     },
-    slidesLink: 'https://sli.dev/demo/composable-vue',
-    sourceLink: 'https://github.com/antfu/talks/tree/master/2021-04-29',
+    slidesLink: 'https://talks.antfu.me/2021/composable-vue/',
+    sourceLink: 'https://github.com/antfu/talks/tree/main/2021-04-29',
     at: 'VueDay 2021',
     datetime: '2021-04-29',
   },
@@ -49,29 +49,29 @@ export const showcases: ShowCaseInfo[] = [
     at: 'Enter.js Vue Day',
     datetime: '2021-06-15',
   },
-  {
-    title: 'Simply Publish Your Package to npm',
-    author: {
-      name: 'Lucky Dewa Satria',
-      link: 'https://github.com/lucky401',
-    },
-    at: 'Weekly sharing',
-    slidesLink: 'https://masukin.link/talks/simply-publish-your-package-to-npm',
-    cover: 'https://masukin.link/talks-cover-npm.png',
-    datetime: '2021-06-12',
-  },
-  {
-    title: 'Create Icon Package With Vue and Rollup',
-    author: {
-      name: 'Lucky Dewa Satria',
-      link: 'https://github.com/lucky401',
-    },
-    at: 'Weekly Sharing',
-    slidesLink: 'https://masukin.link/talks/create-icon-package-with-vue-and-rollup',
-    sourceLink: 'https://github.com/lucky401/Create-Icon-Package-With-Vue-and-Rollup',
-    cover: 'https://masukin.link/talks-cover-create-icon-package-with-vue-and-rollup.png',
-    datetime: '2021-06-19',
-  },
+  // {
+  //   title: 'Simply Publish Your Package to npm',
+  //   author: {
+  //     name: 'Lucky Dewa Satria',
+  //     link: 'https://github.com/lucky401',
+  //   },
+  //   at: 'Weekly sharing',
+  //   slidesLink: 'https://masukin.link/talks/simply-publish-your-package-to-npm',
+  //   cover: 'https://masukin.link/talks-cover-npm.png',
+  //   datetime: '2021-06-12',
+  // },
+  // {
+  //   title: 'Create Icon Package With Vue and Rollup',
+  //   author: {
+  //     name: 'Lucky Dewa Satria',
+  //     link: 'https://github.com/lucky401',
+  //   },
+  //   at: 'Weekly Sharing',
+  //   slidesLink: 'https://masukin.link/talks/create-icon-package-with-vue-and-rollup',
+  //   sourceLink: 'https://github.com/lucky401/Create-Icon-Package-With-Vue-and-Rollup',
+  //   cover: 'https://masukin.link/talks-cover-create-icon-package-with-vue-and-rollup.png',
+  //   datetime: '2021-06-19',
+  // },
   {
     title: 'BeAPT',
     author: {
@@ -190,6 +190,30 @@ export const showcases: ShowCaseInfo[] = [
     at: 'Presentation on Social Engineering in Computers in Society class',
     datetime: '2023-10-20',
   },
+  {
+    title: 'Diablo Health Orb Shader',
+    author: {
+      name: 'SuneBear',
+      link: 'https://github.com/sunebear',
+    },
+    at: 'rctAI Sessions',
+    slidesLink: 'https://rct-ai.github.io/frontend-slides/diablo-health-orb-shader/',
+    sourceLink: 'https://github.com/rct-ai/frontend-slides',
+    cover: 'https://github-production-user-asset-6210df.s3.amazonaws.com/7693264/284304324-db973b4c-a043-4644-932c-826169a1b4d8.gif',
+    datetime: '2022-09-01',
+  },
+  {
+    title: 'How Rust error handling ease web development',
+    author: {
+      name: 'Nguyễn Hồng Quân',
+      link: 'https://quan.hoabinh.vn',
+    },
+    at: 'FOSSASIA Summit 2024',
+    slidesLink: 'https://talk.quan.hoabinh.vn/rust-error-handling-ease-web-dev/',
+    sourceLink: 'https://hongquan@bitbucket.org/hongquan/rust-error-handling-ease-web-dev.git',
+    cover: 'https://i.imgur.com/2eBJofY.png',
+    datetime: '2024-04-10',
+  },
   // Add yours here!
   {
     title: 'Yours?',
@@ -199,6 +223,6 @@ export const showcases: ShowCaseInfo[] = [
     at: 'Submit your talk/presentation to be list here!',
     slidesLink: 'https://github.com/slidevjs/docs/edit/main/.vitepress/showcases.ts',
     cover: `${import.meta.env.BASE_URL}theme-placeholder.png`,
-    datetime: '2021-04-29',
+    datetime: '2020-1-1',
   },
-]
+].sort((a, b) => new Date(b.datetime).getTime() - new Date(a.datetime).getTime())

.vitepress/theme/components/Demo.vue

@@ -71,19 +71,26 @@ if (typeof window !== 'undefined') {
 }
 
 onMounted(() => {
-  new TypeIt(block.value, {
+  // @ts-expect-error wrong types provided by TypeIt
+  new TypeIt(block.value!, {
     speed: 50,
     startDelay: 900,
     afterStep: () => {
       // eslint-disable-next-line unicorn/prefer-dom-node-text-content
       code.value = JSON.parse(JSON.stringify(block.value!.innerText.replace('|', '')))
     },
   })
+<<<<<<< HEAD
     .type('<br><span class="token title"># Καλώς ήρθατε στο Slidev!</span><br><br>', { delay: 400 })
     .type('Διαφάνειες παρουσίασης για προγραμματιστές', { delay: 400 })
     .move('START', { speed: 0 })
+=======
+    .type('<br><span class="token title"># Welcome to Slidev!</span><br><br>', { delay: 400 })
+    .type('Presentation Slides for Developers', { delay: 400 })
+    .move(null, { to: 'START', speed: 0 })
+>>>>>>> 21fdadc17cd2018f65c637e5727de640db5036e3
     .type('<br>')
-    .move('START')
+    .move(null, { to: 'START' })
     .exec(pause)
     .type('<span class="token punctuation">---<br><br>---</span>')
     .move(-4)
@@ -101,7 +108,7 @@ onMounted(() => {
     .type(COVER_URL, { speed: 0 })
     .exec(resume)
     .pause(1000)
-    .move('END', { speed: 0 })
+    .move(null, { to: 'END', speed: 0 })
     .exec(pause)
     .type('<br><br><span class="token punctuation">---</span><br><br>', { delay: 400 })
     .exec(resume)

.vitepress/theme/components/DemoEditor.vue

@@ -13,20 +13,27 @@
   padding: 10px;
   border-radius: 7px;
   position: relative;
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.05), 0 0 30px 1px rgba(0, 0, 0, 0.15);
+  box-shadow:
+    0 0 0 1px rgba(0, 0, 0, 0.05),
+    0 0 30px 1px rgba(0, 0, 0, 0.15);
 }
 .dark .demo-editor {
   @apply bg-[#161618] border border-gray-400 border-opacity-10;
 }
 .demo-editor::after {
-  content: "";
+  content: '';
   position: absolute;
   top: 12px;
   left: 10px;
   width: 12px;
   height: 12px;
   background: #f95c5b;
   border-radius: 100%;
-  box-shadow: 0 0 0 1px #da3d42, 22px 0 0 0 #fabe3b, 22px 0 0 1px #ecb03e, 44px 0 0 0 #38cd46, 44px 0 0 1px #2eae32;
+  box-shadow:
+    0 0 0 1px #da3d42,
+    22px 0 0 0 #fabe3b,
+    22px 0 0 1px #ecb03e,
+    44px 0 0 0 #38cd46,
+    44px 0 0 1px #2eae32;
 }
 </style>

.vitepress/theme/components/DemoSlide.vue

@@ -14,7 +14,9 @@
   line-height: 1.2em;
   border-radius: 7px;
   position: relative;
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.05), 0 0 30px 1px rgba(0, 0, 0, 0.15);
+  box-shadow:
+    0 0 0 1px rgba(0, 0, 0, 0.05),
+    0 0 30px 1px rgba(0, 0, 0, 0.15);
   @apply mt-4 transform translate-x-20 -translate-y-20 overflow-hidden;
 }
 

.vitepress/theme/components/Environment.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-defineProps<{ type: 'node' | 'client' }>()
+defineProps<{ type: 'node' | 'client' | 'both' }>()
 </script>
 
 <template>
@@ -10,8 +10,16 @@ defineProps<{ type: 'node' | 'client' }>()
     </summary>
 
     <div class="pt2 opacity-75">
+<<<<<<< HEAD
       <span v-if="type === 'node'">
         Αυτή η λειτουργία ρύθμισης θα εκτελεστεί μόνο σε περιβάλλον Node.js, μπορείτε να έχετε πρόσβαση στο API του Node.
+=======
+      <span v-if="type === 'both'">
+        This setup function will run on <b>both</b> Node.js and client side. Avoid using either Node's or DOM API to avoid runtime errors.
+      </span>
+      <span v-else-if="type === 'node'">
+        This setup function will only run on Node.js environment, you can have access to Node's API.
+>>>>>>> 21fdadc17cd2018f65c637e5727de640db5036e3
       </span>
       <span v-else>
         Αυτή η λειτουργία ρύθμισης θα εκτελεστεί μόνο σε client side. Βεβαιωθείτε ότι το πρόγραμμα περιήγησης είναι συμβατό όταν κάνετε εισαγωγή πακέτων.

.vitepress/theme/components/ShowCaseInfo.vue

@@ -7,8 +7,8 @@ defineProps<{
 </script>
 
 <template>
-  <div>
-    <div class="block mb-1.5 w-full relative aspect-16/9">
+  <div class="flex flex-col gap-2">
+    <div class="block w-full relative aspect-16/9">
       <a
         class="absolute top-0 bottom-0 left-0 right-0 overflow-hidden"
         border="~ rounded gray-400 opacity-20"
@@ -18,45 +18,44 @@ defineProps<{
         <img :src="info.cover">
       </a>
     </div>
-    <div class="font-bold">
+    <div class="font-bold line-clamp-2">
       {{ info.title }}
     </div>
-    <div
-      class="text-current text-xs opacity-75 whitespace-nowrap overflow-hidden overflow-ellipsis"
-    >
+    <div class="text-current text-xs opacity-75 whitespace-nowrap overflow-hidden overflow-ellipsis">
       {{ info.at }}
     </div>
-    <div class="mt-2 flex">
+    <div class="flex-auto" />
+    <div class="flex">
       <a
         v-if="info.author.link"
         :href="info.author.link"
-        class="text-current text-sm opacity-50"
+        class="text-current! text-sm opacity-50 whitespace-nowrap overflow-hidden overflow-ellipsis"
         target="_blank"
       >{{ info.author.name }}</a>
-      <div v-else class="text-current text-sm opacity-50">
+      <div v-else class="text-current! text-sm opacity-50 whitespace-nowrap overflow-hidden overflow-ellipsis">
         {{ info.author.name }}
       </div>
       <div class="flex-auto" />
       <a
         v-if="info.videoLink"
         :href="info.videoLink"
-        class="ml-2 text-current opacity-20 hover:opacity-100 hover:text-[#cb3837]"
+        class="ml-2 text-current! opacity-20 hover:opacity-100 hover:text-[#cb3837]"
         target="_blank"
       >
         <carbon:video />
       </a>
       <a
         v-if="info.slidesLink"
         :href="info.slidesLink"
-        class="ml-2 text-current opacity-20 hover:opacity-100 hover:text-[#cb3837]"
+        class="ml-2 text-current! opacity-20 hover:opacity-100 hover:text-[#cb3837]"
         target="_blank"
       >
         <carbon:presentation-file />
       </a>
       <a
         v-if="info.sourceLink"
         :href="info.sourceLink"
-        class="ml-2 text-current opacity-20 hover:opacity-100"
+        class="ml-2 text-current! opacity-20 hover:opacity-100"
         target="_blank"
       >
         <carbon:logo-github />

.vitepress/theme/styles/custom.css

@@ -1,7 +1,7 @@
 .icon-btn {
   --uno: inline-block cursor-pointer select-none important-outline-none;
   --uno: opacity-75 transition duration-200 ease-in-out align-middle rounded p-2;
-  --uno: hover:(opacity-100 bg-gray-400 bg-opacity-10);
+  --uno: hover-(opacity-100 bg-gray-400 bg-opacity-10);
 }
 
 .icon-btn.disabled {

.vitepress/theme/styles/vars.css

@@ -44,10 +44,10 @@
  * -------------------------------------------------------------------------- */
 
 :root {
-  --vp-c-brand-1: #3AB9D4;
+  --vp-c-brand-1: #3ab9d4;
   --vp-c-brand-2: #60c4db;
   --vp-c-brand-3: #6fcce1;
-  --vp-c-brand-soft: #3AB9D450;
+  --vp-c-brand-soft: #3ab9d450;
   --vp-c-bg-alt: #f9f9f9;
 
   --vp-font-family-mono: theme('fontFamily.mono');
@@ -56,8 +56,8 @@
 .dark {
   --vp-c-brand-1: #6fcce1;
   --vp-c-brand-2: #60c4db;
-  --vp-c-brand-3: #3AB9D4;
-  --vp-c-brand-soft: #3AB9D450;
+  --vp-c-brand-3: #3ab9d4;
+  --vp-c-brand-soft: #3ab9d450;
   --vp-c-bg-alt: #18181b;
   --vp-c-gutter: #8883;
 }