docs(en): merge docs/main into docs-es/main @ 9b64ca24

.vitepress/config.js

@@ -153,7 +153,15 @@ const Customizations = [
  link: '/custom/config-vite',
  },
  {
+<<<<<<< HEAD
  text: 'Configurar Windi CSS',
+=======
+ text: 'Configure UnoCSS',
+ link: '/custom/config-unocss',
+ },
+ {
+ text: 'Configure Windi CSS',
+>>>>>>> 9b64ca249c101e7e425d7ca81aebba12658b9b97
  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: 'Galería',
@@ -219,6 +238,7 @@ const slidebars = [
  children: Customizations,
  },
  {
+<<<<<<< HEAD
  text: 'Integrado',
  children: [
  {
@@ -230,6 +250,10 @@ const slidebars = [
  link: '/builtin/layouts',
  },
  ],
+=======
+ text: 'Built-in',
+ children: BuiltIn,
+>>>>>>> 9b64ca249c101e7e425d7ca81aebba12658b9b97
  },
 ]
 
@@ -287,7 +311,15 @@ module.exports = {
  items: Customizations,
  },
  {
+<<<<<<< HEAD
  text: 'Recursos',
+=======
+ text: 'Built-in',
+ items: BuiltIn,
+ },
+ {
+ text: 'Resources',
+>>>>>>> 9b64ca249c101e7e425d7ca81aebba12658b9b97
  items: Resources,
  },
  {

.vitepress/showcases.ts

@@ -178,6 +178,18 @@ export const showcases: ShowCaseInfo[] = [
  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

@@ -426,6 +426,26 @@ export const community: ThemeInfo[] = [
  '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!
  {
  id: '',

addons/write-an-addon.md

@@ -6,11 +6,19 @@
 
 Un addon puede permitirte lo siguiente:
 
+<<<<<<< HEAD
 - Estilos globales (úsalo con cautela puesto que es el enfoque de [los temas](/themes/use)
 - Proporcionar layouts personalizados o sustituye los existentes
 - Proporcionar componentes personalizados o sustituir los existentes
 - Extender las configuraciones CSS de Windi
 - Configurar herramientas como Monaco y 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
+>>>>>>> 9b64ca249c101e7e425d7ca81aebba12658b9b97
 
 
 ## Convenciones