From 56dc4603ae28ed2aa82c5ffb4934a8c2a001b5eb Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Tue, 6 Apr 2021 22:48:24 +0200 Subject: [PATCH] feat: add version tag on the sidebar. --- client/src/components/Sidebar/Sidebar.js | 5 +++ .../style/components/DataTable/DataTable.scss | 4 +-- .../style/containers/Dashboard/Sidebar.scss | 31 +++++++++++++++---- 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/client/src/components/Sidebar/Sidebar.js b/client/src/components/Sidebar/Sidebar.js index 59966fe62..0cad24831 100644 --- a/client/src/components/Sidebar/Sidebar.js +++ b/client/src/components/Sidebar/Sidebar.js @@ -1,4 +1,5 @@ import React from 'react'; +import { Menu, MenuItem } from '@blueprintjs/core'; import SidebarContainer from 'components/Sidebar/SidebarContainer'; import SidebarHead from 'components/Sidebar/SidebarHead'; import SidebarMenu from 'components/Sidebar/SidebarMenu'; @@ -13,6 +14,10 @@ export default function Sidebar() {
+ + ) } \ No newline at end of file diff --git a/client/src/style/components/DataTable/DataTable.scss b/client/src/style/components/DataTable/DataTable.scss index 64ec85bf8..b40228214 100644 --- a/client/src/style/components/DataTable/DataTable.scss +++ b/client/src/style/components/DataTable/DataTable.scss @@ -24,8 +24,8 @@ padding: 0.7rem 0.5rem; background: #f5f5f5; font-size: 14px; - color: #505e71; - font-weight: 500; + color: #3b495d; + font-weight: 600; border-bottom: 1px solid rgb(224, 224, 224); > div{ diff --git a/client/src/style/containers/Dashboard/Sidebar.scss b/client/src/style/containers/Dashboard/Sidebar.scss index c2102933e..a6efca38d 100644 --- a/client/src/style/containers/Dashboard/Sidebar.scss +++ b/client/src/style/containers/Dashboard/Sidebar.scss @@ -23,6 +23,12 @@ } } + .ScrollbarsCustom-Content{ + display: flex; + flex-direction: column; + height: 100%; + } + &:hover { .ScrollbarsCustom-Thumb { @@ -102,6 +108,19 @@ &__scroll-wrapper { height: 100%; } + + &__version{ + margin-top: auto; + padding: 0 20px 20px; + font-size: 12px; + color: rgba(255, 255, 255, 0.6); + } + + &__inner{ + height: 100%; + display: flex; + flex-direction: column; + } &-menu { background: transparent; @@ -227,7 +246,8 @@ } } - .sidebar__menu { + .sidebar__menu, + .sidebar__version { transition: opacity 0.3s ease-in-out; opacity: 0; } @@ -248,11 +268,10 @@ opacity: 0; transition-delay: 0s; } - .sidebar__head-organization{ - opacity: 1; - } - - .sidebar__menu { + + .sidebar__head-organization, + .sidebar__menu, + .sidebar__version { opacity: 1; }