diff --git a/.npmrc b/.npmrc index bf2e764..cf04042 100644 --- a/.npmrc +++ b/.npmrc @@ -1 +1,2 @@ shamefully-hoist=true +strict-peer-dependencies=false diff --git a/.vitepress/config.js b/.vitepress/config.js index 7a10e15..1b97e0b 100644 --- a/.vitepress/config.js +++ b/.vitepress/config.js @@ -46,10 +46,14 @@ const Guide = [ link: '/guide/presenter-mode', }, { +<<<<<<< HEAD <<<<<<< HEAD text: 'Интеграции редакторов', ======= text: 'Drawing & Annonations', +======= + text: 'Drawing & Annotations', +>>>>>>> a9706e023e005538c02c8ba9f36d03876f65dacb link: '/guide/drawing', }, { @@ -78,6 +82,17 @@ const Theme = [ }, ] +const Addon = [ + { + text: 'Use Addon', + link: '/addons/use', + }, + { + text: 'Write an Addon', + link: '/addons/write-an-addon', + }, +] + const Translations = [ { text: 'Русский', @@ -114,6 +129,10 @@ const Translations = [ text: 'Ελληνικά', link: 'https://el.sli.dev{{pathname}}', }, + { + text: '日本語', + link: 'https://ja.sli.dev{{pathname}}', + }, ] const Customizations = [ @@ -196,7 +215,15 @@ const slidebars = [ children: Theme, }, { +<<<<<<< HEAD text: 'Кастомизация', +======= + text: 'Addons', + children: Addon, + }, + { + text: 'Customizations', +>>>>>>> a9706e023e005538c02c8ba9f36d03876f65dacb children: Customizations, }, { @@ -259,7 +286,15 @@ module.exports = { items: Theme, }, { +<<<<<<< HEAD text: 'Кастомизация', +======= + text: 'Addon', + items: Addon, + }, + { + text: 'Customize', +>>>>>>> a9706e023e005538c02c8ba9f36d03876f65dacb items: Customizations, }, { @@ -275,6 +310,7 @@ module.exports = { sidebar: { '/guide/': slidebars, '/themes/': slidebars, + '/addons/': slidebars, '/custom/': slidebars, '/builtin/': slidebars, '/resources/': slidebars, diff --git a/.vitepress/showcases.ts b/.vitepress/showcases.ts index dd7136b..7c4c6fa 100644 --- a/.vitepress/showcases.ts +++ b/.vitepress/showcases.ts @@ -108,6 +108,30 @@ export const showcases: ShowCaseInfo[] = [ at: 'Thoughtworks Internal Lunch & Learn', datetime: '2021-11-12', }, + { + title: 'Git\'s Most Wanted', + cover: 'https://cdn.jsdelivr.net/gh/alexanderdavide/git-most-wanted@assets/slides-export/01.png', + author: { + name: 'Alexander Eble', + link: 'https://github.com/alexanderdavide', + }, + slidesLink: 'https://git-most-wanted.alex-eble.de', + sourceLink: 'https://github.com/alexanderdavide/git-most-wanted', + at: 'Internal Tech Talk', + datetime: '2022-03-11', + }, + { + title: 'OpenFunction 202', + cover: 'https://s2.loli.net/2022/05/22/4zsCnkQRFoAU1E5.png', + author: { + name: 'Haili Zhang', + link: 'https://github.com/webup', + }, + slidesLink: 'https://openfunction-talks.netlify.app/2022/202-node-async/', + sourceLink: 'https://github.com/webup/openfunction-talks/tree/main/202-node-async', + at: 'OpenFunction Tutorial Sharing', + datetime: '2022-05-08', + }, // Add yours here! { title: 'Yours?', diff --git a/.vitepress/theme/Layout.vue b/.vitepress/theme/Layout.vue index 4e72fba..b8341f9 100644 --- a/.vitepress/theme/Layout.vue +++ b/.vitepress/theme/Layout.vue @@ -50,19 +50,17 @@ - + diff --git a/.vitepress/theme/components/HomeFeatures.vue b/.vitepress/theme/components/HomeFeatures.vue index 32a34e0..292bc99 100644 --- a/.vitepress/theme/components/HomeFeatures.vue +++ b/.vitepress/theme/components/HomeFeatures.vue @@ -19,16 +19,16 @@ diff --git a/.vitepress/theme/components/HomeHero.vue b/.vitepress/theme/components/HomeHero.vue index dbda354..22bbb40 100644 --- a/.vitepress/theme/components/HomeHero.vue +++ b/.vitepress/theme/components/HomeHero.vue @@ -17,14 +17,14 @@ @@ -51,19 +51,19 @@ +