From 43b33105fa1d37709af7065c6b09aa077abf17c5 Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Wed, 4 Aug 2021 22:08:14 +0200 Subject: [PATCH] fix: sidebar logo. --- .../Dashboard/DashboardViewsTabs.js | 61 ++++++++++--------- client/src/components/Sidebar/SidebarHead.js | 2 +- client/src/static/json/icons.js | 6 +- .../src/style/pages/Dashboard/Dashboard.scss | 4 +- 4 files changed, 40 insertions(+), 33 deletions(-) diff --git a/client/src/components/Dashboard/DashboardViewsTabs.js b/client/src/components/Dashboard/DashboardViewsTabs.js index 38e5f6c7f..99ed5db44 100644 --- a/client/src/components/Dashboard/DashboardViewsTabs.js +++ b/client/src/components/Dashboard/DashboardViewsTabs.js @@ -28,7 +28,10 @@ export default function DashboardViewsTabs({ const [currentView, setCurrentView] = useState(initialViewSlug || 0); useEffect(() => { - if (typeof currentViewSlug !== 'undefined' && currentViewSlug !== currentView) { + if ( + typeof currentViewSlug !== 'undefined' && + currentViewSlug !== currentView + ) { setCurrentView(currentViewSlug || 0); } }, [currentView, setCurrentView, currentViewSlug]); @@ -52,37 +55,39 @@ export default function DashboardViewsTabs({ // Handle tabs change. const handleTabsChange = (viewSlug) => { setCurrentView(viewSlug); - triggerOnChange(viewSlug) + triggerOnChange(viewSlug); }; return ( - - {allTab && } +
+ + {allTab && } - {tabs.map((tab) => ( - - ))} - - } - position={Position.RIGHT} - > -
); } diff --git a/client/src/components/Sidebar/SidebarHead.js b/client/src/components/Sidebar/SidebarHead.js index 1d5ec76ec..820deb7c9 100644 --- a/client/src/components/Sidebar/SidebarHead.js +++ b/client/src/components/Sidebar/SidebarHead.js @@ -51,7 +51,7 @@ function SidebarHead({
diff --git a/client/src/static/json/icons.js b/client/src/static/json/icons.js index 4d4b6d31f..6ab16b686 100644 --- a/client/src/static/json/icons.js +++ b/client/src/static/json/icons.js @@ -161,10 +161,10 @@ export default { }, 'mini-bigcapital': { path: [ - 'M56,3.16,61.33,8.5,31.94,37.9l-5.35-5.35Z', - 'M29.53,6.94l5.35,5.34L5.49,41.67.14,36.33l15.8-15.8Z', + 'M57 3.16L62.33 8.5L32.94 37.9L27.59 32.55L57 3.16Z', + 'M30.53 6.94L35.88 12.28L6.49 41.67L1.14 36.33L16.94 20.53L30.53 6.94Z', ], - viewBox: '0 0 309.09 42.89', + viewBox: '0 0 63 43', }, eye: { path: [ diff --git a/client/src/style/pages/Dashboard/Dashboard.scss b/client/src/style/pages/Dashboard/Dashboard.scss index 1e9307c91..b77522353 100644 --- a/client/src/style/pages/Dashboard/Dashboard.scss +++ b/client/src/style/pages/Dashboard/Dashboard.scss @@ -456,16 +456,18 @@ $dashboard-views-bar-height: 44px; } .tabs--dashboard-views { + user-select: none; .#{$ns}-tab { color: #646a7d; font-size: 14px; - line-height: $dashboard-views-bar-height; + line-height: $dashboard-views-bar-height - 2px; font-weight: 400; padding: 0; margin-right: 0; padding-left: 16px; padding-right: 16px; + padding-top: 2px; &[aria-selected='true'] { color: #0052cc;