+
-
+
-
{ad.companyTagline}
+
{closeable ? (
diff --git a/packages/gitbook/src/components/DocumentView/CodeBlock/theme.css b/packages/gitbook/src/components/DocumentView/CodeBlock/theme.css
index 21c0fd5791..d11c538f58 100644
--- a/packages/gitbook/src/components/DocumentView/CodeBlock/theme.css
+++ b/packages/gitbook/src/components/DocumentView/CodeBlock/theme.css
@@ -1,3 +1,5 @@
+@reference "../../RootLayout/globals.css";
+
:root {
--shiki-color-text: theme("colors.tint.11");
--shiki-token-punctuation: theme("colors.tint.11");
diff --git a/packages/gitbook/src/components/DocumentView/DocumentView.tsx b/packages/gitbook/src/components/DocumentView/DocumentView.tsx
index 724a7f2b05..b93bf8853f 100644
--- a/packages/gitbook/src/components/DocumentView/DocumentView.tsx
+++ b/packages/gitbook/src/components/DocumentView/DocumentView.tsx
@@ -85,7 +85,7 @@ export function DocumentViewSkeleton(props: { document: JSONDocument; blockStyle
style={[
'mx-auto w-full decoration-primary/6',
block.data && 'fullWidth' in block.data && block.data.fullWidth
- ? 'max-w-screen-xl'
+ ? 'max-w-(--breakpoint-xl)'
: 'max-w-3xl',
blockStyle,
]}
diff --git a/packages/gitbook/src/components/DocumentView/Expandable/Details.tsx b/packages/gitbook/src/components/DocumentView/Expandable/Details.tsx
index 8f835acf41..f997225a21 100644
--- a/packages/gitbook/src/components/DocumentView/Expandable/Details.tsx
+++ b/packages/gitbook/src/components/DocumentView/Expandable/Details.tsx
@@ -50,12 +50,12 @@ export function Details(props: {
'border-b-0',
'border-tint-subtle',
//all
- '[&]:mt-[0px]',
+ 'mt-0!',
//select first child
- '[&:first-child]:mt-5',
- '[&:first-child]:rounded-t-lg',
+ 'first:mt-5!',
+ 'first:rounded-t-lg',
//select first in group
- '[:not(&)_+&]:mt-5',
+ '[:not(&)_+&]:mt-5!',
'[:not(&)_+&]:rounded-t-lg',
//select last in group
'[&:not(:has(+_&))]:mb-5',
diff --git a/packages/gitbook/src/components/DocumentView/Heading.tsx b/packages/gitbook/src/components/DocumentView/Heading.tsx
index cb11038321..8893d8fb8b 100644
--- a/packages/gitbook/src/components/DocumentView/Heading.tsx
+++ b/packages/gitbook/src/components/DocumentView/Heading.tsx
@@ -40,10 +40,10 @@ export function Heading(props: BlockProps) {
'w-7',
'border-0',
'opacity-0',
- 'group-hover:opacity-[0]',
- 'group-focus:opacity-[0]',
- 'md:group-hover:md:opacity-[1]',
- 'md:group-focus:md:opacity-[1]',
+ 'group-hover:opacity-0',
+ 'group-focus:opacity-0',
+ 'md:md:group-hover:opacity-11',
+ 'md:md:group-focus:opacity-11',
textStyle.marginTop
)}
>
@@ -70,7 +70,7 @@ export function Heading(props: BlockProps) {
*:first-child {
@@ -145,7 +147,7 @@
}
.openapi-column-preview-body {
- @apply flex flex-col gap-4 sticky top-4 site-header:top-20 site-header-sections:top-32 page-api-block:xl:max-2xl:top-32 print-mode:static;
+ @apply flex flex-col gap-4 sticky top-4 site-header:top-20 site-header-sections:top-32 xl:max-2xl:page-api-block:top-32 print-mode:static;
}
.openapi-column-preview pre {
@@ -158,7 +160,7 @@
}
.openapi-schema-root-description.openapi-markdown {
- @apply prose-sm text-balance mt-1.5 !text-[0.813rem] text-tint overflow-hidden !font-normal select-text prose-strong:font-semibold prose-strong:text-inherit;
+ @apply prose-sm text-balance mt-1.5 text-[0.813rem]! text-tint overflow-hidden font-normal! select-text prose-strong:font-semibold prose-strong:text-inherit;
}
.openapi-section-schemas > .openapi-section-body > .openapi-schema-root-description {
@@ -273,7 +275,7 @@
/* Schema Description */
.openapi-schema-description.openapi-markdown {
- @apply prose-sm text-tint overflow-hidden text-pretty !font-normal select-text prose-strong:font-semibold prose-strong:text-inherit;
+ @apply prose-sm text-tint overflow-hidden text-pretty font-normal! select-text prose-strong:font-semibold prose-strong:text-inherit;
}
.openapi-schema-description.openapi-markdown pre:has(code) {
@@ -302,7 +304,7 @@
.openapi-schema-pattern code,
.openapi-schema-enum-value code,
.openapi-schema-default code {
- @apply py-px px-1 min-w-[1.625rem] text-tint-strong font-normal w-fit justify-center items-center ring-1 ring-inset ring-tint-subtle bg-tint rounded text-xs leading-[calc(max(1.20em,1.25rem))] before:!content-none after:!content-none;
+ @apply py-px px-1 min-w-[1.625rem] text-tint-strong font-normal w-fit justify-center items-center ring-1 ring-inset ring-tint-subtle bg-tint rounded text-xs leading-[calc(max(1.20em,1.25rem))] before:content-none! after:!content-none;
}
/* Authentication */
@@ -315,7 +317,7 @@
}
.openapi-securities-description.openapi-markdown {
- @apply prose-sm text-tint !font-normal select-text text-pretty prose-strong:font-semibold prose-strong:text-inherit;
+ @apply prose-sm text-tint font-normal! select-text text-pretty prose-strong:font-semibold prose-strong:text-inherit;
}
.openapi-securities-label {
@@ -341,7 +343,7 @@
}
.openapi-requestbody-description.openapi-markdown {
- @apply prose-sm text-tint !font-normal text-pretty select-text prose-strong:font-semibold prose-strong:text-inherit;
+ @apply prose-sm text-tint font-normal! text-pretty select-text prose-strong:font-semibold prose-strong:text-inherit;
}
/* Responses */
@@ -440,7 +442,7 @@
}
.openapi-path-variable {
- @apply p-px min-w-[1.625rem] text-tint-strong font-normal w-fit justify-center items-center ring-1 ring-inset ring-tint bg-tint rounded text-sm leading-none before:!content-none after:!content-none;
+ @apply p-px min-w-[1.625rem] text-tint-strong font-normal w-fit justify-center items-center ring-1 ring-inset ring-tint bg-tint rounded text-sm leading-none before:content-none! after:!content-none;
}
.openapi-path-server {
@@ -585,7 +587,7 @@ body:has(.openapi-select-popover) {
.openapi-select-item {
@apply text-sm flex items-center cursor-pointer px-1.5 overflow-hidden py-1 *:truncate text-tint ring-0 border-none rounded !outline-none;
- @apply hover:bg-tint-hover theme-gradient:hover:bg-tint-12/1 hover:text-tint-strong contrast-more:hover:ring-1 contrast-more:hover:ring-inset contrast-more:hover:ring-current;
+ @apply hover:bg-tint-hover hover:theme-gradient:bg-tint-12/1 hover:text-tint-strong contrast-more:hover:ring-1 contrast-more:hover:ring-inset contrast-more:hover:ring-current;
}
.openapi-select button .openapi-markdown,
@@ -596,7 +598,7 @@ body:has(.openapi-select-popover) {
.openapi-select-item-selected,
.openapi-select-item-selected .openapi-markdown {
@apply text-primary-subtle hover:text-primary hover:bg-primary-hover;
- @apply theme-muted:hover:bg-primary-active theme-gradient:hover:bg-primary-active tint:font-semibold;
+ @apply hover:theme-muted:bg-primary-active hover:theme-gradient:bg-primary-active tint:font-semibold;
@apply contrast-more:text-primary contrast-more:hover:text-primary-strong contrast-more:font-semibold;
}
@@ -670,7 +672,7 @@ body:has(.openapi-select-popover) {
}
.openapi-tabs-tab[aria-selected="true"] {
- @apply !text-primary-subtle after:absolute after:-bottom-[calc(0.375rem_+_1px)] after:z-20 after:left-0 after:w-full after:h-px after:bg-primary-solid after:transition-all;
+ @apply text-primary-subtle! after:absolute after:-bottom-[calc(0.375rem+1px)] after:z-20 after:left-0 after:w-full after:h-px after:bg-primary-solid after:transition-all;
}
.openapi-tabs-panel {
@@ -680,7 +682,7 @@ body:has(.openapi-select-popover) {
/* Disclosure group */
.openapi-disclosure-group {
- @apply border-tint-subtle transition-all border-b border-x overflow-auto last:rounded-b-md straight-corners:last:rounded-none first:rounded-t-md straight-corners:first:rounded-none first:border-t relative;
+ @apply border-tint-subtle transition-all border-b border-x overflow-auto last:rounded-b-md last:straight-corners:rounded-none first:rounded-t-md first:straight-corners:rounded-none first:border-t relative;
}
.openapi-disclosure-group:has(.openapi-disclosure-group-trigger:hover) {
@@ -729,7 +731,7 @@ body:has(.openapi-select-popover) {
/* Disclosure */
.openapi-schemas-disclosure > .openapi-disclosure-trigger {
- @apply flex items-center font-mono transition-all text-tint-strong !text-sm hover:bg-tint-subtle relative flex-1 gap-2.5 p-3 truncate -outline-offset-1;
+ @apply flex items-center font-mono transition-all text-tint-strong text-sm! hover:bg-tint-subtle relative flex-1 gap-2.5 p-3 truncate -outline-offset-1;
}
.openapi-schemas-disclosure > .openapi-disclosure-trigger,
@@ -742,7 +744,7 @@ body:has(.openapi-select-popover) {
}
.openapi-schema .openapi-schema-properties .openapi-schema {
- @apply animate-fadeIn [animation-fill-mode:both];
+ animation: fadeIn 0.2s ease-in-out both;
}
.openapi-schemas-disclosure > .openapi-disclosure-trigger[aria-expanded="true"] > svg {
@@ -804,7 +806,8 @@ body:has(.openapi-select-popover) {
.openapi-disclosure-trigger:hover > .openapi-disclosure-trigger-label span,
.openapi-disclosure-trigger[aria-expanded="true"] > .openapi-disclosure-trigger-label span {
- @apply block animate-fadeIn;
+ @apply block;
+ animation: fadeIn 0.2s ease-in-out both;
}
@media (hover: none) {
diff --git a/packages/gitbook/src/components/DocumentView/Table/RecordCard.tsx b/packages/gitbook/src/components/DocumentView/Table/RecordCard.tsx
index 2a246d13c6..3b39343633 100644
--- a/packages/gitbook/src/components/DocumentView/Table/RecordCard.tsx
+++ b/packages/gitbook/src/components/DocumentView/Table/RecordCard.tsx
@@ -64,11 +64,11 @@ export async function RecordCard(
// - If the file is square or portrait, we display it left with 40% of the card width
coverIsSquareOrPortrait
? [
- 'grid-cols-[40%,_1fr]',
+ 'grid-cols-[40%__1fr]',
'min-[432px]:grid-cols-none',
- 'min-[432px]:grid-rows-[auto,1fr]',
+ 'min-[432px]:grid-rows-[auto_1fr]',
]
- : 'grid-rows-[auto,1fr]'
+ : 'grid-rows-[auto_1fr]'
)}
>
{cover ? (
diff --git a/packages/gitbook/src/components/DocumentView/Table/RecordColumnValue.tsx b/packages/gitbook/src/components/DocumentView/Table/RecordColumnValue.tsx
index aa1bf45b86..7b1e2d5f6d 100644
--- a/packages/gitbook/src/components/DocumentView/Table/RecordColumnValue.tsx
+++ b/packages/gitbook/src/components/DocumentView/Table/RecordColumnValue.tsx
@@ -306,7 +306,7 @@ export async function RecordColumnValue(
className={tcls(
'text-sm',
'whitespace-pre',
- 'rounded',
+ 'rounded-sm',
'py-1',
'px-2',
'bg-primary',
diff --git a/packages/gitbook/src/components/DocumentView/Table/table.module.css b/packages/gitbook/src/components/DocumentView/Table/table.module.css
index 53065b9d67..c2d6386d57 100644
--- a/packages/gitbook/src/components/DocumentView/Table/table.module.css
+++ b/packages/gitbook/src/components/DocumentView/Table/table.module.css
@@ -1,3 +1,5 @@
+@reference "../../RootLayout/globals.css";
+
/* Detect whether a scrollbar exists on the table */
@keyframes detect-scroll {
from,
diff --git a/packages/gitbook/src/components/DocumentView/Tabs/DynamicTabs.tsx b/packages/gitbook/src/components/DocumentView/Tabs/DynamicTabs.tsx
index 38afbcf086..a167922a8d 100644
--- a/packages/gitbook/src/components/DocumentView/Tabs/DynamicTabs.tsx
+++ b/packages/gitbook/src/components/DocumentView/Tabs/DynamicTabs.tsx
@@ -141,7 +141,7 @@ export function DynamicTabs(
) {
}
function Keyboard(props: MarkedLeafProps) {
- return (
-
- {props.children}
-
- );
+ return {props.children};
}
function Superscript(props: MarkedLeafProps) {
@@ -100,7 +96,7 @@ function Code(props: MarkedLeafProps) {
'ring-inset',
'ring-tint',
'bg-tint',
- 'rounded',
+ 'rounded-sm',
// Text size is proportional to the font-size of the parent element
'text-[.875em]',
// We ensure that the code is not making the parent bigger, especially in headings
diff --git a/packages/gitbook/src/components/Footer/Footer.tsx b/packages/gitbook/src/components/Footer/Footer.tsx
index 776c0a4af4..ed640085ff 100644
--- a/packages/gitbook/src/components/Footer/Footer.tsx
+++ b/packages/gitbook/src/components/Footer/Footer.tsx
@@ -37,10 +37,10 @@ export function Footer(props: { context: GitBookSiteContext }) {
className={tcls(
'mx-auto grid max-w-3xl justify-between gap-12 lg:max-w-none',
'grid-cols-[auto_auto]',
- 'lg:grid-cols-[18rem_minmax(auto,_48rem)_auto]',
- 'xl:grid-cols-[18rem_minmax(auto,_48rem)_14rem]',
- 'page-no-toc:lg:grid-cols-[minmax(auto,_48rem)_auto]',
- 'page-no-toc:xl:grid-cols-[14rem_minmax(auto,_48rem)_14rem]'
+ 'lg:grid-cols-[18rem_minmax(auto,48rem)_auto]',
+ 'xl:grid-cols-[18rem_minmax(auto,48rem)_14rem]',
+ 'lg:page-no-toc:grid-cols-[minmax(auto,48rem)_auto]',
+ 'xl:page-no-toc:grid-cols-[14rem_minmax(auto,48rem)_14rem]'
)}
>
{
@@ -69,8 +69,8 @@ export function Footer(props: { context: GitBookSiteContext }) {
'lg:max-h-12',
'object-contain',
'object-left',
- 'rounded',
- 'straight-corners:rounded-sm',
+ 'rounded-sm',
+ 'straight-corners:rounded-xs',
]}
sizes={[
{
@@ -98,7 +98,7 @@ export function Footer(props: { context: GitBookSiteContext }) {
customization.footer.groups?.length > 0 ? (
diff --git a/packages/gitbook/src/components/Footer/FooterLinksGroup.tsx b/packages/gitbook/src/components/Footer/FooterLinksGroup.tsx
index dd2de59ebe..0e47c8ff08 100644
--- a/packages/gitbook/src/components/Footer/FooterLinksGroup.tsx
+++ b/packages/gitbook/src/components/Footer/FooterLinksGroup.tsx
@@ -46,14 +46,14 @@ async function FooterLink(props: { link: CustomizationContentLink; context: GitB
className={tcls(
'font-normal',
'text-tint',
- 'links-default:hover:text-primary',
- 'links-default:tint:hover:text-tint-strong',
+ 'hover:links-default:text-primary',
+ 'hover:tint:links-default:text-tint-strong',
'contrast-more:underline',
'contrast-more:text-tint-strong',
'underline-offset-2',
- 'links-accent:hover:underline',
+ 'hover:links-accent:underline',
'links-accent:underline-offset-4',
'links-accent:decoration-primary-subtle',
'links-accent:decoration-[3px]'
diff --git a/packages/gitbook/src/components/Header/DropdownMenu.tsx b/packages/gitbook/src/components/Header/DropdownMenu.tsx
index 8f51e4685c..e2b0900b3d 100644
--- a/packages/gitbook/src/components/Header/DropdownMenu.tsx
+++ b/packages/gitbook/src/components/Header/DropdownMenu.tsx
@@ -60,7 +60,7 @@ export function DropdownMenu(props: {
>
@@ -124,11 +124,11 @@ export function DropdownMenuItem(
const { children, active = false, href, className, insights } = props;
const itemClassName = tcls(
- 'rounded straight-corners:rounded-sm px-3 py-1 text-sm',
+ 'rounded-sm straight-corners:rounded-xs px-3 py-1 text-sm',
active
- ? 'bg-primary text-primary-strong data-[highlighted]:bg-primary-hover'
- : 'data-[highlighted]:bg-tint-hover',
- 'focus:outline-none',
+ ? 'bg-primary text-primary-strong data-highlighted:bg-primary-hover'
+ : 'data-highlighted:bg-tint-hover',
+ 'focus:outline-hidden',
className
);
@@ -156,7 +156,7 @@ export function DropdownSubMenu(props: { children: React.ReactNode; label: React
return (
-
+
{label}
@@ -166,7 +166,7 @@ export function DropdownSubMenu(props: { children: React.ReactNode; label: React
collisionPadding={8}
className="z-40 animate-present"
>
-
+
{children}
diff --git a/packages/gitbook/src/components/Header/Header.tsx b/packages/gitbook/src/components/Header/Header.tsx
index 35c2583c41..178312f28a 100644
--- a/packages/gitbook/src/components/Header/Header.tsx
+++ b/packages/gitbook/src/components/Header/Header.tsx
@@ -83,7 +83,7 @@ export function Header(props: { context: GitBookSiteContext; withTopHeader?: boo
'text-tint-strong',
'theme-bold:text-header-link',
'hover:bg-tint-hover',
- 'theme-bold:hover:bg-header-link/3',
+ 'hover:theme-bold:bg-header-link/3',
'page-no-toc:hidden'
)}
/>
@@ -106,9 +106,9 @@ export function Header(props: { context: GitBookSiteContext; withTopHeader?: boo
'lg:max-w-lg',
'lg:ml-[max(calc((100%-18rem-48rem-3rem)/2),1.5rem)]', // container (100%) - sidebar (18rem) - content (48rem) - margin (3rem)
'xl:ml-[max(calc((100%-18rem-48rem-14rem-3rem)/2),1.5rem)]', // container (100%) - sidebar (18rem) - content (48rem) - outline (14rem) - margin (3rem)
- 'page-no-toc:lg:ml-[max(calc((100%-18rem-48rem-18rem-3rem)/2),0rem)]',
- 'page-full-width:lg:ml-[max(calc((100%-18rem-103rem-3rem)/2),1.5rem)]',
- 'page-full-width:2xl:ml-[max(calc((100%-18rem-96rem-14rem+3rem)/2),1.5rem)]',
+ 'lg:page-no-toc:ml-[max(calc((100%-18rem-48rem-18rem-3rem)/2),0rem)]',
+ 'lg:page-full-width:ml-[max(calc((100%-18rem-103rem-3rem)/2),1.5rem)]',
+ '2xl:page-full-width:ml-[max(calc((100%-18rem-96rem-14rem+3rem)/2),1.5rem)]',
'md:mr-auto',
'order-last',
'md:order-[unset]',
@@ -120,28 +120,28 @@ export function Header(props: { context: GitBookSiteContext; withTopHeader?: boo
@@ -199,7 +199,7 @@ export function Header(props: { context: GitBookSiteContext; withTopHeader?: boo
'grow',
'flex',
'items-end',
- 'page-default-width:2xl:px-[calc((100%-1536px+4rem)/2)]'
+ '2xl:page-default-width:px-[calc((100%-1536px+4rem)/2)]'
)}
>
{siteSpaces.length > 1 && (
diff --git a/packages/gitbook/src/components/Header/HeaderLink.tsx b/packages/gitbook/src/components/Header/HeaderLink.tsx
index fcfb28c723..b9decf88bf 100644
--- a/packages/gitbook/src/components/Header/HeaderLink.tsx
+++ b/packages/gitbook/src/components/Header/HeaderLink.tsx
@@ -119,9 +119,9 @@ function HeaderItemButton(
className={tcls(
{
'button-primary':
- 'theme-bold:bg-header-link theme-bold:text-header-background theme-bold:shadow-none theme-bold:hover:bg-header-link theme-bold:hover:text-header-background theme-bold:hover:shadow-none',
+ 'theme-bold:bg-header-link theme-bold:text-header-background theme-bold:shadow-none hover:theme-bold:bg-header-link hover:theme-bold:text-header-background hover:theme-bold:shadow-none',
'button-secondary': tcls(
- 'theme-bold:bg-header-link/2 theme-gradient:bg-tint-base theme-muted:bg-tint-base theme-bold:text-header-link theme-bold:shadow-none theme-bold:ring-header-link/4 theme-bold:hover:bg-header-link/3 theme-bold:hover:text-header-link theme-bold:hover:shadow-none theme-bold:hover:ring-header-link/5 theme-bold:contrast-more:bg-header-background theme-bold:contrast-more:text-header-link theme-bold:contrast-more:ring-header-link theme-bold:contrast-more:hover:ring-header-link'
+ 'theme-bold:bg-header-link/2 theme-gradient:bg-tint-base theme-muted:bg-tint-base theme-bold:text-header-link theme-bold:shadow-none theme-bold:ring-header-link/4 hover:theme-bold:bg-header-link/3 hover:theme-bold:text-header-link hover:theme-bold:shadow-none hover:theme-bold:ring-header-link/5 contrast-more:theme-bold:bg-header-background contrast-more:theme-bold:text-header-link contrast-more:theme-bold:ring-header-link contrast-more:hover:theme-bold:ring-header-link'
),
}[linkStyle]
)}
@@ -146,20 +146,20 @@ function getHeaderLinkClassName(_props: { headerPreset: CustomizationHeaderPrese
'truncate',
'text-tint',
- 'links-default:hover:text-primary',
- 'links-default:data-[state=open]:text-primary',
- 'links-default:tint:hover:text-tint-strong',
- 'links-default:tint:data-[state=open]:text-tint-strong',
+ 'hover:links-default:text-primary',
+ 'data-[state=open]:links-default:text-primary',
+ 'hover:tint:links-default:text-tint-strong',
+ 'data-[state=open]:tint:links-default:text-tint-strong',
'underline-offset-2',
- 'links-accent:hover:underline',
- 'links-accent:data-[state=open]:underline',
+ 'hover:links-accent:underline',
+ 'data-[state=open]:links-accent:underline',
'links-accent:underline-offset-4',
'links-accent:decoration-primary-subtle',
'links-accent:decoration-[3px]',
'links-accent:py-0.5', // Prevent underline from being cut off at the bottom
'theme-bold:text-header-link',
- 'theme-bold:hover:text-header-link'
+ 'hover:theme-bold:text-header-link'
);
}
diff --git a/packages/gitbook/src/components/Header/HeaderLinkMore.tsx b/packages/gitbook/src/components/Header/HeaderLinkMore.tsx
index 7954b80ec4..ddaa4b56c2 100644
--- a/packages/gitbook/src/components/Header/HeaderLinkMore.tsx
+++ b/packages/gitbook/src/components/Header/HeaderLinkMore.tsx
@@ -31,7 +31,7 @@ export function HeaderLinkMore(props: {
'hover:text-primary',
'dark:hover:text-primary',
'theme-bold:text-header-link',
- 'theme-bold:hover:text-header-link/8',
+ 'hover:theme-bold:text-header-link/8',
'flex',
'gap-1',
'items-center'
diff --git a/packages/gitbook/src/components/Header/HeaderLogo.tsx b/packages/gitbook/src/components/Header/HeaderLogo.tsx
index 08a1d2d10a..912c76615d 100644
--- a/packages/gitbook/src/components/Header/HeaderLogo.tsx
+++ b/packages/gitbook/src/components/Header/HeaderLogo.tsx
@@ -48,14 +48,14 @@ export async function HeaderLogo(props: HeaderLogoProps) {
]}
priority="high"
style={tcls(
- 'rounded',
- 'straight-corners:rounded-sm',
+ 'rounded-sm',
+ 'straight-corners:rounded-xs',
'overflow-hidden',
'shrink',
'min-w-0',
'max-w-40',
'lg:max-w-64',
- 'site-header-none:page-no-toc:lg:max-w-56',
+ 'lg:page-no-toc:site-header-none:max-w-56',
'max-h-10',
'lg:max-h-12',
'h-full',
diff --git a/packages/gitbook/src/components/Header/HeaderMobileMenu.tsx b/packages/gitbook/src/components/Header/HeaderMobileMenu.tsx
index 3b1668579d..3b0ed49dfc 100644
--- a/packages/gitbook/src/components/Header/HeaderMobileMenu.tsx
+++ b/packages/gitbook/src/components/Header/HeaderMobileMenu.tsx
@@ -47,7 +47,7 @@ export function HeaderMobileMenu(props: Partial
diff --git a/packages/gitbook/src/components/Header/SpacesDropdown.tsx b/packages/gitbook/src/components/Header/SpacesDropdown.tsx
index 9728216b74..aa3ba3dba7 100644
--- a/packages/gitbook/src/components/Header/SpacesDropdown.tsx
+++ b/packages/gitbook/src/components/Header/SpacesDropdown.tsx
@@ -19,7 +19,7 @@ export function SpacesDropdown(props: {
@@ -96,7 +96,7 @@ export function PageAside(props: {
@@ -131,16 +131,16 @@ export function PageAside(props: {
'sticky',
'lg:top:0',
- 'site-header:lg:top-16',
- 'site-header-sections:lg:top-[6.75rem]',
+ 'lg:site-header:top-16',
+ 'lg:site-header-sections:top-[6.75rem]',
'gap-6',
'pt-8',
- 'page-api-block:xl:max-2xl:py-0',
+ 'xl:max-2xl:page-api-block:py-0',
// Hide it for api page, until hovered
- 'page-api-block:xl:max-2xl:hidden',
- 'page-api-block:xl:max-2xl:group-hover/aside:flex'
+ 'xl:max-2xl:page-api-block:hidden',
+ 'xl:max-2xl:group-hover/aside:page-api-block:flex'
)}
>
{document ? (
@@ -159,7 +159,7 @@ export function PageAside(props: {
'border-tint-subtle',
'py-4',
'first:pt-0',
- 'page-api-block:xl:max-2xl:px-3',
+ 'xl:max-2xl:page-api-block:px-3',
'empty:hidden'
)}
>
@@ -178,10 +178,10 @@ export function PageAside(props: {
'items-center',
'text-sm',
'hover:text-tint-strong',
- 'links-accent:hover:underline',
- 'links-accent:hover:underline-offset-4',
- 'links-accent:hover:decoration-[3px]',
- 'links-accent:hover:decoration-primary-subtle',
+ 'hover:links-accent:underline',
+ 'hover:links-accent:underline-offset-4',
+ 'hover:links-accent:decoration-[3px]',
+ 'hover:links-accent:decoration-primary-subtle',
'py-2'
)}
>
@@ -207,10 +207,10 @@ export function PageAside(props: {
'items-center',
'text-sm',
'hover:text-tint-strong',
- 'links-accent:hover:underline',
- 'links-accent:hover:underline-offset-4',
- 'links-accent:hover:decoration-[3px]',
- 'links-accent:hover:decoration-primary-subtle',
+ 'hover:links-accent:underline',
+ 'hover:links-accent:underline-offset-4',
+ 'hover:links-accent:decoration-[3px]',
+ 'hover:links-accent:decoration-primary-subtle',
'py-2'
)}
>
@@ -228,8 +228,8 @@ export function PageAside(props: {
) : null}
{/* Mode Switcher */}
diff --git a/packages/gitbook/src/components/PageAside/ScrollSectionsList.tsx b/packages/gitbook/src/components/PageAside/ScrollSectionsList.tsx
index d9b02ebdf8..c3972f6a9b 100644
--- a/packages/gitbook/src/components/PageAside/ScrollSectionsList.tsx
+++ b/packages/gitbook/src/components/PageAside/ScrollSectionsList.tsx
@@ -85,7 +85,7 @@ export function ScrollSectionsList(props: { sections: DocumentSection[] }) {
'sidebar-list-line:rounded-l-none',
'hover:bg-tint-hover',
- 'theme-gradient:hover:bg-tint-12/1',
+ 'hover:theme-gradient:bg-tint-12/1',
'hover:text-tint-strong',
'contrast-more:hover:ring-1',
'contrast-more:hover:ring-inset',
@@ -110,9 +110,9 @@ export function ScrollSectionsList(props: { sections: DocumentSection[] }) {
'sidebar-list-line:ml-px',
'hover:bg-primary-hover',
- 'theme-muted:hover:bg-primary-active',
- '[html.sidebar-filled.theme-bold.tint_&]:hover:bg-primary-active',
- 'theme-gradient:hover:bg-primary-active',
+ 'hover:theme-muted:bg-primary-active',
+ 'hover:[html.sidebar-filled.theme-bold.tint_&]:bg-primary-active',
+ 'hover:theme-gradient:bg-primary-active',
'tint:font-semibold',
'contrast-more:font-semibold',
@@ -123,7 +123,7 @@ export function ScrollSectionsList(props: { sections: DocumentSection[] }) {
>
{section.tag ? (
{section.tag}
diff --git a/packages/gitbook/src/components/PageBody/PageBody.tsx b/packages/gitbook/src/components/PageBody/PageBody.tsx
index 6d548dec95..e101ad07b9 100644
--- a/packages/gitbook/src/components/PageBody/PageBody.tsx
+++ b/packages/gitbook/src/components/PageBody/PageBody.tsx
@@ -40,9 +40,9 @@ export function PageBody(props: {
// Allow words to break if they are too long.
'break-anywhere',
// When in api page mode without the aside, we align with the border of the main content
- 'page-api-block:xl:max-2xl:pr-0',
+ 'xl:max-2xl:page-api-block:pr-0',
// Max size to ensure one column in api is aligned with rest of content (2 x 3xl) + (gap-3 + 2) * px-12
- 'page-api-block:mx-auto page-api-block:max-w-screen-2xl',
+ 'page-api-block:mx-auto page-api-block:max-w-(--breakpoint-2xl)',
// page.layout.tableOfContents ? null : 'xl:ml-56',
asFullWidth ? 'page-full-width' : 'page-default-width',
page.layout.tableOfContents ? 'page-has-toc' : 'page-no-toc'
diff --git a/packages/gitbook/src/components/PageBody/PageFooterNavigation.tsx b/packages/gitbook/src/components/PageBody/PageFooterNavigation.tsx
index 620cb5970d..fcabec46fd 100644
--- a/packages/gitbook/src/components/PageBody/PageFooterNavigation.tsx
+++ b/packages/gitbook/src/components/PageBody/PageFooterNavigation.tsx
@@ -106,7 +106,7 @@ function NavigationCard(
reversed ? 'pl-4' : null,
'border',
'border-tint-subtle',
- 'rounded',
+ 'rounded-sm',
'straight-corners:rounded-none',
'hover:border-primary',
'text-pretty',
diff --git a/packages/gitbook/src/components/PageFeedback/PageFeedbackForm.tsx b/packages/gitbook/src/components/PageFeedback/PageFeedbackForm.tsx
index 551a8b83f5..e737604dac 100644
--- a/packages/gitbook/src/components/PageFeedback/PageFeedbackForm.tsx
+++ b/packages/gitbook/src/components/PageFeedback/PageFeedbackForm.tsx
@@ -94,7 +94,7 @@ export function PageFeedbackForm(props: {