From a6428fef0cce1a11e1290fd97bcb949a84672d9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=A4ggmark?= Date: Tue, 22 Jan 2019 08:12:48 +0100 Subject: [PATCH 1/2] Added link to side menu header and fixed styling --- .../components/sidemenu/SideMenuDropDown.tsx | 4 ++- .../SideMenuDropDown.test.tsx.snap | 26 ++++++++++++------- public/sass/components/_sidemenu.scss | 6 +++++ 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/public/app/core/components/sidemenu/SideMenuDropDown.tsx b/public/app/core/components/sidemenu/SideMenuDropDown.tsx index 4231e992b19..068298da381 100644 --- a/public/app/core/components/sidemenu/SideMenuDropDown.tsx +++ b/public/app/core/components/sidemenu/SideMenuDropDown.tsx @@ -10,7 +10,9 @@ const SideMenuDropDown: FC = props => { return ( `; diff --git a/public/sass/components/_sidemenu.scss b/public/sass/components/_sidemenu.scss index 237574b93bc..10565a4e0c7 100644 --- a/public/sass/components/_sidemenu.scss +++ b/public/sass/components/_sidemenu.scss @@ -149,6 +149,12 @@ color: #ebedf2; } +.side-menu-header > a { + // Removes left-brand-border-gradient from link + border: none !important; + padding: 0 !important; +} + .sidemenu-subtitle { padding: 0.5rem 1rem 0.5rem; font-size: $font-size-sm; From bf0333e329051bee0b0b5489020cad128ffe06ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=A4ggmark?= Date: Tue, 22 Jan 2019 08:18:03 +0100 Subject: [PATCH 2/2] Removed strange edit --- public/app/core/components/sidemenu/SideMenuDropDown.tsx | 2 +- .../sidemenu/__snapshots__/SideMenuDropDown.test.tsx.snap | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/public/app/core/components/sidemenu/SideMenuDropDown.tsx b/public/app/core/components/sidemenu/SideMenuDropDown.tsx index 068298da381..4b930d605e5 100644 --- a/public/app/core/components/sidemenu/SideMenuDropDown.tsx +++ b/public/app/core/components/sidemenu/SideMenuDropDown.tsx @@ -11,7 +11,7 @@ const SideMenuDropDown: FC = props => {
  • - {link.text}{' '} + {link.text}
  • {link.children && diff --git a/public/app/core/components/sidemenu/__snapshots__/SideMenuDropDown.test.tsx.snap b/public/app/core/components/sidemenu/__snapshots__/SideMenuDropDown.test.tsx.snap index 536bf141ef7..0e1a1486422 100644 --- a/public/app/core/components/sidemenu/__snapshots__/SideMenuDropDown.test.tsx.snap +++ b/public/app/core/components/sidemenu/__snapshots__/SideMenuDropDown.test.tsx.snap @@ -14,7 +14,6 @@ exports[`Render should render children 1`] = ` > link - link -