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

Merge branch 'develop' into feature/my-documents-share

Browse Source
This commit is contained in:
Viktor Fomin 2023-10-04 18:28:28 +03:00
commit 9b7d2081e7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/components/date-time-picker/index.js
View File

@ -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"

2
public/scripts/config.json
View File

@ -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",