diff options
Diffstat (limited to 'docs/src/components')
| -rw-r--r-- | docs/src/components/HeadCommon.astro | 8 | ||||
| -rw-r--r-- | docs/src/components/HeadSEO.astro | 10 | ||||
| -rw-r--r-- | docs/src/components/Header/Header.astro | 1 | ||||
| -rw-r--r-- | docs/src/components/Header/LanguageSelect.css | 37 | ||||
| -rw-r--r-- | docs/src/components/Header/LanguageSelect.tsx | 20 | ||||
| -rw-r--r-- | docs/src/components/Header/Search.css | 14 | ||||
| -rw-r--r-- | docs/src/components/Header/Search.tsx | 2 | ||||
| -rw-r--r-- | docs/src/components/LeftSidebar/LeftSidebar.astro | 8 | ||||
| -rw-r--r-- | docs/src/components/PageContent/PageContent.astro | 20 | ||||
| -rw-r--r-- | docs/src/components/RightSidebar/MoreMenu.astro | 2 |
10 files changed, 24 insertions, 98 deletions
diff --git a/docs/src/components/HeadCommon.astro b/docs/src/components/HeadCommon.astro index 9687c32a5..46fe72743 100644 --- a/docs/src/components/HeadCommon.astro +++ b/docs/src/components/HeadCommon.astro @@ -1,8 +1,6 @@ <!-- Global Metadata --> -<meta charset="utf-8" /> <meta name="viewport" content="width=device-width"> <link rel="icon" type="image/svg+xml" href="/favicon.svg"/> -<link rel="alternate icon" type="image/x-icon" href="/favicon.ico" /> <link rel="sitemap" href="/sitemap.xml"/> <!-- Global CSS --> @@ -30,10 +28,10 @@ </script> <!-- Global site tag (gtag.js) - Google Analytics --> -<script async src="https://www.googletagmanager.com/gtag/js?id=UA-130280175-15"></script> +<script async src="https://www.googletagmanager.com/gtag/js?id=G-TEL60V1WM9"></script> <script> window.dataLayer = window.dataLayer || []; function gtag(){dataLayer.push(arguments);} gtag('js', new Date()); - gtag('config', 'UA-130280175-15'); -</script> + gtag('config', 'G-TEL60V1WM9'); +</script>
\ No newline at end of file diff --git a/docs/src/components/HeadSEO.astro b/docs/src/components/HeadSEO.astro index be6b016c7..5553eb2d0 100644 --- a/docs/src/components/HeadSEO.astro +++ b/docs/src/components/HeadSEO.astro @@ -5,10 +5,8 @@ export interface Props { site: any, canonicalURL: URL | string, }; -const { - content = {}, - canonicalURL, - } = Astro.props; +const { content = {}, canonicalURL } = Astro.props; +const formattedContentTitle = content.title ? `${content.title} 🚀 ${SITE.title}` : SITE.title; const imageSrc = content?.image?.src ?? OPEN_GRAPH.image.src; const canonicalImageSrc = new URL(imageSrc, Astro.site); const imageAlt = content?.image?.alt ?? OPEN_GRAPH.image.alt; @@ -17,7 +15,7 @@ const imageAlt = content?.image?.alt ?? OPEN_GRAPH.image.alt; <link rel="canonical" href={canonicalURL}/> <!-- OpenGraph Tags --> -<meta property="og:title" content={content.title ?? SITE.title}/> +<meta property="og:title" content={formattedContentTitle}/> <meta property="og:type" content="article"/> <meta property="og:url" content={canonicalURL}/> <meta property="og:locale" content={content.ogLocale ?? OPEN_GRAPH.locale}/> @@ -29,7 +27,7 @@ const imageAlt = content?.image?.alt ?? OPEN_GRAPH.image.alt; <!-- Twitter Tags --> <meta name="twitter:card" content="summary_large_image"/> <meta name="twitter:site" content={OPEN_GRAPH.twitter}/> -<meta name="twitter:title" content={content.title ?? SITE.title}/> +<meta name="twitter:title" content={formattedContentTitle}/> <meta name="twitter:description" content={content.description ? content.description : SITE.description}/> <meta name="twitter:image" content={canonicalImageSrc}/> <meta name="twitter:image:alt" content={imageAlt}/> diff --git a/docs/src/components/Header/Header.astro b/docs/src/components/Header/Header.astro index 968ba69b2..8471e4ebf 100644 --- a/docs/src/components/Header/Header.astro +++ b/docs/src/components/Header/Header.astro @@ -23,7 +23,6 @@ const lang = currentPage && getLanguageFromURL(currentPage); .logo { - direction: ltr; display: flex; overflow: hidden; width: 30px; diff --git a/docs/src/components/Header/LanguageSelect.css b/docs/src/components/Header/LanguageSelect.css index 5411e50dc..b95ef5048 100644 --- a/docs/src/components/Header/LanguageSelect.css +++ b/docs/src/components/Header/LanguageSelect.css @@ -3,13 +3,13 @@ width: 48px; box-sizing: border-box; margin: 0; - padding: 0.33em 2rem; + padding: 0.33em 0.5em; overflow: visible; font-weight: 500; font-size: 1rem; font-family: inherit; line-height: inherit; - background-color: var(--theme-bg); + background-color: transparent; border-color: var(--theme-text-lighter); color: var(--theme-text-light); border-style: solid; @@ -21,7 +21,8 @@ transition-duration: 0.2s; transition-property: border-color, color; -webkit-font-smoothing: antialiased; - -webkit-appearance: none; + padding-left: 30px; + padding-right: 1rem; } .language-select-wrapper .language-select:hover, .language-select-wrapper .language-select:focus { @@ -34,37 +35,13 @@ } .language-select-wrapper > svg { position: absolute; - top: 8px; - left: 8px; - pointer-events: none; -} - -.language-select-wrapper::before, -.language-select-wrapper::after { - position: absolute; - top: 18px; - content: ''; - width: 8px; - height: 1px; - background: var(--theme-text-light); -} -.language-select-wrapper::before { - right: 10px; - transform: rotate(45deg); -} -.language-select-wrapper::after { - right: 5px; - transform: rotate(-45deg); + top: 7px; + left: 10px; + z-index: -1; } @media (min-width: 50em) { .language-select { width: 100%; } - .language-select-wrapper::before { - right: 16px; - } - .language-select-wrapper::after { - right: 11px; - } } diff --git a/docs/src/components/Header/LanguageSelect.tsx b/docs/src/components/Header/LanguageSelect.tsx index 6385afdd3..46e3dd0f3 100644 --- a/docs/src/components/Header/LanguageSelect.tsx +++ b/docs/src/components/Header/LanguageSelect.tsx @@ -68,25 +68,7 @@ const LanguageSelect: FunctionalComponent<{ lang: string }> = ({ lang }) => { <span>简体中文</span> </option> <option value="zh-TW"> - <span>正體中文</span> - </option> - <option value="bg"> - <span>Български</span> - </option> - <option value="fr"> - <span>Français</span> - </option> - <option value="bn"> - <span>বাংলা</span> - </option> - <option value="kr"> - <span>한국어</span> - </option> - <option value="ar"> - <span>العربية</span> - </option> - <option value="da"> - <span>Dansk</span> + <span>繁体中文</span> </option> </select> </div> diff --git a/docs/src/components/Header/Search.css b/docs/src/components/Header/Search.css index 563f67bc5..b11a59290 100644 --- a/docs/src/components/Header/Search.css +++ b/docs/src/components/Header/Search.css @@ -3,17 +3,6 @@ --docsearch-primary-color: var(--theme-accent); --docsearch-logo-color: var(--theme-text); } - -.DocSearch-Modal .DocSearch-Hit a { - box-shadow: none; - border: 1px solid var(--theme-accent); -} - -/** Style Search Bar */ -.search-placeholder { - flex-grow: 1; - text-align: initial; -} .search-input { flex-grow: 1; box-sizing: border-box; @@ -51,6 +40,9 @@ color: var(--theme-text-light); } .search-hint { + position: absolute; + top: 7px; + right: 19px; padding: 3px 5px; display: none; display: none; diff --git a/docs/src/components/Header/Search.tsx b/docs/src/components/Header/Search.tsx index 5f05f744f..a1684e49f 100644 --- a/docs/src/components/Header/Search.tsx +++ b/docs/src/components/Header/Search.tsx @@ -51,7 +51,7 @@ export default function Search() { strokeLinejoin="round" /> </svg> - <span className="search-placeholder">Search</span> + <span>Search</span> <span className="search-hint"> <span className="sr-only">Press </span> <kbd>/</kbd> diff --git a/docs/src/components/LeftSidebar/LeftSidebar.astro b/docs/src/components/LeftSidebar/LeftSidebar.astro index 1960dbb04..a065797cc 100644 --- a/docs/src/components/LeftSidebar/LeftSidebar.astro +++ b/docs/src/components/LeftSidebar/LeftSidebar.astro @@ -1,11 +1,9 @@ --- import { SIDEBAR } from '../../config.ts'; -import { getLanguageFromURL, removeLeadingSlash, removeTrailingSlash } from '../../util.ts'; +import { getLanguageFromURL } from '../../util.ts'; const {currentPage} = Astro.props; - -// Get the slug w/o a leading or trailing slash -const currentPageMatch = removeLeadingSlash(removeTrailingSlash(currentPage)); -const langCode = getLanguageFromURL(currentPage); +const currentPageMatch = currentPage.slice(1); +const langCode = 'en'; // getLanguageFromURL(currentPage); // SIDEBAR is a flat array. Group it by sections to properly render. const sidebarSections = SIDEBAR[langCode].reduce((col, item) => { if (item.header) { diff --git a/docs/src/components/PageContent/PageContent.astro b/docs/src/components/PageContent/PageContent.astro index 564b8485b..fd1e9d242 100644 --- a/docs/src/components/PageContent/PageContent.astro +++ b/docs/src/components/PageContent/PageContent.astro @@ -1,17 +1,9 @@ --- -const {content, githubEditUrl, currentPage} = Astro.props; +const {content, githubEditUrl} = Astro.props; const title = content.title; const headers = content.astro.headers; import MoreMenu from '../RightSidebar/MoreMenu.astro'; import TableOfContents from '../RightSidebar/TableOfContents.tsx'; -import {getLanguageFromURL} from '../../util.ts'; -import {SIDEBAR} from '../../config.ts'; -const langCode = getLanguageFromURL(currentPage); -const links = SIDEBAR[langCode].filter(x => x.link && typeof x.header === 'undefined'); -// handle cases with a trailing slash or not -const index = links.findIndex(x => `/${x.link}/` === currentPage || `/${x.link}` === currentPage); -const next = index !== -1 ? (index === links.length - 1 ? null : links[index + 1]) : null; -const previous = index !== -1 ? (index === 0 ? null : links[index - 1]) : null; --- <style> .content { @@ -46,14 +38,4 @@ const previous = index !== -1 ? (index === 0 ? null : links[index - 1]) : null; <nav class="block sm:hidden"> <MoreMenu editHref={githubEditUrl}/> </nav> - { - (previous || next) && <aside> - { - previous && <div>Previous Article: <a rel="prev" href={new URL(previous.link, Astro.site).pathname}>{previous.text}</a></div> - } - { - next && <div>Next Article: <a rel="next" href={new URL(next.link, Astro.site).pathname}>{next.text}</a></div> - } - </aside> - } </article>
\ No newline at end of file diff --git a/docs/src/components/RightSidebar/MoreMenu.astro b/docs/src/components/RightSidebar/MoreMenu.astro index 6be2d86ee..88a31da28 100644 --- a/docs/src/components/RightSidebar/MoreMenu.astro +++ b/docs/src/components/RightSidebar/MoreMenu.astro @@ -64,5 +64,5 @@ const {editHref} = Astro.props; </li> </ul> <div style="margin: 2rem 0; text-align: center;"> - <ThemeToggleButton client:visible /> + <ThemeToggleButton client:idle /> </div> |
