From af369e9a54bed626a7aa1cc85915c9fea4e37718 Mon Sep 17 00:00:00 2001 From: HichamELBSI Date: Tue, 7 Apr 2020 18:34:38 +0200 Subject: [PATCH 1/2] Fix the modal list view in the Media Library Signed-off-by: HichamELBSI --- .../admin/src/components/CardWrapper/index.js | 2 +- .../admin/src/components/ModalHeader/BackButton.js | 2 +- .../admin/src/components/ModalNavWrapper/Wrapper.js | 2 +- .../admin/src/components/UploadList/Container.js | 6 ++---- .../src/components/UploadList/CustomModalSection.js | 9 +++++++++ .../admin/src/components/UploadList/index.js | 5 +++-- 6 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 packages/strapi-plugin-upload/admin/src/components/UploadList/CustomModalSection.js diff --git a/packages/strapi-plugin-upload/admin/src/components/CardWrapper/index.js b/packages/strapi-plugin-upload/admin/src/components/CardWrapper/index.js index ce1585e901..1f3fb84c48 100644 --- a/packages/strapi-plugin-upload/admin/src/components/CardWrapper/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/CardWrapper/index.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; const Wrapper = styled.div` width: 100%; - margin-bottom: 34px; + margin-bottom: 17px; overflow: hidden; &:hover { cursor: ${({ isDraggable }) => (isDraggable ? 'move' : 'pointer')}; diff --git a/packages/strapi-plugin-upload/admin/src/components/ModalHeader/BackButton.js b/packages/strapi-plugin-upload/admin/src/components/ModalHeader/BackButton.js index f50264d216..671fd0ae06 100644 --- a/packages/strapi-plugin-upload/admin/src/components/ModalHeader/BackButton.js +++ b/packages/strapi-plugin-upload/admin/src/components/ModalHeader/BackButton.js @@ -7,7 +7,7 @@ import styled from 'styled-components'; const BackButton = styled.button` - height: 6rem; + height: 5.9rem; width: 6.5rem; margin-right: 20px; margin-left: -30px; diff --git a/packages/strapi-plugin-upload/admin/src/components/ModalNavWrapper/Wrapper.js b/packages/strapi-plugin-upload/admin/src/components/ModalNavWrapper/Wrapper.js index 4e23789914..d1d955cb14 100644 --- a/packages/strapi-plugin-upload/admin/src/components/ModalNavWrapper/Wrapper.js +++ b/packages/strapi-plugin-upload/admin/src/components/ModalNavWrapper/Wrapper.js @@ -1,7 +1,7 @@ import styled from 'styled-components'; const Wrapper = styled.div` - max-height: 44rem; + max-height: 48rem; overflow: overlay; `; diff --git a/packages/strapi-plugin-upload/admin/src/components/UploadList/Container.js b/packages/strapi-plugin-upload/admin/src/components/UploadList/Container.js index a09722ea8d..fe971d02e4 100644 --- a/packages/strapi-plugin-upload/admin/src/components/UploadList/Container.js +++ b/packages/strapi-plugin-upload/admin/src/components/UploadList/Container.js @@ -3,10 +3,8 @@ import ContainerFluid from '../ContainerFluid'; const Container = styled(ContainerFluid)` margin-bottom: 4px; - padding-top: 15px; - max-height: 339px; - overflow: overlay; - overflow-x: hidden; + padding-top: 17px; + max-height: 360px; `; export default Container; diff --git a/packages/strapi-plugin-upload/admin/src/components/UploadList/CustomModalSection.js b/packages/strapi-plugin-upload/admin/src/components/UploadList/CustomModalSection.js new file mode 100644 index 0000000000..60bc2bd5d0 --- /dev/null +++ b/packages/strapi-plugin-upload/admin/src/components/UploadList/CustomModalSection.js @@ -0,0 +1,9 @@ +import styled from 'styled-components'; + +import ModalSection from '../ModalSection'; + +const CustomModalSection = styled(ModalSection)` + overflow: auto; +`; + +export default CustomModalSection; diff --git a/packages/strapi-plugin-upload/admin/src/components/UploadList/index.js b/packages/strapi-plugin-upload/admin/src/components/UploadList/index.js index 16b2b12fe8..c0058d95e2 100644 --- a/packages/strapi-plugin-upload/admin/src/components/UploadList/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/UploadList/index.js @@ -11,6 +11,7 @@ import ButtonWrapper from './ButtonWrapper'; import RowItem from './RowItem'; import ListTitle from './ListTitle'; import ListTitleWrapper from './ListTitleWrapper'; +import CustomModalSection from './CustomModalSection'; const UploadList = ({ filesToUpload, @@ -47,7 +48,7 @@ const UploadList = ({ - + {matrix.map(({ key, rowContent }) => { return ( @@ -67,7 +68,7 @@ const UploadList = ({ ); })} - + ); }; From ba8116dcddf798f9b0460c4847c0be8df41f02ef Mon Sep 17 00:00:00 2001 From: HichamELBSI Date: Tue, 7 Apr 2020 19:00:14 +0200 Subject: [PATCH 2/2] Fix overflow Signed-off-by: HichamELBSI --- .../admin/src/components/ModalNavWrapper/Wrapper.js | 2 +- .../admin/src/components/UploadList/Container.js | 6 +++--- .../admin/src/components/UploadList/CustomModalSection.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/strapi-plugin-upload/admin/src/components/ModalNavWrapper/Wrapper.js b/packages/strapi-plugin-upload/admin/src/components/ModalNavWrapper/Wrapper.js index d1d955cb14..526c19d1e2 100644 --- a/packages/strapi-plugin-upload/admin/src/components/ModalNavWrapper/Wrapper.js +++ b/packages/strapi-plugin-upload/admin/src/components/ModalNavWrapper/Wrapper.js @@ -1,7 +1,7 @@ import styled from 'styled-components'; const Wrapper = styled.div` - max-height: 48rem; + max-height: 48.3rem; overflow: overlay; `; diff --git a/packages/strapi-plugin-upload/admin/src/components/UploadList/Container.js b/packages/strapi-plugin-upload/admin/src/components/UploadList/Container.js index fe971d02e4..f53e77ba98 100644 --- a/packages/strapi-plugin-upload/admin/src/components/UploadList/Container.js +++ b/packages/strapi-plugin-upload/admin/src/components/UploadList/Container.js @@ -2,9 +2,9 @@ import styled from 'styled-components'; import ContainerFluid from '../ContainerFluid'; const Container = styled(ContainerFluid)` - margin-bottom: 4px; - padding-top: 17px; - max-height: 360px; + margin-bottom: 3px; + padding-top: 15px; + max-height: 357px; `; export default Container; diff --git a/packages/strapi-plugin-upload/admin/src/components/UploadList/CustomModalSection.js b/packages/strapi-plugin-upload/admin/src/components/UploadList/CustomModalSection.js index 60bc2bd5d0..bdb3949974 100644 --- a/packages/strapi-plugin-upload/admin/src/components/UploadList/CustomModalSection.js +++ b/packages/strapi-plugin-upload/admin/src/components/UploadList/CustomModalSection.js @@ -3,7 +3,7 @@ import styled from 'styled-components'; import ModalSection from '../ModalSection'; const CustomModalSection = styled(ModalSection)` - overflow: auto; + overflow: overlay; `; export default CustomModalSection;