IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #392 from ONLYOFFICE/bugfix/Bug53028

Browse Source 
Fixed Bug 53028 - Fixed border styles for Safari macOS.
This commit is contained in:
Alexey Safronov 2021-10-11 18:56:55 +03:00 committed by GitHub
commit d37309573f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/asc-web-components/table-container/StyledTableContainer.js
View File

@ -48,6 +48,7 @@ const StyledTableContainer = styled.div`
#eceef1 calc(100% - 24px),
#ffffff calc(100% - 24px)
);
border-top: 0;
}
.content-container {

9
products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
View File

@ -18,7 +18,7 @@ import TypeCell from "./sub-components/TypeCell";
import globalColors from "@appserver/components/utils/globalColors";
import styled, { css } from "styled-components";
import Base from "@appserver/components/themes/base";
import { isSafari } from "react-device-detect";
const sideColor = globalColors.gray;
const { acceptBackground, background } = Base.dragAndDrop;
@ -54,6 +54,7 @@ const contextMenuWrapperDraggingHoverStyle = css`
const StyledTableRow = styled(TableRow)`
.table-container_cell {
${isSafari && `border-image-slice: 0 !important`};
background: ${(props) =>
(props.checked || props.isActive) && "#F3F4F4 !important"};
cursor: ${(props) =>
@ -77,6 +78,9 @@ const StyledTableRow = styled(TableRow)`
border-image-slice: 1;
border-image-source: linear-gradient(to right, #ffffff 24px, #eceef1 24px);
border-top: 0;
border-right: 0;
${(props) => props.checked && rowCheckboxCheckedStyle};
${(props) => props.dragging && rowCheckboxDraggingStyle};
}
@ -89,6 +93,9 @@ const StyledTableRow = styled(TableRow)`
border-image-slice: 1;
border-image-source: linear-gradient(to left, #ffffff 24px, #eceef1 24px);
border-top: 0;
border-left: 0;
${(props) => props.checked && contextMenuWrapperCheckedStyle};
${(props) => props.dragging && contextMenuWrapperDraggingStyle};
}