Skip to content

Commit 702f630

Browse files
committed
Fix for full width env selector
1 parent ff65c75 commit 702f630

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

apps/webapp/app/components/navigation/EnvironmentSelector.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export function EnvironmentSelector({
5757
button={
5858
<PopoverTrigger
5959
className={cn(
60-
"group flex h-8 w-full items-center rounded pl-[0.4375rem] transition-colors hover:bg-charcoal-750",
60+
"group flex h-8 items-center rounded pl-[0.4375rem] transition-colors hover:bg-charcoal-750",
6161
isCollapsed ? "justify-center pr-0.5" : "justify-between pr-1",
6262
className
6363
)}
@@ -87,7 +87,7 @@ export function EnvironmentSelector({
8787
side="right"
8888
sideOffset={8}
8989
hidden={!isCollapsed}
90-
buttonClassName="!h-8 w-full"
90+
buttonClassName="!h-8"
9191
asChild
9292
disableHoverableContent
9393
/>

apps/webapp/app/components/navigation/SideMenu.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ export function SideMenu({
217217
organization={organization}
218218
project={project}
219219
environment={environment}
220+
className="w-full"
220221
isCollapsed={isCollapsed}
221222
/>
222223
{environment.type === "DEVELOPMENT" && project.engine === "V2" && (
@@ -251,7 +252,7 @@ export function SideMenu({
251252
</div>
252253
</div>
253254

254-
<div className="w-full space-y-px">
255+
<div className="w-full">
255256
<SideMenuItem
256257
name="Tasks"
257258
icon={TaskIconSmall}
@@ -348,7 +349,11 @@ export function SideMenu({
348349
)}
349350
</div>
350351

351-
<SideMenuSection title="Manage" isSideMenuCollapsed={isCollapsed}>
352+
<SideMenuSection
353+
title="Manage"
354+
isSideMenuCollapsed={isCollapsed}
355+
itemSpacingClassName="space-y-0"
356+
>
352357
<SideMenuItem
353358
name="Bulk actions"
354359
icon={ListCheckedIcon}

apps/webapp/app/components/navigation/SideMenuSection.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ type Props = {
99
children: React.ReactNode;
1010
/** When true, hides the section header and shows only children */
1111
isSideMenuCollapsed?: boolean;
12+
itemSpacingClassName?: string;
1213
};
1314

1415
/** A collapsible section for the side menu
@@ -20,6 +21,7 @@ export function SideMenuSection({
2021
onCollapseToggle,
2122
children,
2223
isSideMenuCollapsed = false,
24+
itemSpacingClassName = "space-y-px",
2325
}: Props) {
2426
const [isCollapsed, setIsCollapsed] = useState(initialCollapsed);
2527

@@ -86,7 +88,7 @@ export function SideMenuSection({
8688
style={{ overflow: "hidden" }}
8789
>
8890
<motion.div
89-
className="w-full space-y-px"
91+
className={`w-full ${itemSpacingClassName}`}
9092
variants={{
9193
expanded: {
9294
translateY: 0,

0 commit comments

Comments
 (0)