Skip to content

Commit e29cd73

Browse files
committed
fix: update sidebar styles for inset and floating variants
1 parent f678d73 commit e29cd73

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

packages/@primereact/styles/src/sidebar/Sidebar.style.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ const theme = /*css*/ `
122122
.p-sidebar[data-side="right"][data-collapsible="offcanvas"] .p-sidebar-rail { left: -1.5px; }
123123
.p-sidebar[data-side="right"][data-collapsible="offcanvas"] .p-sidebar-rail::after { left: auto; right: 100%; transform: none; }
124124
125-
.p-sidebar-inset { position: relative; display: flex; width: 100%; flex: 1; flex-direction: column; background-color: light-dark(var(--p-surface-0), var(--p-surface-950)); }
125+
.p-sidebar-inset { position: relative; display: flex; width: 100%; flex: 1; flex-direction: column; background-color: light-dark(var(--p-surface-50), var(--p-surface-900)); }
126126
.p-sidebar[data-variant="inset"] ~ .p-sidebar-inset, .p-sidebar-inset:has(~ .p-sidebar[data-variant="inset"]) { background-color: light-dark(var(--p-surface-0), var(--p-surface-950)); margin: 0.5rem; border-radius: 0.75rem; box-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.05); }
127127
`;
128128

packages/@primereact/styles/src/sidebar/SidebarLayout.style.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ import type { SidebarRootInstance } from '@primereact/types/primitive/sidebar';
33

44
const theme = /*css*/ `
55
.p-sidebar-layout { display: flex; min-height: 100svh; width: 100%; }
6-
.p-sidebar-layout:has([data-variant="inset"]) { background-color: light-dark(var(--p-surface-50), var(--p-surface-900)); }
6+
.p-sidebar-layout:has([data-variant="inset"]), .p-sidebar-layout:has([data-variant="floating"]) { background-color: light-dark(var(--p-surface-50), var(--p-surface-900)); }
77
88
.p-sidebar-inset { position: relative; display: flex; width: 100%; flex: 1; flex-direction: column; background-color: light-dark(var(--p-surface-50), var(--p-surface-900)); }
99
.p-sidebar[data-variant="inset"] ~ .p-sidebar-inset { background-color: light-dark(var(--p-surface-0), var(--p-surface-950)); margin: 0.5rem; border-radius: 0.75rem; box-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.05); }
1010
11-
.p-sidebar-backdrop { z-index: 25; }
11+
.p-sidebar-backdrop { z-index: 15; }
1212
.p-sidebar-backdrop.p-overlay-mask { pointer-events: auto; }
1313
`;
1414

packages/tailwind/src/sidebar.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import {
3030
import * as React from 'react';
3131

3232
function SidebarLayout({ className, ...props }: SidebarLayoutProps) {
33-
return <PRSidebar.Layout className={cn('flex min-h-svh w-full has-[[data-variant=inset]]:bg-surface-50 dark:has-[[data-variant=inset]]:bg-surface-900', className)} {...props} />;
33+
return <PRSidebar.Layout className={cn('flex min-h-svh w-full has-[[data-variant=inset]]:bg-surface-50 dark:has-[[data-variant=inset]]:bg-surface-900 has-[[data-variant=floating]]:bg-surface-50 dark:has-[[data-variant=floating]]:bg-surface-900', className)} {...props} />;
3434
}
3535

3636
function Sidebar({ className, ...props }: SidebarRootProps) {
@@ -305,7 +305,7 @@ function SidebarInset({ className, ...props }: SidebarInsetProps) {
305305
return (
306306
<PRSidebar.Inset
307307
className={cn(
308-
`relative flex w-full flex-1 flex-col bg-surface-0 dark:bg-surface-950
308+
`relative flex w-full flex-1 flex-col bg-surface-50 dark:bg-surface-900
309309
[[data-variant=inset]~&]:bg-surface-0 dark:[[data-variant=inset]~&]:bg-surface-950 [[data-variant=inset]~&]:m-2 [[data-variant=inset]~&]:rounded-xl [[data-variant=inset]~&]:shadow-sm
310310
[&:has(~[data-variant=inset])]:bg-surface-0 dark:[&:has(~[data-variant=inset])]:bg-surface-950 [&:has(~[data-variant=inset])]:m-2 [&:has(~[data-variant=inset])]:rounded-xl [&:has(~[data-variant=inset])]:shadow-sm`,
311311
className
@@ -316,7 +316,7 @@ function SidebarInset({ className, ...props }: SidebarInsetProps) {
316316
}
317317

318318
function SidebarBackdrop({ className, ...props }: SidebarBackdropProps) {
319-
return <PRSidebar.Backdrop className={cn('fixed inset-0 z-25 bg-black/50 opacity-100 data-enter-from:opacity-0 data-leave-to:opacity-0 transition-opacity duration-150 ease-out', className)} {...props} />;
319+
return <PRSidebar.Backdrop className={cn('fixed inset-0 z-15 bg-black/50 opacity-100 data-enter-from:opacity-0 data-leave-to:opacity-0 transition-opacity duration-150 ease-out', className)} {...props} />;
320320
}
321321

322322
export {

0 commit comments

Comments
 (0)