From bf21c7614f88da6b66630d942c4e447ad48114bf Mon Sep 17 00:00:00 2001 From: Ky Date: Tue, 21 Apr 2020 14:33:03 +0200 Subject: [PATCH 1/3] UI fixes Signed-off-by: Ky --- .../components/LeftMenuLinkHeader/SearchButton.js | 3 +++ .../LeftMenuLinkSection/LeftMenuListLink.js | 1 + .../lib/src/components/LeftMenuList/List.js | 12 +++++++++++- .../admin/src/components/SelectWrapper/components.js | 5 ++++- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/packages/strapi-admin/admin/src/components/LeftMenuLinkHeader/SearchButton.js b/packages/strapi-admin/admin/src/components/LeftMenuLinkHeader/SearchButton.js index ad31255736..f6a37f5f28 100644 --- a/packages/strapi-admin/admin/src/components/LeftMenuLinkHeader/SearchButton.js +++ b/packages/strapi-admin/admin/src/components/LeftMenuLinkHeader/SearchButton.js @@ -3,6 +3,9 @@ import styled from 'styled-components'; const SearchButton = styled.button` padding: 0 10px; line-height: normal; + &:focus { + outline: 0; + } `; export default SearchButton; diff --git a/packages/strapi-admin/admin/src/components/LeftMenuLinkSection/LeftMenuListLink.js b/packages/strapi-admin/admin/src/components/LeftMenuLinkSection/LeftMenuListLink.js index 9af1980d60..b067383c8e 100644 --- a/packages/strapi-admin/admin/src/components/LeftMenuLinkSection/LeftMenuListLink.js +++ b/packages/strapi-admin/admin/src/components/LeftMenuLinkSection/LeftMenuListLink.js @@ -3,6 +3,7 @@ import styled from 'styled-components'; const LeftMenuListLink = styled.div` max-height: 180px; margin-bottom: 19px; + margin-right: 28px; overflow: auto; `; diff --git a/packages/strapi-helper-plugin/lib/src/components/LeftMenuList/List.js b/packages/strapi-helper-plugin/lib/src/components/LeftMenuList/List.js index d3dcf6e62e..e3312e77ec 100644 --- a/packages/strapi-helper-plugin/lib/src/components/LeftMenuList/List.js +++ b/packages/strapi-helper-plugin/lib/src/components/LeftMenuList/List.js @@ -6,7 +6,17 @@ const List = styled.ul` margin-bottom: 0; padding-left: 0; max-height: 178px; - overflow-y: scroll; + overflow-y: auto; + ::-webkit-scrollbar { + background: transparent; + } + ::-webkit-scrollbar-track { + background: transparent; + &:hover { + background: transparent; + } + } + li { position: relative; margin-bottom: 2px; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/components.js b/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/components.js index 8e117f45b1..e10198fccc 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/components.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/components.js @@ -3,7 +3,6 @@ import styled from 'styled-components'; const Wrapper = styled.div` position: relative; margin-bottom: 27px; - label { width: 100%; overflow: hidden; @@ -95,6 +94,10 @@ const Wrapper = styled.div` div { height: 36px; cursor: pointer; + width: 100%; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } } } From be5746dd418320e30779bb972240bf3884503792 Mon Sep 17 00:00:00 2001 From: Ky Date: Tue, 21 Apr 2020 18:14:29 +0200 Subject: [PATCH 2/3] apply PR review Signed-off-by: Ky --- .../admin/src/components/SelectWrapper/components.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/components.js b/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/components.js index e10198fccc..f495845c74 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/components.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/components.js @@ -94,10 +94,6 @@ const Wrapper = styled.div` div { height: 36px; cursor: pointer; - width: 100%; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; } } } From 7dc03b61a34b4f19da74a804fddfa61277b6db54 Mon Sep 17 00:00:00 2001 From: Ky Date: Tue, 21 Apr 2020 18:22:31 +0200 Subject: [PATCH 3/3] apply PR review Signed-off-by: Ky