docs(cn): conflict resolution

vitest-dev · Nov 3, 2023 · f367f0b · f367f0b
1 parent 7fba09b
commit f367f0b
Show file tree

Hide file tree

Showing 10 changed files with 255 additions and 1,941 deletions.
diff --git a/.vitepress/config.ts b/.vitepress/config.ts
@@ -35,7 +35,6 @@ export default withPwa(
         link: 'https://vitest.dev/',
       },
     },
-<<<<<<< HEAD
     head: [
       ['meta', { name: 'theme-color', content: '#729b1a' }],
       ['link', { rel: 'icon', href: '/favicon.ico', sizes: 'any' }],
@@ -54,66 +53,6 @@ export default withPwa(
       ['noscript', {}, `<link rel="stylesheet" crossorigin="anonymous" href="${font}" />`],
       ['link', { rel: 'mask-icon', href: '/logo.svg', color: '#ffffff' }],
       ['link', { rel: 'apple-touch-icon', href: '/apple-touch-icon.png', sizes: '180x180' }],
-=======
-    zh: {
-      label: '简体中文',
-      lang: 'zh',
-      link: 'https://cn.vitest.dev/',
-    },
-  },
-  head: [
-    ['meta', { name: 'theme-color', content: '#729b1a' }],
-    ['link', { rel: 'icon', href: '/favicon.ico', sizes: 'any' }],
-    ['link', { rel: 'icon', href: '/logo.svg', type: 'image/svg+xml' }],
-    ['meta', { name: 'author', content: `${teamMembers.map(c => c.name).join(', ')} and ${vitestName} contributors` }],
-    ['meta', { name: 'keywords', content: 'vitest, vite, test, coverage, snapshot, react, vue, preact, svelte, solid, lit, marko, ruby, cypress, puppeteer, jsdom, happy-dom, test-runner, jest, typescript, esm, tinypool, tinyspy, node' }],
-    ['meta', { property: 'og:title', content: vitestName }],
-    ['meta', { property: 'og:description', content: vitestDescription }],
-    ['meta', { property: 'og:url', content: ogUrl }],
-    ['meta', { property: 'og:image', content: ogImage }],
-    ['meta', { name: 'twitter:title', content: vitestName }],
-    ['meta', { name: 'twitter:description', content: vitestDescription }],
-    ['meta', { name: 'twitter:image', content: ogImage }],
-    ['meta', { name: 'twitter:card', content: 'summary_large_image' }],
-    ['link', { rel: 'preload', as: 'style', onload: 'this.onload=null;this.rel=\'stylesheet\'', href: font }],
-    ['noscript', {}, `<link rel="stylesheet" crossorigin="anonymous" href="${font}" />`],
-    ['link', { rel: 'mask-icon', href: '/logo.svg', color: '#ffffff' }],
-    ['link', { rel: 'apple-touch-icon', href: '/apple-touch-icon.png', sizes: '180x180' }],
-  ],
-  lastUpdated: true,
-  markdown: {
-    theme: {
-      light: 'github-light',
-      dark: 'github-dark',
-    },
-  },
-  themeConfig: {
-    logo: '/logo.svg',
-
-    editLink: {
-      pattern: 'https://github.com/vitest-dev/vitest/edit/main/docs/:path',
-      text: 'Suggest changes to this page',
-    },
-
-    search: {
-      provider: 'local',
-      /* provider: 'algolia',
-      options: {
-        appId: 'ZTF29HGJ69',
-        apiKey: '9c3ced6fed60d2670bb36ab7e8bed8bc',
-        indexName: 'vitest',
-        // searchParameters: {
-        //   facetFilters: ['tags:en'],
-        // },
-      }, */
-    },
-
-    socialLinks: [
-      { icon: 'mastodon', link: mastodon },
-      { icon: 'twitter', link: twitter },
-      { icon: 'discord', link: discord },
-      { icon: 'github', link: github },
->>>>>>> 4be1f32f7b1f40c6c8d7f479bcb751276ae29f47
     ],
     lastUpdated: true,
     markdown: {

diff --git a/.vitepress/style/vars.css b/.vitepress/style/vars.css
@@ -2,32 +2,12 @@
  * Colors
  * -------------------------------------------------------------------------- */
 
-<<<<<<< HEAD
- :root {
-  --vp-c-accent: #dab40b;
-  --vp-c-brand: #6da13f;
-  --vp-c-brand-1: var(--vp-c-brand-dark);
-  --vp-c-brand-2: var(--vp-c-brand-darker);
-  --vp-c-brand-light: #7ec242;
-  --vp-c-brand-lighter: #93d31c;
-  --vp-c-brand-dark: #668d11;
-  --vp-c-brand-darker: #52730d;
-  --vp-c-text-code: #5d6f5d;
-  --vp-code-block-bg: rgba(125,125,125,0.04);
-  --vp-c-text-light-2: rgba(56 56 56 / 70%);
-  /* fix contrast: lang name on gray code block */
-  --vp-c-text-dark-3: rgba(180, 180, 180, 0.7);
-  --vp-code-copy-code-bg: rgba(125,125,125,0.1);
-  --vp-code-copy-code-hover-bg: rgba(125,125,125,0.2);
-  --vp-c-disabled-bg: rgba(125,125,125,0.2);
-=======
 :root {
   --vp-c-brand-1: #52730d;
   --vp-c-brand-2: #57791b;
   --vp-c-brand-3: #506e10;
   --vp-c-sponsor: #ca2971;
   --vitest-c-sponsor-hover: #c13071;
->>>>>>> 4be1f32f7b1f40c6c8d7f479bcb751276ae29f47
 }
 
 .dark {
@@ -38,15 +18,14 @@
   --vitest-c-sponsor-hover: #e51370;
 }
 
-
 /**
  * Component: Custom Block
  * -------------------------------------------------------------------------- */
 :root {
   --vp-custom-block-tip-code-bg: var(--vp-c-brand-soft);
   --vp-custom-block-danger-code-bg: #a79fa029;
   --vitest-custom-block-tip-code-text: #4a680c;
-  --vitest-custom-block-info-code-text: #394f0c
+  --vitest-custom-block-info-code-text: #394f0c;
 }
 
 .dark {
@@ -67,7 +46,7 @@
  * Component: Home
  * -------------------------------------------------------------------------- */
 
- :root {
+:root {
   --vp-home-hero-name-color: transparent;
   --vp-home-hero-name-background: -webkit-linear-gradient(
     120deg,
@@ -94,7 +73,6 @@
   }
 }
 
-
 /**
  * Component: Algolia
  * -------------------------------------------------------------------------- */