From 6cae06b63c8852d33e2ef42ab331fadcabf58797 Mon Sep 17 00:00:00 2001 From: Virginie Ky Date: Tue, 8 Oct 2019 09:50:15 +0200 Subject: [PATCH 1/5] Users permissions edit page responsive ip --- .../lib/src/assets/styles/sizes.js | 4 ++++ .../StyledPluginHeaderActions.js | 2 +- .../admin/src/components/Controller/Components.js | 2 +- .../admin/src/components/Plugin/Components.js | 6 ++++-- .../admin/src/components/Plugins/Components.js | 3 ++- .../admin/src/containers/EditPage/Components.js | 13 +++++++++++-- 6 files changed, 23 insertions(+), 7 deletions(-) diff --git a/packages/strapi-helper-plugin/lib/src/assets/styles/sizes.js b/packages/strapi-helper-plugin/lib/src/assets/styles/sizes.js index 5ab5207ce5..81cd544146 100644 --- a/packages/strapi-helper-plugin/lib/src/assets/styles/sizes.js +++ b/packages/strapi-helper-plugin/lib/src/assets/styles/sizes.js @@ -1,4 +1,8 @@ const sizes = { + tablet: '768px', + desktop: '992px', + wide: '1280px', + header: { height: '6rem', }, diff --git a/packages/strapi-helper-plugin/lib/src/components/PluginHeaderActions/StyledPluginHeaderActions.js b/packages/strapi-helper-plugin/lib/src/components/PluginHeaderActions/StyledPluginHeaderActions.js index f91d8f0756..c65e709915 100644 --- a/packages/strapi-helper-plugin/lib/src/components/PluginHeaderActions/StyledPluginHeaderActions.js +++ b/packages/strapi-helper-plugin/lib/src/components/PluginHeaderActions/StyledPluginHeaderActions.js @@ -11,7 +11,7 @@ const StyledPluginHeaderActions = styled.div` justify-content: flex-end; width: fit-content; max-width: 100%; - padding-top: 0.9rem; + padding-top: 1rem; button { margin-right: 0; margin-left: 1.8rem; diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/Controller/Components.js b/packages/strapi-plugin-users-permissions/admin/src/components/Controller/Components.js index 5657350b49..3f21b73ec2 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/Controller/Components.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/Controller/Components.js @@ -1,7 +1,7 @@ import styled from 'styled-components'; const Wrapper = styled.div` - padding: 1px 43px 0 28px; + padding: 1px 30px 0 15px; background: #ffffff; opacity: none; -webkit-font-smoothing: antialiased; diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/Plugin/Components.js b/packages/strapi-plugin-users-permissions/admin/src/components/Plugin/Components.js index 1e9aa8c1ec..b7bf3e0626 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/Plugin/Components.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/Plugin/Components.js @@ -8,13 +8,13 @@ const Wrapper = styled.div` const Banner = styled.div` display: flex; justify-content: space-between; - padding: 0 28px; - padding-right: 43px; + padding: 0 43px 0 28px; color: #787e8f; cursor: pointer; > div:first-child { display: flex; line-height: 5.3rem; + width: 100%; } `; @@ -59,8 +59,10 @@ const Icon = styled.div` const Name = styled.div` font-size: 12px; + line-height: 18px; font-weight: 600; text-transform: uppercase; + margin: auto 0; `; export { Banner, Chevron, ControllerWrapper, Description, Icon, Name, Wrapper }; diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/Plugins/Components.js b/packages/strapi-plugin-users-permissions/admin/src/components/Plugins/Components.js index 3e1da43617..dfb2d8a212 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/Plugins/Components.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/Plugins/Components.js @@ -5,6 +5,7 @@ const Wrapper = styled.div` padding: 0; .plugins-wrapper { padding-top: 1.8rem; + width: 100%; } `; @@ -27,7 +28,7 @@ const Header = styled.div` `; const PluginsContainer = styled.div` - padding-top: 1.9rem; + padding-top: 2rem; > div { border-bottom: 1px solid white; &:last-child { diff --git a/packages/strapi-plugin-users-permissions/admin/src/containers/EditPage/Components.js b/packages/strapi-plugin-users-permissions/admin/src/containers/EditPage/Components.js index 55f76d4d59..91008ddfa1 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/containers/EditPage/Components.js +++ b/packages/strapi-plugin-users-permissions/admin/src/containers/EditPage/Components.js @@ -1,10 +1,19 @@ import styled from 'styled-components'; +import { sizes } from 'strapi-helper-plugin'; + const Wrapper = styled.div` + * { + box-sizing: border-box; + } + > .container-fluid { padding: 18px 30px; > div:first-child { - margin-bottom: 11px; + margin-bottom: 7px; + @media (min-width: ${sizes.desktop}) { + margin-bottom: 11px; + } } } @@ -39,7 +48,7 @@ const Title = styled.div` `; const Separator = styled.div` - margin-top: 15px; + margin-top: 13px; border-top: 1px solid #f6f6f6; `; From ee65a6a05a0ec164998ab04f764f93ad7558a2ae Mon Sep 17 00:00:00 2001 From: Virginie Ky Date: Tue, 8 Oct 2019 10:21:27 +0200 Subject: [PATCH 2/5] users permissions plugins responsive UI --- .../src/components/Controller/Components.js | 2 +- .../components/InputCheckboxPlugin/index.js | 6 +++--- .../admin/src/components/Plugin/Components.js | 5 ++++- .../admin/src/components/Plugin/index.js | 18 +++++++++--------- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/Controller/Components.js b/packages/strapi-plugin-users-permissions/admin/src/components/Controller/Components.js index 3f21b73ec2..5657350b49 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/Controller/Components.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/Controller/Components.js @@ -1,7 +1,7 @@ import styled from 'styled-components'; const Wrapper = styled.div` - padding: 1px 30px 0 15px; + padding: 1px 43px 0 28px; background: #ffffff; opacity: none; -webkit-font-smoothing: antialiased; diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/InputCheckboxPlugin/index.js b/packages/strapi-plugin-users-permissions/admin/src/components/InputCheckboxPlugin/index.js index 77cc18a22d..4b553e7718 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/InputCheckboxPlugin/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/InputCheckboxPlugin/index.js @@ -61,9 +61,9 @@ function InputCheckboxPlugin({ return (
- {emptyApplication && ( - - {this.state.collapse ? ( - - ) : ( - - )} - - )}
From 22b8ab0bff0919ff850bed4f0077cfa0393e3ed6 Mon Sep 17 00:00:00 2001 From: Virginie Ky Date: Tue, 8 Oct 2019 10:38:08 +0200 Subject: [PATCH 3/5] Users permissions search list overflow --- .../admin/src/components/InputSearchContainer/Components.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/InputSearchContainer/Components.js b/packages/strapi-plugin-users-permissions/admin/src/components/InputSearchContainer/Components.js index c569acce31..c0d48cb647 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/InputSearchContainer/Components.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/InputSearchContainer/Components.js @@ -67,7 +67,7 @@ const Addon = styled.div` const List = styled.div` height: 16.3rem; - overflow: scroll; + overflow-y: auto; border: 1px solid #e3e9f3; border-top-left-radius: 0 !important; border-top-right-radius: 0 !important; From 953f5b8ba33de77919f4a00fabb90af3912d24c4 Mon Sep 17 00:00:00 2001 From: Virginie Ky Date: Tue, 8 Oct 2019 10:53:01 +0200 Subject: [PATCH 4/5] upload plugin UI --- .../strapi-plugin-upload/admin/src/components/List/Wrapper.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/strapi-plugin-upload/admin/src/components/List/Wrapper.js b/packages/strapi-plugin-upload/admin/src/components/List/Wrapper.js index 944e7adbfa..b603a4bc08 100644 --- a/packages/strapi-plugin-upload/admin/src/components/List/Wrapper.js +++ b/packages/strapi-plugin-upload/admin/src/components/List/Wrapper.js @@ -3,6 +3,7 @@ import styled from 'styled-components'; const Wrapper = styled.div` margin-top: 9px; padding: 0; + padding-bottom: 7px; > div:first-child { margin: 0; @@ -12,6 +13,7 @@ const Wrapper = styled.div` width: 100%; padding: 0 !important; list-style: none; + margin-bottom: 0; > li:nth-child(2) { height: 57px; > div { From b60ae59170fe07941a0098a2798249cdf5b5e91d Mon Sep 17 00:00:00 2001 From: Virginie Ky Date: Tue, 8 Oct 2019 11:09:49 +0200 Subject: [PATCH 5/5] Content type builder Models List UI --- .../admin/src/containers/ModelPage/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js index 03c2f339e7..ce9370e389 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/index.js @@ -652,8 +652,8 @@ export class ModelPage extends React.Component {
)} - {!this.getSource() && ( -
+
+ {!this.getSource() && ( { e.stopPropagation(); @@ -672,8 +672,8 @@ export class ModelPage extends React.Component {
-
- )} + )} +