This is an automated email from the ASF dual-hosted git repository.
jeffreyh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris-website.git
The following commit(s) were added to refs/heads/master by this push:
new e8808918265 [fix] show dropdown menu && optimize navbar (#1537)
e8808918265 is described below
commit e8808918265f532fa8da1f6692002f18d87f70ba
Author: yangon <[email protected]>
AuthorDate: Wed Dec 18 17:10:50 2024 +0800
[fix] show dropdown menu && optimize navbar (#1537)
### Summary
1. Show dropdown menu.
2. Optimize the switching interaction of `navbar`.
3. Update download url.
4. Style.
---------
Co-authored-by: liyang <[email protected]>
---
src/constant/download.data.ts | 14 +++++-----
src/scss/common.scss | 7 -----
src/scss/components/navbar.scss | 20 ---------------
src/theme/Navbar/Content/index.tsx | 30 ++++++++--------------
src/theme/NavbarItem/DropdownNavbarItem/index.tsx | 2 +-
src/theme/NavbarItem/DropdownNavbarItem/style.scss | 2 +-
src/theme/SearchBar/SearchBar.jsx | 25 ++++++++++++------
src/theme/SearchBar/SearchBar.module.css | 7 ++++-
8 files changed, 43 insertions(+), 64 deletions(-)
diff --git a/src/constant/download.data.ts b/src/constant/download.data.ts
index 28add3c6451..957bac81628 100644
--- a/src/constant/download.data.ts
+++ b/src/constant/download.data.ts
@@ -50,7 +50,7 @@ export const DORIS_VERSIONS: Option[] = [
gz: `${ORIGIN}apache-doris-3.0.3-bin-x64.tar.gz`,
asc: `${ORIGIN}apache-doris-3.0.3-bin-x64.tar.gz.asc`,
sha512: `${ORIGIN}apache-doris-3.0.3-bin-x64.tar.gz.sha512`,
- source: 'https://downloads.apache.org/doris/3.0/3.0.3-rc03/',
+ source: 'https://downloads.apache.org/doris/3.0/3.0.3-rc04/',
version: '3.0.3',
},
{
@@ -59,7 +59,7 @@ export const DORIS_VERSIONS: Option[] = [
gz: `${ORIGIN}apache-doris-3.0.3-bin-x64-noavx2.tar.gz`,
asc: `${ORIGIN}apache-doris-3.0.3-bin-x64-noavx2.tar.gz.asc`,
sha512:
`${ORIGIN}apache-doris-3.0.3-bin-x64-noavx2.tar.gz.sha512`,
- source: 'https://downloads.apache.org/doris/3.0/3.0.2-rc03/',
+ source: 'https://downloads.apache.org/doris/3.0/3.0.3-rc04/',
version: '3.0.3',
},
{
@@ -68,8 +68,8 @@ export const DORIS_VERSIONS: Option[] = [
gz: `${ORIGIN}apache-doris-3.0.3-bin-arm64.tar.gz`,
asc: `${ORIGIN}apache-doris-3.0.3-bin-arm64.tar.gz.asc`,
sha512: `${ORIGIN}apache-doris-3.0.3-bin-arm64.tar.gz.sha512`,
- source: 'https://downloads.apache.org/doris/3.0/3.0.3-rc03/',
- version: '3.0.2',
+ source: 'https://downloads.apache.org/doris/3.0/3.0.3-rc04/',
+ version: '3.0.3',
},
],
},
@@ -170,7 +170,7 @@ export const ALL_VERSIONS: AllVersionOption[] = [
gz: `${ORIGIN}apache-doris-3.0.3-bin-x64.tar.gz`,
asc: `${ORIGIN}apache-doris-3.0.3-bin-x64.tar.gz.asc`,
sha512:
`${ORIGIN}apache-doris-3.0.3-bin-x64.tar.gz.sha512`,
- source:
'https://downloads.apache.org/doris/3.0/3.0.3-rc03/',
+ source:
'https://downloads.apache.org/doris/3.0/3.0.3-rc04/',
version: '3.0.3',
},
{
@@ -179,7 +179,7 @@ export const ALL_VERSIONS: AllVersionOption[] = [
gz:
`${ORIGIN}apache-doris-3.0.3-bin-x64-noavx2.tar.gz`,
asc:
`${ORIGIN}apache-doris-3.0.3-bin-x64-noavx2.tar.gz.asc`,
sha512:
`${ORIGIN}apache-doris-3.0.3-bin-x64-noavx2.tar.gz.sha512`,
- source:
'https://downloads.apache.org/doris/3.0/3.0.3-rc03/',
+ source:
'https://downloads.apache.org/doris/3.0/3.0.3-rc04/',
version: '3.0.3',
},
{
@@ -188,7 +188,7 @@ export const ALL_VERSIONS: AllVersionOption[] = [
gz: `${ORIGIN}apache-doris-3.0.3-bin-arm64.tar.gz`,
asc:
`${ORIGIN}apache-doris-3.0.3-bin-arm64.tar.gz.asc`,
sha512:
`${ORIGIN}apache-doris-3.0.3-bin-arm64.tar.gz.sha512`,
- source:
'https://downloads.apache.org/doris/3.0/3.0.3-rc03/',
+ source:
'https://downloads.apache.org/doris/3.0/3.0.3-rc04/',
version: '3.0.3',
},
],
diff --git a/src/scss/common.scss b/src/scss/common.scss
index 34383f06fc7..8a68fb62ae0 100644
--- a/src/scss/common.scss
+++ b/src/scss/common.scss
@@ -1,12 +1,5 @@
@media screen and (max-width: 996px) {
.docs-wrapper {
- .navbar__inner {
- .navbar__items--right {
- .custom-navbar-item {
- display: none;
- }
- }
- }
.navbar__bottom {
display: block;
}
diff --git a/src/scss/components/navbar.scss b/src/scss/components/navbar.scss
index 12588c4c46f..37c48568333 100644
--- a/src/scss/components/navbar.scss
+++ b/src/scss/components/navbar.scss
@@ -24,32 +24,15 @@
}
}
- .custom-navbar-item {
- display: none;
- }
&.docs {
.docs-search {
display: block;
}
- .custom-navbar-item {
- display: block;
- }
- }
- &.community {
- .custom-navbar-item:nth-child(3) {
- display: block;
- }
}
&.withoutDoc {
.docs-search {
display: block;
}
- .custom-navbar-item {
- display: block;
- }
- .custom-navbar-item:nth-child(4) {
- display: none;
- }
}
&__inner {
padding: 0 5rem;
@@ -481,9 +464,6 @@
.docs-search {
display: none;
}
- .custom-navbar-item {
- display: none;
- }
.navbar__search-input {
background: transparent var(--ifm-navbar-search-input-icon)
no-repeat 0.75rem center / 2rem 2rem;
border: none;
diff --git a/src/theme/Navbar/Content/index.tsx
b/src/theme/Navbar/Content/index.tsx
index 21dbba7cb8c..c213024ec22 100644
--- a/src/theme/Navbar/Content/index.tsx
+++ b/src/theme/Navbar/Content/index.tsx
@@ -46,21 +46,7 @@ ${JSON.stringify(item, null, 2)}`,
);
}
-function NavbarContentLayout({
- left,
- right,
- bottom,
-}: {
- left: ReactNode;
- right: ReactNode;
- bottom: ReactNode;
-}) {
- const [isEN, setIsEN] = useState(true);
- useEffect(() => {
- if (typeof window !== 'undefined') {
- location.pathname.includes('zh-CN') ? setIsEN(false) :
setIsEN(true);
- }
- }, [typeof window !== 'undefined' && location.pathname]);
+function NavbarContentLayout({ left, right, bottom }: { left: ReactNode;
right: ReactNode; bottom: ReactNode }) {
return (
<>
<div className="navbar__inner">
@@ -72,13 +58,19 @@ function NavbarContentLayout({
);
}
+const getCurrentNavBar = (pathname: string) => {
+ if (pathname.includes(NavBar.DOCS)) return NavBar.DOCS;
+ if (pathname.split('/')[1] === NavBar.COMMUNITY ||
pathname.includes('zh-CN/community')) return NavBar.COMMUNITY;
+ return NavBar.COMMON;
+};
+
export default function NavbarContent(): ReactNode {
- const [currentNavbar, setCurrentNavbar] = useState(NavBar.DOCS);
- const mobileSidebar = useNavbarMobileSidebar();
- const { showSearchPageMobile } = useContext(DataContext);
const location = useLocation();
+ const [currentNavbar, setCurrentNavbar] =
useState(getCurrentNavBar(location.pathname));
+ const [isEN, setIsEN] = useState(!location.pathname.includes('zh-CN'));
- const [isEN, setIsEN] = useState(true);
+ const mobileSidebar = useNavbarMobileSidebar();
+ const { showSearchPageMobile } = useContext(DataContext);
const [star, setStar] = useState<string>('');
async function getGithubStar() {
diff --git a/src/theme/NavbarItem/DropdownNavbarItem/index.tsx
b/src/theme/NavbarItem/DropdownNavbarItem/index.tsx
index 7e2ac1c0515..0de6c5d32b9 100644
--- a/src/theme/NavbarItem/DropdownNavbarItem/index.tsx
+++ b/src/theme/NavbarItem/DropdownNavbarItem/index.tsx
@@ -51,7 +51,7 @@ function DropdownNavbarItemDesktop({ items, position,
className, onClick, ...pro
return (
<div
ref={dropdownRef}
- className={clsx('custom-navbar-item', 'navbar__item', 'dropdown',
'dropdown--hoverable', {
+ className={clsx('navbar__item', 'dropdown', 'dropdown--hoverable',
{
'dropdown--right': position === 'right',
'dropdown--show': showDropdown,
})}
diff --git a/src/theme/NavbarItem/DropdownNavbarItem/style.scss
b/src/theme/NavbarItem/DropdownNavbarItem/style.scss
index 3dda44fd957..47b287dbe08 100644
--- a/src/theme/NavbarItem/DropdownNavbarItem/style.scss
+++ b/src/theme/NavbarItem/DropdownNavbarItem/style.scss
@@ -1,4 +1,4 @@
-.custom-navbar-item.dropdown {
+.dropdown {
& > .navbar__link {
display: flex;
align-items: center;
diff --git a/src/theme/SearchBar/SearchBar.jsx
b/src/theme/SearchBar/SearchBar.jsx
index b180e444b4c..0a48cc4a7cb 100644
--- a/src/theme/SearchBar/SearchBar.jsx
+++ b/src/theme/SearchBar/SearchBar.jsx
@@ -319,13 +319,16 @@ export default function SearchBar({ handleSearchBarToggle
}) {
setFocused(true);
handleSearchBarToggle?.(true);
}, [handleSearchBarToggle, loadIndex]);
- const onInputBlur = useCallback((e) => {
- if(document.body.clientWidth < 996 && e.code === "Enter"){
- return;
- }
- setFocused(false);
- handleSearchBarToggle?.(false);
- }, [handleSearchBarToggle]);
+ const onInputBlur = useCallback(
+ e => {
+ if (document.body.clientWidth < 996 && e.code === 'Enter') {
+ return;
+ }
+ setFocused(false);
+ handleSearchBarToggle?.(false);
+ },
+ [handleSearchBarToggle],
+ );
const onInputMouseEnter = useCallback(() => {
loadIndex();
}, [loadIndex]);
@@ -440,7 +443,13 @@ export default function SearchBar({ handleSearchBarToggle
}) {
) : (
isBrowser && (
<div className={styles.searchHintContainer}>
- <kbd className={styles.searchHint}>{isMac ? '⌘' :
'ctrl'}</kbd>
+ <kbd
+ className={clsx(styles.searchHint, {
+ [styles.macFontStyle]: isMac,
+ })}
+ >
+ {isMac ? '⌘' : 'ctrl'}
+ </kbd>
<kbd className={styles.searchHint}>K</kbd>
</div>
)
diff --git a/src/theme/SearchBar/SearchBar.module.css
b/src/theme/SearchBar/SearchBar.module.css
index 75eb4360fbb..39d9af8c829 100644
--- a/src/theme/SearchBar/SearchBar.module.css
+++ b/src/theme/SearchBar/SearchBar.module.css
@@ -258,7 +258,7 @@ html[data-theme="dark"] .noResultsIcon {
border: none !important;
border-radius: none !important;
box-shadow: none !important;
- font-size: 12px !important;
+ font-size: 12px;
padding: 0 !important;
}
@@ -305,6 +305,11 @@ html[data-theme="dark"] .noResultsIcon {
box-shadow: inset 0 -1px 0 var(--ifm-color-emphasis-500);
}
+.macFontStyle{
+ font-weight: 600;
+ font-size: 1rem !important;
+}
+
html[dir="rtl"] .searchHintContainer {
right: auto;
left: 10px;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
