Merge branch 'develop' into feature/my-documents-share
This commit is contained in:
commit
9b7d2081e7
@ -9,6 +9,8 @@ import ClockIcon from "PUBLIC_DIR/images/clock.react.svg";
|
|||||||
import moment from "moment";
|
import moment from "moment";
|
||||||
import { getCorrectFourValuesStyle } from "../utils/rtlUtils";
|
import { getCorrectFourValuesStyle } from "../utils/rtlUtils";
|
||||||
|
|
||||||
|
import Base from "../themes/base";
|
||||||
|
|
||||||
const Selectors = styled.div`
|
const Selectors = styled.div`
|
||||||
position: relative;
|
position: relative;
|
||||||
margin-top: 8px;
|
margin-top: 8px;
|
||||||
@ -37,7 +39,7 @@ const TimeCell = styled.span`
|
|||||||
width: 73px;
|
width: 73px;
|
||||||
height: 32px;
|
height: 32px;
|
||||||
|
|
||||||
background-color: #eceef1;
|
background-color: ${(props) => (props.theme.isBase ? "#eceef1" : "#242424")};
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
|
|
||||||
padding: 6px 8px;
|
padding: 6px 8px;
|
||||||
@ -58,6 +60,8 @@ const TimeCell = styled.span`
|
|||||||
`}
|
`}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
TimeCell.defaultProps = { theme: Base };
|
||||||
|
|
||||||
const TimeSelector = styled.span`
|
const TimeSelector = styled.span`
|
||||||
${({ theme }) =>
|
${({ theme }) =>
|
||||||
theme.interfaceDirection === "rtl"
|
theme.interfaceDirection === "rtl"
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
"proxy": {
|
"proxy": {
|
||||||
"url": ""
|
"url": ""
|
||||||
},
|
},
|
||||||
"wrongPortalNameUrl": "https://teamlab.info/wrongportalname.aspx?Site_Testing=4testing",
|
"wrongPortalNameUrl": "",
|
||||||
"thumbnails1280x720": false,
|
"thumbnails1280x720": false,
|
||||||
"pdfViewer": true,
|
"pdfViewer": true,
|
||||||
"pdfViewerUrl": "ds-vpath/sdkjs/pdf/src/engine/viewer.js",
|
"pdfViewerUrl": "ds-vpath/sdkjs/pdf/src/engine/viewer.js",
|
||||||
|
Loading…
Reference in New Issue
Block a user