From de49f86398cc57bc179514b26556e1954db67909 Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Tue, 9 Nov 2021 15:12:24 +0300 Subject: [PATCH] Web: Files: fixed TileContainer styles --- .../Section/Body/RowsView/SimpleFilesRow.js | 2 +- .../Body/TilesView/sub-components/Tile.js | 3 +- .../TilesView/sub-components/TileContainer.js | 32 ++----------------- 3 files changed, 6 insertions(+), 31 deletions(-) diff --git a/products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js b/products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js index f580a1b7fd..c808a4139e 100644 --- a/products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js +++ b/products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js @@ -136,7 +136,7 @@ const SimpleFilesRow = (props) => { ); return ( - + (!props.isRecycleBin ? "pointer" : "default")}; min-height: 57px; + box-sizing: border-box; width: 100%; border: 1px solid #d0d5da; border-radius: 3px; @@ -226,7 +227,7 @@ const StyledFileTileBottom = styled.div` ${FlexBoxStyles} padding: 9px 10px; padding-right: 0; - min-height: 56px; + height: 56px; box-sizing: border-box; `; diff --git a/products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js b/products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js index 4b165a9558..7e9735ae28 100644 --- a/products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js +++ b/products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js @@ -11,30 +11,18 @@ import CustomScrollbarsVirtualList from "@appserver/components/scrollbar"; import { tablet, desktop } from "@appserver/components/utils/device"; const foldersStyle = css` - grid-gap: 19px 14px; - - @media ${desktop} { - margin-left: -1px; - padding-right: 1px; - } + grid-gap: 19px 16px; @media ${tablet} { grid-gap: 17px 12px; - margin-left: -1px; } `; const filesStyle = css` - grid-gap: 14px 18px; - - @media ${desktop} { - padding-right: 5px; - } + grid-gap: 14px 16px; @media ${tablet} { - grid-gap: 12px 14px; - margin-left: -1px; - padding-right: 2px; + grid-gap: 12px; } `; @@ -59,10 +47,6 @@ const StyledTileContainer = styled.div` } &.folder { padding: 0; - - .drag-and-drop { - margin: 0px; - } } } @@ -74,16 +58,6 @@ const StyledTileContainer = styled.div` &.files { padding-top: 8px; } - - margin-left: -1px; - } - - @media (min-width: 1024px) { - .tile-item-wrapper { - &.file { - margin-left: 1px; - } - } } @media ${tablet} {