Skip to content

fix(tangle-cloud): sidebar, tab colors & instruction component fixes #3003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
devpavan04 merged 3 commits into from
Apr 24, 2025
Merged

fix(tangle-cloud): sidebar, tab colors & instruction component fixes #3003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b299112
fix: sidebar, tab colors, instruction component
devpavan04 Apr 24, 2025
c4d2d5b
Merge branch 'develop' into pavan/cloud-ui-fixes
devpavan04 Apr 24, 2025
40ca66b
Update apps/tangle-cloud/src/components/Layout.tsx
devpavan04 Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/tangle-cloud/src/components/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const Layout: FC<PropsWithChildren<Props>> = ({
isSidebarInitiallyExpanded,
}) => {
return (
<div className={`flex min-h-screen bg-tangle`}>
<div className="flex max-h-screen bg-tangle">
<Sidebar isExpandedByDefault={isSidebarInitiallyExpanded} />

<div className="flex flex-col flex-1 min-h-screen overflow-y-auto scrollbar-hide">
Expand Down
4 changes: 2 additions & 2 deletions apps/tangle-cloud/src/components/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const Sidebar: FC<Props> = ({ isExpandedByDefault }) => {
footer={SIDEBAR_FOOTER}
Logo={TangleCloudLogo}
pathnameOrHash={pathname}
className="hidden h-screen lg:block"
className="hidden h-screen lg:block !z-10"
isExpandedByDefault={isExpandedByDefault}
/>

Expand All @@ -88,7 +88,7 @@ const Sidebar: FC<Props> = ({ isExpandedByDefault }) => {
footer={SIDEBAR_FOOTER}
Logo={TangleCloudLogo}
pathnameOrHash={pathname}
className="fixed top-[34px] left-4 md:left-8 lg:hidden"
className="fixed top-[34px] left-4 md:left-8 lg:hidden !z-10"
/>
</>
);
Expand Down
11 changes: 8 additions & 3 deletions apps/tangle-cloud/src/pages/instances/InstructionCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ type InstructionCardProps = {
export const InstructionCard: FC<InstructionCardProps> = ({ rootProps }) => {
return (
<TangleCloudCard {...rootProps}>
<ul className="h-full flex flex-col gap-5">
<ul className="h-full flex flex-col justify-between gap-4">
{Children.toArray(
CLOUD_INSTRUCTIONS.map((instruction) => (
<ListItem
Expand All @@ -31,11 +31,16 @@ export const InstructionCard: FC<InstructionCardProps> = ({ rootProps }) => {
<div className="gap-1 flex flex-col items-center xs:items-start">
<Link
href={instruction.to}
className="text-blue-50 text-center xs:text-left font-bold"
target={instruction.external ? '_blank' : '_self'}
rel={instruction.external ? 'noopener noreferrer' : ''}
>
{instruction.title}
<Typography
variant="body1"
fw="bold"
className="!text-blue-50"
>
{instruction.title}
</Typography>
</Link>
<Typography
variant="body1"
Expand Down
4 changes: 1 addition & 3 deletions libs/ui-components/src/components/TableAndChartTabs/TableAndChartTabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,12 @@ export const TableAndChartTabs: FC<TableAndChartTabsProps> = ({
isDisableStyle
className={twMerge(
'text-mono-100 radix-state-active:text-mono-200',
'dark:radix-state-active:!text-mono-0',
'dark:text-mono-120 dark:radix-state-active:text-mono-0',
'flex gap-2 items-center',
cx({
'border-b-4 py-4': enableAdvancedDivider,
'aria-selected:border-blue-50 border-transparent':
enableAdvancedDivider,
'[&>*]:opacity-50 [&[aria-selected="true"]>*]:opacity-100':
enableAdvancedDivider,
}),
triggerClassName,
)}
Expand Down