From d165f99681502dd05e5d0fbfa0f116a4b78e86fb Mon Sep 17 00:00:00 2001 From: Kia King Ishii Date: Fri, 13 Jan 2023 02:23:53 +0900 Subject: [PATCH 1/3] working on --- .../theme-default/components/VPCarbonAds.vue | 23 ++-- .../theme-default/components/VPFooter.vue | 2 +- .../theme-default/components/VPLocalNav.vue | 6 +- .../theme-default/components/VPMenu.vue | 20 +--- .../theme-default/components/VPMenuGroup.vue | 4 +- .../theme-default/components/VPMenuLink.vue | 8 +- src/client/theme-default/components/VPNav.vue | 17 +-- .../theme-default/components/VPNavBar.vue | 14 +-- .../components/VPNavBarMenuLink.vue | 8 +- .../components/VPNavBarTitle.vue | 4 +- .../theme-default/components/VPNavScreen.vue | 4 +- .../components/VPNavScreenAppearance.vue | 4 +- .../components/VPNavScreenMenuGroup.vue | 2 +- .../components/VPNavScreenMenuGroupLink.vue | 4 +- .../components/VPNavScreenMenuLink.vue | 4 +- .../theme-default/components/VPSidebar.vue | 3 +- .../theme-default/components/VPSwitch.vue | 6 +- src/client/theme-default/styles/vars.css | 110 +++++++++++++----- 18 files changed, 121 insertions(+), 122 deletions(-) diff --git a/src/client/theme-default/components/VPCarbonAds.vue b/src/client/theme-default/components/VPCarbonAds.vue index b82b9e7fce06..8b0805e83755 100644 --- a/src/client/theme-default/components/VPCarbonAds.vue +++ b/src/client/theme-default/components/VPCarbonAds.vue @@ -47,7 +47,7 @@ if (carbonOptions) {
- diff --git a/src/client/theme-default/components/VPFooter.vue b/src/client/theme-default/components/VPFooter.vue index 381b82e89c35..47f818a4590f 100644 --- a/src/client/theme-default/components/VPFooter.vue +++ b/src/client/theme-default/components/VPFooter.vue @@ -19,7 +19,7 @@ const { hasSidebar } = useSidebar() .VPFooter { position: relative; z-index: var(--vp-z-index-footer); - border-top: 1px solid var(--vp-c-divider-light); + border-top: 1px solid var(--vp-c-black-pure); padding: 32px 24px; background-color: var(--vp-c-bg); } diff --git a/src/client/theme-default/components/VPLocalNav.vue b/src/client/theme-default/components/VPLocalNav.vue index a0a3a56e72c5..c0b3a40e4e0b 100644 --- a/src/client/theme-default/components/VPLocalNav.vue +++ b/src/client/theme-default/components/VPLocalNav.vue @@ -44,11 +44,11 @@ function scrollToTop() { display: flex; justify-content: space-between; align-items: center; - border-bottom: 1px solid var(--vp-c-divider-light); + border-bottom: 1px solid var(--vp-local-nav-border-color); + padding-top: var(--vp-layout-top-height, 0px); width: 100%; - background-color: var(--vp-c-bg); + background-color: var(--vp-local-nav-bg-color); transition: border-color 0.5s, background-color 0.5s; - padding-top: var(--vp-layout-top-height, 0px); } @media (min-width: 960px) { diff --git a/src/client/theme-default/components/VPMenu.vue b/src/client/theme-default/components/VPMenu.vue index 15249aca44f6..9c78532eabab 100644 --- a/src/client/theme-default/components/VPMenu.vue +++ b/src/client/theme-default/components/VPMenu.vue @@ -25,31 +25,21 @@ defineProps<{ border-radius: 12px; padding: 12px; min-width: 128px; - border: 1px solid var(--vp-c-divider-light); - background-color: var(--vp-c-bg); + border: 1px solid var(--vp-c-divider); + background-color: var(--vp-c-bg-elv-1); box-shadow: var(--vp-shadow-3); transition: background-color 0.5s; - max-height: calc(100vh - var(--vp-nav-height-mobile)); + max-height: calc(100vh - var(--vp-nav-height)); overflow-y: auto; } -@media (min-width: 960px) { - .VPMenu { - max-height: calc(100vh - var(--vp-nav-height-desktop)); - } -} - -.dark .VPMenu { - box-shadow: var(--vp-shadow-2); -} - .VPMenu :deep(.group) { margin: 0 -12px; padding: 0 12px 12px; } .VPMenu :deep(.group + .group) { - border-top: 1px solid var(--vp-c-divider-light); + border-top: 1px solid var(--vp-c-divider); padding: 11px 12px 12px; } @@ -58,7 +48,7 @@ defineProps<{ } .VPMenu :deep(.group + .item) { - border-top: 1px solid var(--vp-c-divider-light); + border-top: 1px solid var(--vp-c-divider); padding: 11px 16px 0; } diff --git a/src/client/theme-default/components/VPMenuGroup.vue b/src/client/theme-default/components/VPMenuGroup.vue index 167874bec037..3b44ed9faf27 100644 --- a/src/client/theme-default/components/VPMenuGroup.vue +++ b/src/client/theme-default/components/VPMenuGroup.vue @@ -20,7 +20,7 @@ defineProps<{ diff --git a/src/client/theme-default/components/VPNavBar.vue b/src/client/theme-default/components/VPNavBar.vue index 176d4490bc02..1dbb9cf03c7c 100644 --- a/src/client/theme-default/components/VPNavBar.vue +++ b/src/client/theme-default/components/VPNavBar.vue @@ -72,18 +72,6 @@ const { hasSidebar } = useSidebar() .VPNavBar.has-sidebar .content { margin-right: -100vw; padding-right: 100vw; - background: var(--vp-c-bg-alpha-without-backdrop); - } - - @supports ( - (backdrop-filter: saturate(50%) blur(8px)) or - (-webkit-backdrop-filter: saturate(50%) blur(8px)) - ) { - .VPNavBar.has-sidebar .content { - -webkit-backdrop-filter: saturate(50%) blur(8px); - backdrop-filter: saturate(50%) blur(8px); - background: var(--vp-c-bg-alpha-with-backdrop); - } } } @@ -115,7 +103,7 @@ const { hasSidebar } = useSidebar() margin-left: 8px; width: 1px; height: 24px; - background-color: var(--vp-c-divider-light); + background-color: var(--vp-c-divider); content: ""; } diff --git a/src/client/theme-default/components/VPNavBarMenuLink.vue b/src/client/theme-default/components/VPNavBarMenuLink.vue index f2a15e01b22c..8d8115477260 100644 --- a/src/client/theme-default/components/VPNavBarMenuLink.vue +++ b/src/client/theme-default/components/VPNavBarMenuLink.vue @@ -33,7 +33,7 @@ const { page } = useData() display: flex; align-items: center; padding: 0 12px; - line-height: var(--vp-nav-height-mobile); + line-height: var(--vp-nav-height); font-size: 14px; font-weight: 500; color: var(--vp-c-text-1); @@ -47,10 +47,4 @@ const { page } = useData() .VPNavBarMenuLink:hover { color: var(--vp-c-brand); } - -@media (min-width: 1280px) { - .VPNavBarMenuLink { - line-height: var(--vp-nav-height-desktop); - } -} diff --git a/src/client/theme-default/components/VPNavBarTitle.vue b/src/client/theme-default/components/VPNavBarTitle.vue index 4e8ea1f6b621..0166f08065b7 100644 --- a/src/client/theme-default/components/VPNavBarTitle.vue +++ b/src/client/theme-default/components/VPNavBarTitle.vue @@ -29,8 +29,8 @@ const { hasSidebar } = useSidebar() .VPNavBarTitle.has-sidebar { margin-right: 32px; width: calc(var(--vp-sidebar-width) - 64px); - border-bottom-color: var(--vp-c-divider-light); - background-color: var(--vp-c-bg-alt); + border-bottom-color: var(--vp-c-divider); +/* background-color: var(--vp-c-bg-alt);*/ } } diff --git a/src/client/theme-default/components/VPNavScreen.vue b/src/client/theme-default/components/VPNavScreen.vue index 1d4d58baa4c6..18d712b6f939 100644 --- a/src/client/theme-default/components/VPNavScreen.vue +++ b/src/client/theme-default/components/VPNavScreen.vue @@ -43,13 +43,13 @@ function unlockBodyScroll() { diff --git a/src/client/theme-default/components/VPNavScreenMenuGroup.vue b/src/client/theme-default/components/VPNavScreenMenuGroup.vue index d66e02c9aca3..25f70c76f43a 100644 --- a/src/client/theme-default/components/VPNavScreenMenuGroup.vue +++ b/src/client/theme-default/components/VPNavScreenMenuGroup.vue @@ -54,7 +54,7 @@ function toggle() { diff --git a/src/client/theme-default/components/VPFooter.vue b/src/client/theme-default/components/VPFooter.vue index 47f818a4590f..4e831ce5c2a4 100644 --- a/src/client/theme-default/components/VPFooter.vue +++ b/src/client/theme-default/components/VPFooter.vue @@ -19,7 +19,7 @@ const { hasSidebar } = useSidebar() .VPFooter { position: relative; z-index: var(--vp-z-index-footer); - border-top: 1px solid var(--vp-c-black-pure); + border-top: 1px solid var(--vp-c-gutter); padding: 32px 24px; background-color: var(--vp-c-bg); } diff --git a/src/client/theme-default/components/VPLocalNav.vue b/src/client/theme-default/components/VPLocalNav.vue index c0b3a40e4e0b..c77046a3ea06 100644 --- a/src/client/theme-default/components/VPLocalNav.vue +++ b/src/client/theme-default/components/VPLocalNav.vue @@ -44,7 +44,7 @@ function scrollToTop() { display: flex; justify-content: space-between; align-items: center; - border-bottom: 1px solid var(--vp-local-nav-border-color); + border-bottom: 1px solid var(--vp-c-gutter); padding-top: var(--vp-layout-top-height, 0px); width: 100%; background-color: var(--vp-local-nav-bg-color); diff --git a/src/client/theme-default/components/VPMenu.vue b/src/client/theme-default/components/VPMenu.vue index 9c78532eabab..ebe66623c539 100644 --- a/src/client/theme-default/components/VPMenu.vue +++ b/src/client/theme-default/components/VPMenu.vue @@ -26,7 +26,7 @@ defineProps<{ padding: 12px; min-width: 128px; border: 1px solid var(--vp-c-divider); - background-color: var(--vp-c-bg-elv-1); + background-color: var(--vp-c-bg-elv); box-shadow: var(--vp-shadow-3); transition: background-color 0.5s; max-height: calc(100vh - var(--vp-nav-height)); diff --git a/src/client/theme-default/components/VPMenuLink.vue b/src/client/theme-default/components/VPMenuLink.vue index 94bcb3507da6..695267d9935e 100644 --- a/src/client/theme-default/components/VPMenuLink.vue +++ b/src/client/theme-default/components/VPMenuLink.vue @@ -42,7 +42,7 @@ const { page } = useData() .link:hover { color: var(--vp-c-brand); - background-color: var(--vp-c-bg-elv-2); + background-color: var(--vp-c-bg-elv-mute); } .link.active { diff --git a/src/client/theme-default/components/VPNav.vue b/src/client/theme-default/components/VPNav.vue index 9c4f8612de72..9f3adcb90d9b 100644 --- a/src/client/theme-default/components/VPNav.vue +++ b/src/client/theme-default/components/VPNav.vue @@ -32,7 +32,6 @@ provide('close-screen', closeScreen) top: var(--vp-layout-top-height, 0px); left: 0; z-index: var(--vp-z-index-nav); - border-bottom: 1px solid var(--vp-c-gutter); width: 100%; background-color: var(--vp-nav-bg-color); pointer-events: none; diff --git a/src/client/theme-default/components/VPNavBar.vue b/src/client/theme-default/components/VPNavBar.vue index 1dbb9cf03c7c..76631ef9ae9d 100644 --- a/src/client/theme-default/components/VPNavBar.vue +++ b/src/client/theme-default/components/VPNavBar.vue @@ -23,10 +23,12 @@ const { hasSidebar } = useSidebar()