diff --git a/docs/team-test.md b/docs/team-test.md
new file mode 100644
index 00000000..6b8bfeba
--- /dev/null
+++ b/docs/team-test.md
@@ -0,0 +1,131 @@
+---
+layout: page
+title: Meet the Team
+description: The development of Vite is guided by an international team.
+---
+
+<script setup>
+import {
+  VPTeamPage,
+  VPTeamPageTitle,
+  VPTeamPageSection,
+  VPTeamMembers
+} from 'vitepress/theme'
+
+const members1 = [
+  {
+    avatar: 'https://github.com/yyx990803.png',
+    name: 'Evan You',
+    title: 'Creator',
+    links: [
+      { icon: 'github', link: 'https://github.com/yyx990803' },
+      { icon: 'twitter', link: 'https://twitter.com/youyuxi' }
+    ]
+  },
+  {
+    avatar: 'https://github.com/kiaking.png',
+    name: 'Kia King Ishii',
+    title: 'Developer',
+    links: [
+      { icon: 'github', link: 'https://github.com/kiaking' },
+      { icon: 'twitter', link: 'https://twitter.com/KiaKing85' }
+    ]
+  },
+  // {
+  //   avatar: 'https://github.com/kiaking.png',
+  //   name: 'Kia King Ishii',
+  //   title: 'Developer',
+  //   links: [
+  //     { icon: 'github', link: 'https://github.com/kiaking' },
+  //     { icon: 'twitter', link: 'https://twitter.com/KiaKing85' }
+  //   ]
+  // },
+  // {
+  //   avatar: 'https://github.com/kiaking.png',
+  //   name: 'Kia King Ishii',
+  //   title: 'Developer',
+  //   links: [
+  //     { icon: 'github', link: 'https://github.com/kiaking' },
+  //     { icon: 'twitter', link: 'https://twitter.com/KiaKing85' }
+  //   ]
+  // },
+  // {
+  //   avatar: 'https://github.com/kiaking.png',
+  //   name: 'Kia King Ishii',
+  //   title: 'Developer',
+  //   links: [
+  //     { icon: 'github', link: 'https://github.com/kiaking' },
+  //     { icon: 'twitter', link: 'https://twitter.com/KiaKing85' }
+  //   ]
+  // }
+]
+
+const members2 = [
+  {
+    avatar: 'https://github.com/yyx990803.png',
+    name: 'Evan You',
+    title: 'Creator',
+    links: [
+      { icon: 'github', link: 'https://github.com/yyx990803' },
+      { icon: 'twitter', link: 'https://twitter.com/youyuxi' }
+    ]
+  },
+  {
+    avatar: 'https://github.com/kiaking.png',
+    name: 'Kia King Ishii',
+    title: 'Developer',
+    links: [
+      { icon: 'github', link: 'https://github.com/kiaking' },
+      { icon: 'twitter', link: 'https://twitter.com/KiaKing85' }
+    ]
+  },
+  {
+    avatar: 'https://github.com/kiaking.png',
+    name: 'Kia King Ishii',
+    title: 'Developer',
+    links: [
+      { icon: 'github', link: 'https://github.com/kiaking' },
+      { icon: 'twitter', link: 'https://twitter.com/KiaKing85' }
+    ]
+  },
+  // {
+  //   avatar: 'https://github.com/kiaking.png',
+  //   name: 'Kia King Ishii',
+  //   title: 'Developer',
+  //   links: [
+  //     { icon: 'github', link: 'https://github.com/kiaking' },
+  //     { icon: 'twitter', link: 'https://twitter.com/KiaKing85' }
+  //   ]
+  // },
+  // {
+  //   avatar: 'https://github.com/kiaking.png',
+  //   name: 'Kia King Ishii',
+  //   title: 'Developer',
+  //   links: [
+  //     { icon: 'github', link: 'https://github.com/kiaking' },
+  //     { icon: 'twitter', link: 'https://twitter.com/KiaKing85' }
+  //   ]
+  // }
+]
+</script>
+
+<VPTeamPage>
+  <VPTeamPageTitle>
+    <template #title>Meet the Team</template>
+    <template #lead>
+      The development of Vite is guided by an international team, some of whom
+      have chosen to be featured below.
+    </template>
+  </VPTeamPageTitle>
+  <VPTeamMembers :members="members1" />
+  <VPTeamPageSection>
+    <template #title>Team Emeriti</template>
+    <template #lead>
+      Here we honor some no-longer-active team members who have made valuable
+      contributions in the past.
+    </template>
+    <template #members>
+      <VPTeamMembers size="small" :members="members2" />
+    </template>
+  </VPTeamPageSection>
+</VPTeamPage>
\ No newline at end of file
diff --git a/src/client/theme-default/components/VPTeamMembers.vue b/src/client/theme-default/components/VPTeamMembers.vue
index 0337eb5a..b808e0b7 100644
--- a/src/client/theme-default/components/VPTeamMembers.vue
+++ b/src/client/theme-default/components/VPTeamMembers.vue
@@ -26,41 +26,98 @@ const classes = computed(() => [props.size, `count-${props.members.length}`])
 </template>
 
 <style scoped>
-.VPTeamMembers.small .container {
-  grid-template-columns: repeat(auto-fit, minmax(224px, 1fr));
+.container {
+  display: grid;
+  gap: 24px;
+  margin: 0 auto;
+  width: 100%;
+  max-width: 1152px;
 }
 
-.VPTeamMembers.small.count-1 .container {
-  max-width: 276px;
+.item {
+  width: 100%;
 }
-.VPTeamMembers.small.count-2 .container {
-  max-width: calc(276px * 2 + 24px);
+
+/**
+ * Small size layout.
+ * -------------------------------------------------------------------------- */
+
+@media (min-width: 512px) {
+  .VPTeamMembers.small .container {
+    grid-template-columns: repeat(2, 1fr);
+  }
+
+  .VPTeamMembers.small.count-1 .container,
+  .VPTeamMembers.small.count-2 .container {
+    display: flex;
+    justify-content: center;
+  }
+
+  .VPTeamMembers.small.count-1 .item,
+  .VPTeamMembers.small.count-2 .item {
+    max-width: 272px;
+  }
 }
-.VPTeamMembers.small.count-3 .container {
-  max-width: calc(276px * 3 + 24px * 2);
+
+@media (min-width: 768px) {
+  .VPTeamMembers.small .container {
+    grid-template-columns: repeat(3, 1fr);
+  }
 }
 
-.VPTeamMembers.medium .container {
-  grid-template-columns: repeat(auto-fit, minmax(256px, 1fr));
+@media (min-width: 960px) {
+  .VPTeamMembers.small .container {
+    grid-template-columns: repeat(4, 1fr);
+  }
+
+  .VPTeamMembers.small.count-3 .container {
+    display: flex;
+    justify-content: center;
+  }
+
+  .VPTeamMembers.small.count-3 .item {
+    max-width: 272px;
+  }
 }
 
-@media (min-width: 375px) {
+/**
+ * Medium size layout.
+ * -------------------------------------------------------------------------- */
+
+@media (min-width: 512px) and (max-width: 639px) {
   .VPTeamMembers.medium .container {
-    grid-template-columns: repeat(auto-fit, minmax(288px, 1fr));
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
   }
-}
 
-.VPTeamMembers.medium.count-1 .container {
-  max-width: 368px;
+  .VPTeamMembers.medium .item {
+    max-width: 368px;
+  }
 }
-.VPTeamMembers.medium.count-2 .container {
-  max-width: calc(368px * 2 + 24px);
+
+@media (min-width: 640px) {
+  .VPTeamMembers.medium .container {
+    grid-template-columns: repeat(2, 1fr);
+  }
+
+  .VPTeamMembers.medium.count-1 .container,
+  .VPTeamMembers.medium.count-2 .container {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .VPTeamMembers.medium.count-1 .item,
+  .VPTeamMembers.medium.count-2 .item {
+    max-width: 368px;
+  }
 }
 
-.container {
-  display: grid;
-  gap: 24px;
-  margin: 0 auto;
-  max-width: 1152px;
+@media (min-width: 960px) {
+  .VPTeamMembers.medium .container {
+    grid-template-columns: repeat(3, 1fr);
+  }
 }
 </style>
diff --git a/src/client/theme-default/components/VPTeamPage.vue b/src/client/theme-default/components/VPTeamPage.vue
index 71d9bdb5..715e904f 100644
--- a/src/client/theme-default/components/VPTeamPage.vue
+++ b/src/client/theme-default/components/VPTeamPage.vue
@@ -6,53 +6,42 @@
 
 <style scoped>
 .VPTeamPage {
-  margin: 96px 0;
+  padding: 48px 24px 128px;
 }
 
 @media (min-width: 768px) {
   .VPTeamPage {
-    margin: 128px 0;
+    padding: 64px 32px 128px;
   }
 }
 
-.VPHome :slotted(.VPTeamPageTitle) {
-  border-top: 1px solid var(--vp-c-gutter);
-  padding-top: 88px !important;
+@media (min-width: 960px) {
+  .VPTeamPage {
+    padding: 96px 64px 128px;
+  }
 }
 
-:slotted(.VPTeamPageSection + .VPTeamPageSection),
-:slotted(.VPTeamMembers + .VPTeamPageSection) {
+.VPTeamPage :deep(.VPTeamPageSection + .VPTeamPageSection),
+.VPTeamPage :deep(.VPTeamMembers + .VPTeamPageSection) {
   margin-top: 64px;
 }
 
-:slotted(.VPTeamMembers + .VPTeamMembers) {
+.VPTeamPage :deep(.VPTeamPageTitle + .VPTeamMembers) {
+  margin-top: 32px;
+}
+
+.VPTeamPage :deep(.VPTeamMembers + .VPTeamMembers) {
   margin-top: 24px;
 }
 
 @media (min-width: 768px) {
-  :slotted(.VPTeamPageTitle + .VPTeamPageSection) {
+  .VPTeamPage :deep(.VPTeamPageTitle + .VPTeamPageSection) {
     margin-top: 16px;
   }
 
-  :slotted(.VPTeamPageSection + .VPTeamPageSection),
-  :slotted(.VPTeamMembers + .VPTeamPageSection) {
+  .VPTeamPage :deep(.VPTeamPageSection + .VPTeamPageSection),
+  .VPTeamPage :deep(.VPTeamMembers + .VPTeamPageSection) {
     margin-top: 96px;
   }
 }
-
-:slotted(.VPTeamMembers) {
-  padding: 0 24px;
-}
-
-@media (min-width: 768px) {
-  :slotted(.VPTeamMembers) {
-    padding: 0 48px;
-  }
-}
-
-@media (min-width: 960px) {
-  :slotted(.VPTeamMembers) {
-    padding: 0 64px;
-  }
-}
 </style>
diff --git a/src/client/theme-default/components/VPTeamPageSection.vue b/src/client/theme-default/components/VPTeamPageSection.vue
index 2bb52ab9..d4b98489 100644
--- a/src/client/theme-default/components/VPTeamPageSection.vue
+++ b/src/client/theme-default/components/VPTeamPageSection.vue
@@ -16,22 +16,6 @@
 </template>
 
 <style scoped>
-.VPTeamPageSection {
-  padding: 0 32px;
-}
-
-@media (min-width: 768px) {
-  .VPTeamPageSection {
-    padding: 0 48px;
-  }
-}
-
-@media (min-width: 960px) {
-  .VPTeamPageSection {
-    padding: 0 64px;
-  }
-}
-
 .title {
   position: relative;
   margin: 0 auto;
@@ -67,11 +51,10 @@
   text-align: center;
   line-height: 24px;
   font-size: 16px;
-  font-weight: 500;
   color: var(--vp-c-text-2);
 }
 
 .members {
-  padding-top: 40px;
+  padding-top: 24px;
 }
 </style>
diff --git a/src/client/theme-default/components/VPTeamPageTitle.vue b/src/client/theme-default/components/VPTeamPageTitle.vue
index 9751a188..d0f49fdb 100644
--- a/src/client/theme-default/components/VPTeamPageTitle.vue
+++ b/src/client/theme-default/components/VPTeamPageTitle.vue
@@ -11,22 +11,9 @@
 
 <style scoped>
 .VPTeamPageTitle {
-  padding: 48px 32px;
   text-align: center;
 }
 
-@media (min-width: 768px) {
-  .VPTeamPageTitle {
-    padding: 64px 48px 48px;
-  }
-}
-
-@media (min-width: 960px) {
-  .VPTeamPageTitle {
-    padding: 80px 64px 48px;
-  }
-}
-
 .title {
   letter-spacing: 0;
   line-height: 44px;
diff --git a/src/client/theme-default/styles/components/vp-doc.css b/src/client/theme-default/styles/components/vp-doc.css
index abc58243..96e04af3 100644
--- a/src/client/theme-default/styles/components/vp-doc.css
+++ b/src/client/theme-default/styles/components/vp-doc.css
@@ -523,21 +523,35 @@
 
 .vp-doc .VPTeamMembers {
   margin-top: 24px;
+  margin-bottom: 24px;
 }
 
-.vp-doc .VPTeamMembers.small.count-1 .container {
-  margin: 0 !important;
-  max-width: calc((100% - 24px) / 2) !important;
+@media (min-width: 512px) {
+  .VPTeamMembers.small.count-2 .item,
+  .VPTeamMembers.small.count-3 .item {
+    max-width: 100% !important;
+  }
 }
 
-.vp-doc .VPTeamMembers.small.count-2 .container,
-.vp-doc .VPTeamMembers.small.count-3 .container {
-  max-width: 100% !important;
-}
+@media (min-width: 768px) {
+  .vp-doc .VPTeamMembers.small .container,
+  .vp-doc .VPTeamMembers.medium .container {
+    grid-template-columns: repeat(2, 1fr) !important;
+  }
 
-.vp-doc .VPTeamMembers.medium.count-1 .container {
-  margin: 0 !important;
-  max-width: calc((100% - 24px) / 2) !important;
+  .vp-doc .VPTeamMembers.small.count-2 .container,
+  .vp-doc .VPTeamMembers.small.count-3 .container {
+    display: grid !important;
+    grid-template-columns: repeat(2, 1fr) !important;
+  }
+
+  .vp-doc .VPTeamMembers.small .item {
+    max-width: 100% !important;
+  }
+
+  .vp-doc .VPTeamMembers.small.count-1 .item {
+    max-width: 272px !important;
+  }
 }
 
 /**