Merge pull request #493 from shuding/jp/fix/nav-and-layout

Fix navbar newWindow styles and raw layout centering
shuding · Jun 23, 2022 · 3dc74bd · 3dc74bd
2 parents 31a586c + 410b3f6
commit 3dc74bd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/packages/nextra-theme-docs/src/index.tsx b/packages/nextra-theme-docs/src/index.tsx
@@ -214,7 +214,8 @@ const Content: React.FC<LayoutProps> = ({
                 {activeType === 'page' ||
                 hideToc ||
                 themeContext.layout !== 'default' ? (
-                  themeContext.layout === 'full' ? null : (
+                  themeContext.layout === 'full' ||
+                  themeContext.layout === 'raw' ? null : (
                     <div className="nextra-toc w-64 hidden xl:block text-sm px-4 order-last flex-shrink-0" />
                   )
                 ) : (

diff --git a/packages/nextra-theme-docs/src/navbar.tsx b/packages/nextra-theme-docs/src/navbar.tsx
@@ -108,13 +108,17 @@ export default function Navbar({ flatDirectories, items }: NavBarProps) {
                       className={cn(
                         'nextra-nav-link',
                         'no-underline whitespace-nowrap p-2 -ml-2 hidden md:inline-block',
-                        isActive
-                          ? 'active text-current font-medium'
-                          : 'text-gray-600 hover:text-gray-800 dark:text-gray-400 dark:hover:text-gray-200'
+                        !isActive || page.newWindow
+                          ? 'text-gray-600 hover:text-gray-800 dark:text-gray-400 dark:hover:text-gray-200'
+                          : 'active text-current font-medium'
                       )}
                       aria-selected={isActive}
                       {...(page.newWindow
-                        ? { target: '_blank', rel: 'noopener noreferrer' }
+                        ? {
+                            target: '_blank',
+                            rel: 'noopener noreferrer',
+                            'aria-selected': false
+                          }
                         : {})}
                     >
                       {page.title}