Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 frontend/src/container/AppLayout/AppLayout.styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
}

.app-content {
width: calc(100% - 64px); // width of the sidebar
width: calc(100% - 54px); // width of the sidebar
z-index: 0;

margin: 0 auto;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
.ant-pagination {
position: fixed;
bottom: 0;
width: calc(100% - 64px);
width: calc(100% - 54px);
background: rgb(18, 19, 23);
padding: 16px;
margin: 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@
.ant-pagination {
position: fixed;
bottom: 0;
width: calc(100% - 64px);
width: calc(100% - 54px);
background: var(--bg-ink-500);
padding: 16px;
margin: 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
overflow-y: auto;
box-sizing: border-box;

height: calc(100% - 64px);
height: calc(100% - 54px);

&::-webkit-scrollbar {
height: 1rem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
.ant-pagination {
position: fixed;
bottom: 0;
width: calc(100% - 64px);
width: calc(100% - 54px);
background: var(--bg-ink-500);
padding: 16px;
margin: 0;
Expand Down
24 changes: 18 additions & 6 deletions frontend/src/container/SideNav/NavItem/NavItem.styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
.nav-item-active-marker {
background: #4e74f8;
}

.nav-item-data {
.nav-item-label {
color: var(--bg-vanilla-100, #fff);
}
}
}

&.disabled {
Expand All @@ -27,14 +33,14 @@

.nav-item-data {
color: white;
background: var(--Slate-500, #161922);
background: var(--bg-slate-500, #161922);
}
}

&.active {
.nav-item-data {
color: white;
background: var(--Slate-500, #161922);
background: var(--bg-slate-500, #161922);
// color: #3f5ecc;
}
}
Expand All @@ -50,9 +56,9 @@

.nav-item-data {
flex-grow: 1;
max-width: calc(100% - 24px);
max-width: calc(100% - 20px);
display: flex;
margin: 0px 8px;
margin: 0px 0px 0px 6px;
padding: 2px 8px;
flex-direction: row;
align-items: center;
Expand All @@ -68,7 +74,7 @@

background: transparent;

transition: 0.2s all linear;
transition: 0.08s all ease;

border-radius: 3px;

Expand Down Expand Up @@ -100,7 +106,7 @@

&:hover {
.nav-item-label {
color: var(--Vanilla-100, #fff);
color: var(--bg-vanilla-100, #fff);
}

.nav-item-pin-icon {
Expand All @@ -120,6 +126,12 @@
.nav-item-active-marker {
background: #4e74f8;
}

.nav-item-data {
.nav-item-label {
color: var(--bg-slate-500);
}
}
}

&:hover {
Expand Down
31 changes: 18 additions & 13 deletions frontend/src/container/SideNav/NavItem/NavItem.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
/* eslint-disable jsx-a11y/no-static-element-interactions */
/* eslint-disable jsx-a11y/click-events-have-key-events */
import { Tag } from 'antd';
import { Tag, Tooltip } from 'antd';
import cx from 'classnames';
import { Pin, PinOff } from 'lucide-react';

import { SidebarItem } from '../sideNav.types';

import './NavItem.styles.scss';
import './NavItem.styles.scss';

export default function NavItem({
Expand Down Expand Up @@ -74,21 +75,25 @@ export default function NavItem({
)}

{onTogglePin && !isPinned && (
<Pin
size={12}
className="nav-item-pin-icon"
onClick={handleTogglePinClick}
color="var(--Vanilla-400, #c0c1c3)"
/>
<Tooltip title="Add to shortcuts" placement="right">
<Pin
size={12}
className="nav-item-pin-icon"
onClick={handleTogglePinClick}
color="var(--Vanilla-400, #c0c1c3)"
/>
</Tooltip>
)}

{onTogglePin && isPinned && (
<PinOff
size={12}
className="nav-item-pin-icon"
onClick={handleTogglePinClick}
color="var(--Vanilla-400, #c0c1c3)"
/>
<Tooltip title="Remove from shortcuts" placement="right">
<PinOff
size={12}
className="nav-item-pin-icon"
onClick={handleTogglePinClick}
color="var(--Vanilla-400, #c0c1c3)"
/>
</Tooltip>
)}
</div>
</div>
Expand Down
Loading
Loading