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

Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2

Browse Source
This commit is contained in:
Nikita Gopienko 2022-04-26 12:00:22 +03:00
commit b2ae2f2116
6 changed files with 14 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
products/ASC.Files/Client/src/components/Article/Body/DownloadAppList.js
View File

@ -33,7 +33,7 @@ const DownloadAppListContainer = React.memo(({ t, theme }) => {
return (
<StyledDownloadAppList>
<Text className="download-app-text" fontSize="14px">
<Text className="download-app-text" fontSize="14px" noSelect={true}>
{t("Translations:DownloadApps")}
</Text>
<div className="download-app-list">

1
products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
View File

@ -5,6 +5,7 @@ import DropDownItem from "@appserver/components/drop-down-item";
import AccessRightSelect from "@appserver/components/access-right-select";
import { getAccessIcon } from "../../../helpers/files-helpers";
import { ReactSVG } from "react-svg";
import Backdrop from "@appserver/components/backdrop";
const {
FullAccess,

6
products/ASC.Files/Client/src/components/panels/SharingPanel/Item.js
View File

@ -67,7 +67,7 @@ const Item = ({
t={t}
access={item.access}
directionX="right"
directionY="bottom"
directionY="both"
accessOptions={externalAccessOptions}
onAccessChange={onChangeItemAccess}
itemId={item.sharedTo.id}
@ -75,8 +75,8 @@ const Item = ({
disableLink={false}
canDelete={true}
onRemoveUserClick={onRemoveUserClick}
isDefaultMode={false}
fixedDirection={true}
isDefaultMode={true}
fixedDirection={false}
/>
)}
</StyledItem>

37
products/ASC.Files/Client/src/components/panels/SharingPanel/StyledSharingPanel.js
View File

@ -3,42 +3,6 @@ import styled, { css } from "styled-components";
import { isMobile, isMobileOnly } from "react-device-detect";
const StyledContainer = styled.div`
transition: unset;
transform: translateX(${(props) => (props.visible ? "0" : "480px")});
width: 480px;
height: 100%;
position: fixed;
max-width: 480px;
overflow-y: hidden;
right: 0;
bottom: 0;
background: ${(props) => props.theme.aside.backgroundColor};
z-index: 311;
@media (max-width: 500px) {
position: fixed;
top: unset;
bottom: 0;
right: 0;
width: 100%;
height: calc(100% - 64px);
}
.panel_combo-box {
.optionalBlock {
margin-right: -3px;
}
}
`;
StyledContainer.defaultProps = { theme: Base };
const StyledContent = styled.div`
width: 100%;
height: 100%;
@ -389,7 +353,6 @@ const StyledModalFooter = styled.div`
`;
export {
StyledContainer,
StyledContent,
StyledHeaderContent,
StyledBodyContent,

6
products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
View File

@ -19,11 +19,7 @@ import withLoader from "../../../HOCs/withLoader";
import ModalDialog from "@appserver/components/modal-dialog";
import EmbeddingBody from "../EmbeddingPanel/EmbeddingBody";
import {
StyledContainer,
StyledContent,
StyledModalFooter,
} from "./StyledSharingPanel";
import { StyledContent, StyledModalFooter } from "./StyledSharingPanel";
import Header from "./Header";
import Body from "./Body";

59
products/ASC.Files/Client/src/components/panels/StyledPanels.js
View File

@ -101,24 +101,14 @@ const StyledAsidePanel = styled.div`
@media (max-width: 500px) {
position: fixed;
top: unset;
top: 64px;
bottom: 0;
left: 0;
right: 0;
width: 100%;
height: calc(100% - 64px);
}
${isMobileOnly &&
css`
position: fixed;
top: 64px;
bottom: 0;
left: 0;
width: 100%;
height: calc(100% - 64px);
`}
}
${PanelStyles}
`;
@ -176,22 +166,11 @@ const StyledAddUsersPanelPanel = styled.div`
position: fixed;
top: 64px;
bottom: 0;
left: 0;
right: 0;
width: 100%;
height: calc(100% - 64px);
}
${isMobileOnly &&
css`
position: fixed;
top: 64px;
bottom: 0;
left: 0;
width: 100%;
height: calc(100% - 64px);
`}
}
${PanelStyles}
.combo-button-label {
@ -211,22 +190,11 @@ const StyledAddGroupsPanel = styled.div`
position: fixed;
top: 64px;
bottom: 0;
left: 0;
right: 0;
width: 100%;
height: calc(100% - 64px);
}
${isMobileOnly &&
css`
position: fixed;
top: 64px;
bottom: 0;
left: 0;
width: 100%;
height: calc(100% - 64px);
`}
}
${PanelStyles}
.combo-button-label {
@ -246,22 +214,11 @@ const StyledEmbeddingPanel = styled.div`
position: fixed;
top: 64px;
bottom: 0;
left: 0;
right: 0;
width: 100vw;
height: calc(100vh - 64px);
width: 100%;
height: calc(100% - 64px);
}
${isMobileOnly &&
css`
position: fixed;
top: 64px;
bottom: 0;
left: 0;
width: 100vw;
height: calc(100vh - 64px);
`}
}
${PanelStyles}
`;