docs(en): merge docs/main into docs-de/main @ e041d9f1

.vitepress/config.js

@@ -153,7 +153,15 @@ const Customizations = [
     link: '/custom/config-vite',
   },
   {
+<<<<<<< HEAD
     text: 'Windi CSS konfigurieren',
+=======
+    text: 'Configure UnoCSS',
+    link: '/custom/config-unocss',
+  },
+  {
+    text: 'Configure Windi CSS',
+>>>>>>> e041d9f163908ef9fbd5eb7731224b8314fef92a
     link: '/custom/config-windicss',
   },
   {
@@ -186,6 +194,17 @@ const Customizations = [
   }
 ]
 
+const BuiltIn = [
+  {
+    text: 'Components',
+    link: '/builtin/components',
+  },
+  {
+    text: 'Layouts',
+    link: '/builtin/layouts',
+  },
+]
+
 const Resources = [
   {
     text: 'Beispielprojekte',
@@ -220,6 +239,7 @@ const slidebars = [
   },
   {
     text: 'Built-in',
+<<<<<<< HEAD
     children: [
       {
         text: 'Komponenten',
@@ -230,6 +250,9 @@ const slidebars = [
         link: '/builtin/layouts',
       },
     ],
+=======
+    children: BuiltIn,
+>>>>>>> e041d9f163908ef9fbd5eb7731224b8314fef92a
   },
 ]
 
@@ -287,7 +310,15 @@ module.exports = {
         items: Customizations,
       },
       {
+<<<<<<< HEAD
         text: 'Ressourcen',
+=======
+        text: 'Built-in',
+        items: BuiltIn,
+      },
+      {
+        text: 'Resources',
+>>>>>>> e041d9f163908ef9fbd5eb7731224b8314fef92a
         items: Resources,
       },
       {

.vitepress/showcases.ts

@@ -115,7 +115,7 @@ export const showcases: ShowCaseInfo[] = [
       name: 'Alexander Eble',
       link: 'https://github.com/alexanderdavide',
     },
-    slidesLink: 'https://git-most-wanted.alex-eble.de',
+    slidesLink: 'https://alexeble.de/talks/git-most-wanted/',
     sourceLink: 'https://github.com/alexanderdavide/git-most-wanted',
     at: 'Internal Tech Talk',
     datetime: '2022-03-11',
@@ -166,6 +166,30 @@ export const showcases: ShowCaseInfo[] = [
     cover: 'https://raw.githubusercontent.com/Mokkapps/vuejsnation-2023-lightning-talk-polite-popup-nuxt-3-slides/main/screenshots/001.png',
     datetime: '2023-01-25',
   },
+  {
+    title: 'Dev Environment as Code',
+    cover: 'https://cdn.jsdelivr.net/gh/alexanderdavide/dev-environment-as-code@assets/slides-export/001.png',
+    author: {
+      name: 'Alexander Eble',
+      link: 'https://github.com/alexanderdavide',
+    },
+    slidesLink: 'https://alexeble.de/talks/dev-environment-as-code/',
+    sourceLink: 'https://github.com/alexanderdavide/dev-environment-as-code',
+    at: 'Internal Tech Talk',
+    datetime: '2022-12-01',
+  },
+  {
+    title: 'Exploring Social Engineering',
+    cover: 'https://raw.githubusercontent.com/zyf722/exploring-social-engineering-slides/main/assets/Screenshot_Cover.png',
+    author: {
+      name: 'zyf722',
+      link: 'https://github.com/zyf722',
+    },
+    slidesLink: 'https://zyf722.github.io/exploring-social-engineering-slides/',
+    sourceLink: 'https://github.com/zyf722/exploring-social-engineering-slides',
+    at: 'Presentation on Social Engineering in Computers in Society class',
+    datetime: '2023-10-20',
+  },
   // Add yours here!
   {
     title: 'Yours?',

.vitepress/theme/components/ThemeInfo.vue

@@ -12,7 +12,7 @@ const index = ref(0)
 if (props.theme.previews.length > 1 && isClient) {
   const { resume } = useIntervalFn(() => {
     index.value = (index.value + 1) % props.theme.previews.length
-  }, 3000, false)
+  }, 3000, { immediate: false })
   // add random defer so they don't starts together
   setTimeout(resume, Math.round(1000 * Math.random()))
 }

.vitepress/themes.ts

@@ -386,7 +386,71 @@ export const community: ThemeInfo[] = [
       'light',
     ],
   },
+<<<<<<< HEAD
   // Füge deins hier hinzu!
+=======
+  {
+    id: 'slidev-theme-the-unnamed',
+    name: 'The unnamed',
+    description: 'A theme based on The unnamed VS Code theme',
+    author: {
+      name: 'Elio Struyf',
+      link: 'https://elio.dev',
+    },
+    repo: 'https://github.com/estruyf/slidev-theme-the-unnamed',
+    previews: [
+      'https://cdn.jsdelivr.net/gh/estruyf/slidev-theme-the-unnamed@main/assets/cover.png',
+      'https://cdn.jsdelivr.net/gh/estruyf/slidev-theme-the-unnamed@main/assets/about-me.png',
+      'https://cdn.jsdelivr.net/gh/estruyf/slidev-theme-the-unnamed@main/assets/default.png',
+      'https://cdn.jsdelivr.net/gh/estruyf/slidev-theme-the-unnamed@main/assets/section.png',
+    ],
+    tags: [
+      'dark'
+    ],
+  },
+  {
+    id: 'slidev-theme-dracula',
+    name: 'Dracula',
+    description: 'One the best dark theme meets slidev',
+    author: {
+      name: 'JD Solanki (jd-solanki)',
+      link: 'https://github.com/jd-solanki',
+    },
+    repo: 'https://github.com/jd-solanki/slidev-theme-dracula',
+    previews: [
+      'https://cdn.jsdelivr.net/gh/jd-solanki/slidev-theme-dracula/screenshots/screenshot-1.png',
+      'https://cdn.jsdelivr.net/gh/jd-solanki/slidev-theme-dracula/screenshots/screenshot-2.png',
+      'https://cdn.jsdelivr.net/gh/jd-solanki/slidev-theme-dracula/screenshots/screenshot-3.png',
+      'https://cdn.jsdelivr.net/gh/jd-solanki/slidev-theme-dracula/screenshots/screenshot-4.png',
+      'https://cdn.jsdelivr.net/gh/jd-solanki/slidev-theme-dracula/screenshots/screenshot-5.png',
+    ],
+    tags: [
+      'dark',
+      'minimalism',
+    ],
+  },
+  {
+    id: 'slidev-theme-frankfurt',
+    name: 'Frankfurt',
+    description: 'Inspired by the Beamer theme Frankfurt',
+    author: {
+      name: 'Mu-Tsun Tsai',
+      link: 'https://github.com/MuTsunTsai',
+    },
+    repo: 'https://github.com/MuTsunTsai/slidev-theme-frankfurt',
+    previews: [
+      'https://cdn.jsdelivr.net/gh/MuTsunTsai/slidev-theme-frankfurt/screenshots/01.png',
+      'https://cdn.jsdelivr.net/gh/MuTsunTsai/slidev-theme-frankfurt/screenshots/04.png',
+      'https://cdn.jsdelivr.net/gh/MuTsunTsai/slidev-theme-frankfurt/screenshots/06.png',
+      'https://cdn.jsdelivr.net/gh/MuTsunTsai/slidev-theme-frankfurt/screenshots/07.png',
+    ],
+    tags: [
+      'dark',
+      'light',
+    ],
+  },
+  // Add yours here!
+>>>>>>> e041d9f163908ef9fbd5eb7731224b8314fef92a
   {
     id: '',
     link: 'https://github.com/slidevjs/docs/edit/main/.vitepress/themes.ts',

addons/write-an-addon.md

@@ -6,11 +6,19 @@
 
 Addons können folgende Punkte beeinflussen:
 
+<<<<<<< HEAD
 - Globale Styles (mit Vorsicht zu verwenden, das ist eher die Rolle von [Themes](/themes/use))
 - Bereitstellen Layouts oder Überschreiben von vorhandenen Layouts
 - Bereitstellen Komponenten oder Überschreiben von vorhandenen Komponenten
 - Erweitern der Windi CSS Konfiguration
 - Konfigurieren von Tools, wie Monaco oder Prism
+=======
+- Global styles (use with caution has it is more the role of [themes](/themes/use))
+- Provide custom layouts or override the existing one
+- Provide custom components or override the existing one
+- Extend UnoCSS/Windi CSS configurations
+- Configure tools like Monaco and Prism
+>>>>>>> e041d9f163908ef9fbd5eb7731224b8314fef92a
 
 ## Konventionen