Skip to content

Commit ffba23f

Browse files
Merge pull request #14416 from LedgerHQ/fix/layout-w40
fix(desktop): fix sidebar logo alignment and layout adjustments
2 parents 9d27a2d + 342fc4c commit ffba23f

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

.changeset/tasty-fans-roll.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"ledger-live-desktop": minor
3+
---
4+
5+
fix some layouts for TopBar and Logo

apps/ledger-live-desktop/src/mvvm/components/SideBar/SideBarView.tsx

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,16 @@ import {
1515
ExchangeFill,
1616
Gift,
1717
ShieldCheck,
18-
Chart2,
18+
Chart5,
19+
Chart5Fill,
1920
Compass,
2021
} from "@ledgerhq/lumen-ui-react/symbols";
2122
import { FeatureToggle } from "@ledgerhq/live-common/featureFlags/index";
2223
import React from "react";
2324
import { useTranslation } from "react-i18next";
2425
import type { SideBarViewModel } from "./types";
2526
import { AnimatedLogo } from "../AnimatedLogo";
27+
import { cn } from "LLD/utils/cn";
2628

2729
export interface SideBarViewProps {
2830
readonly viewModel: SideBarViewModel;
@@ -32,8 +34,13 @@ export function SideBarView({ viewModel }: SideBarViewProps) {
3234
const { t } = useTranslation();
3335

3436
return (
35-
<div className="grid h-full grid-rows-[auto_1fr] gap-24 pt-24 pb-40 pl-32">
36-
<div className="flex h-48 w-0 items-center justify-center justify-self-center overflow-visible">
37+
<div className="grid h-full grid-rows-[auto_1fr] gap-24 pt-32 pb-40 pl-32">
38+
<div
39+
className={cn(
40+
"flex h-48 w-0 items-center justify-center justify-self-center overflow-visible transition-transform duration-300",
41+
viewModel.collapsed && "translate-x-2",
42+
)}
43+
>
3744
<AnimatedLogo collapsed={viewModel.collapsed} />
3845
</div>
3946

@@ -65,8 +72,8 @@ export function SideBarView({ viewModel }: SideBarViewProps) {
6572
/>
6673
<SideBarItem
6774
value="earn"
68-
icon={Chart2}
69-
activeIcon={Chart2}
75+
icon={Chart5}
76+
activeIcon={Chart5Fill}
7077
label={viewModel.earnLabel}
7178
/>
7279
<SideBarItem

apps/ledger-live-desktop/src/mvvm/components/TopBar/TopBarView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const TopBarView = ({ actionsList }: TopBarViewProps) => {
3636
}, [navigate, location]);
3737

3838
return (
39-
<NavBar className="items-center px-32 py-24">
39+
<NavBar className="items-center px-32 pt-32 pb-24">
4040
<NavBarTitle className="h-48">
4141
<Breadcrumb />
4242
</NavBarTitle>

0 commit comments

Comments
 (0)