docs(en): merging all conflicts

.vitepress/config.ts

@@ -191,6 +191,10 @@ const slidebars: DefaultTheme.SidebarItem[] = [
     text: 'Ενσωματωμένα',
     items: BuiltIn,
   },
+  {
+    text: 'Resources',
+    items: Resources,
+  },
 ]
 
 export default defineConfig({

.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,18 @@ 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',
+  },
   // Add yours here!
   {
     title: 'Yours?',
@@ -199,6 +211,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/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/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;
 }

.vitepress/themes.ts

@@ -426,6 +426,25 @@ export const community: ThemeInfo[] = [
       'light',
     ],
   },
+  {
+    id: 'slidev-theme-hep',
+    name: 'HEP',
+    description: 'Academic style for High Energy Physics',
+    author: {
+      name: 'Yulei ZHANG',
+      link: 'https://github.com/AvencastF',
+    },
+    repo: 'https://github.com/AvencastF/slidev-theme-hep',
+    previews: [
+      'https://cdn.jsdelivr.net/gh/avencastf/slidev-theme-hep/screenshot/001.png',
+      'https://cdn.jsdelivr.net/gh/avencastf/slidev-theme-hep/screenshot/004.png',
+      'https://cdn.jsdelivr.net/gh/avencastf/slidev-theme-hep/screenshot/006.png',
+      'https://cdn.jsdelivr.net/gh/avencastf/slidev-theme-hep/screenshot/008.png',
+    ],
+    tags: [
+      'light',
+    ],
+  },
   // Add yours here!
   {
     id: '',

README.md

@@ -1,9 +1,19 @@
 # [sli.dev](https://sli.dev)
 
+<<<<<<< HEAD
 Οδηγίες χρήσης για το [Slidev](https://github.com/slidevjs/slidev)
+=======
+> [!IMPORTANT]
+> This repository is a mirror of the `docs/` directory in [slidevjs/slidev](https://github.com/slidevjs/slidev/tree/main/docs). Mainly for other translations repositories to sync.
+>
+> **‼️ Please DO NOT submit pull requests here ‼️**. Instead, send them to the [main repository](https://github.com/slidevjs/slidev), and they will be synced here automatically.
+
+Mirrored documentation site for [Slidev](https://github.com/slidevjs/slidev)
+>>>>>>> 69e1142c6f07cb04fb7fea7f396de60cd1f0538f
 
 ## Μεταφράσεις
 
+<<<<<<< HEAD
 | | Repo | Site | Maintainers |
 |---|---|---:|---|
 | English | [docs](https://github.com/slidevjs/docs) | [sli.dev](https://sli.dev) | [@antfu](https://github.com/antfu) |
@@ -16,6 +26,20 @@
 | Português (BR) | [docs-br](https://github.com/slidevjs/docs-br) | [br.sli.dev](https://br.sli.dev) | [@luisfelipesdn12](https://github.com/luisfelipesdn12) |
 | Ελληνικά | [docs-el](https://github.com/slidevjs/docs-el) | [el.sli.dev](https://el.sli.dev) | [@GeopJr](https://github.com/GeopJr) |
 | 日本語 | [docs-ja](https://github.com/slidevjs/docs-ja) | [ja.sli.dev](https://ja.sli.dev) | [@IkumaTadokoro](https://github.com/IkumaTadokoro) |
+=======
+|                | Repo                                           |                             Site | Maintainers                                                           |
+| -------------- | ---------------------------------------------- | -------------------------------: | --------------------------------------------------------------------- |
+| English        | [docs](https://github.com/slidevjs/slidev/tree/main/docs)       |       [sli.dev](https://sli.dev) | [@antfu](https://github.com/antfu)                                    |
+| 简体中文       | [docs-cn](https://github.com/slidevjs/docs-cn) | [cn.sli.dev](https://cn.sli.dev) | [@QC-L](https://github.com/QC-L) [@Ivocin](https://github.com/Ivocin) |
+| Français       | [docs-fr](https://github.com/slidevjs/docs-fr) | [fr.sli.dev](https://fr.sli.dev) | [@ArthurDanjou](https://github.com/ArthurDanjou)                      |
+| Español        | [docs-es](https://github.com/slidevjs/docs-es) | [es.sli.dev](https://es.sli.dev) | [@owlnai](https://github.com/owlnai)                                  |
+| Русский        | [docs-ru](https://github.com/slidevjs/docs-ru) | [ru.sli.dev](https://ru.sli.dev) | [@xesjkeee](https://github.com/xesjkeee)                              |
+| Việt Nam       | [docs-vn](https://github.com/slidevjs/docs-vn) | [vn.sli.dev](https://vn.sli.dev) | [@bongudth](https://github.com/bongudth)                              |
+| Deutsch        | [docs-de](https://github.com/slidevjs/docs-de) | [de.sli.dev](https://de.sli.dev) | [@fabiankachlock](https://github.com/fabiankachlock)                  |
+| Português (BR) | [docs-br](https://github.com/slidevjs/docs-br) | [br.sli.dev](https://br.sli.dev) | [@luisfelipesdn12](https://github.com/luisfelipesdn12)                |
+| Ελληνικά       | [docs-el](https://github.com/slidevjs/docs-el) | [el.sli.dev](https://el.sli.dev) | [@GeopJr](https://github.com/GeopJr)                                  |
+| 日本語         | [docs-ja](https://github.com/slidevjs/docs-el) | [ja.sli.dev](https://ja.sli.dev) | [@IkumaTadokoro](https://github.com/IkumaTadokoro)                    |
+>>>>>>> 69e1142c6f07cb04fb7fea7f396de60cd1f0538f
 
 ## Ξεκινήστε τον διακομιστή τοπικά
 

TRANSLATIONS.md

@@ -9,7 +9,9 @@ You can find the repositories for each existing translation in [README.md](./REA
 If the language you want to contribute isn't on the list, join [our Discord server](https://chat.sli.dev), and find the `#translations` channel to see if someone is already working on the language you want, consider joining them and translate together. If not, you can start a new translation project with the following steps.
 
 In case it's already been translated but you're wondering how to maintain it, skip to the end.
+
 ## Some tips before you get started
+
 - It is recommended that you use your IDE of choice (e.g VSCode) paired with a development server running, so you can see your translation changes in real-time.
 - You can mark these checkmarks as the translation progresses or use your own workflow. The translations don't need to be made in any particular order.
 - Translations don't need to be literal, but they should convey the same message. In case you're not sure how to translate something, you can either leave it as it is or use online tools like WordReference or Linguee to aid you.

addons/use.md

@@ -4,8 +4,13 @@
 
 Μοιάζουν αρκετά με [τα θέματα](/themes/use), αλλά γενικά:
 
+<<<<<<< HEAD
 * δεν επηρεάζουν το συνολικό στυλ των διαφανειών σας
 * μπορείτε να χρησιμοποιήσετε πολλαπλά πρόσθετα σε μία παρουσίαση
+=======
+- they don't affect the global styles of your slides
+- you can use multiple addons in one presentation
+>>>>>>> 69e1142c6f07cb04fb7fea7f396de60cd1f0538f
 
 Για να χρησιμοποιήσετε πρόσθετα, πρέπει να τα εγκαταστήσετε χειροκίνητα μέσω: