Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0
This commit is contained in:
commit
817f810590
@ -399,18 +399,17 @@ class AvatarEditorBody extends React.Component {
|
||||
isClickable={true}
|
||||
color="#FFFFFF"
|
||||
className="editor-button"
|
||||
style={{padding: 8}}
|
||||
/>
|
||||
</Box>
|
||||
<Box className="zoom-container">
|
||||
<IconButton
|
||||
className="zoom-container-svg_zoom-minus"
|
||||
size="16"
|
||||
isDisabled={false}
|
||||
onClick={this.onZoomMinusClick}
|
||||
iconName={"/static/images/zoom-minus.react.svg"}
|
||||
isFill={true}
|
||||
isClickable={false}
|
||||
style={{paddingTop: 20}}
|
||||
/>
|
||||
<Slider
|
||||
id="scale"
|
||||
@ -424,12 +423,12 @@ class AvatarEditorBody extends React.Component {
|
||||
/>
|
||||
<IconButton
|
||||
size="16"
|
||||
className="zoom-container-svg_zoom-plus"
|
||||
isDisabled={false}
|
||||
onClick={this.onZoomPlusClick}
|
||||
iconName={"/static/images/zoom-plus.react.svg"}
|
||||
isFill={true}
|
||||
isClickable={false}
|
||||
style={{paddingTop: 20}}
|
||||
/>
|
||||
</Box>
|
||||
</Box>
|
||||
|
@ -216,6 +216,9 @@ const mobileStyles = css`
|
||||
props.theme.avatarEditorBody.container.button.height};
|
||||
border-radius: ${(props) =>
|
||||
props.theme.avatarEditorBody.container.button.borderRadius};
|
||||
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
|
||||
@ -224,6 +227,10 @@ const mobileStyles = css`
|
||||
props.theme.avatarEditorBody.container.zoom.mobileHeight};
|
||||
margin-top: ${(props) =>
|
||||
props.theme.avatarEditorBody.container.zoom.marginTop};
|
||||
.zoom-container-svg_zoom-minus,
|
||||
.zoom-container-svg_zoom-plus {
|
||||
margin: auto 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -299,6 +306,9 @@ const StyledAvatarContainer = styled.div`
|
||||
background: ${(props) =>
|
||||
props.theme.avatarEditorBody.container.buttons.background};
|
||||
justify-items: center;
|
||||
.editor-button {
|
||||
margin: auto 0;
|
||||
}
|
||||
}
|
||||
|
||||
.zoom-container {
|
||||
@ -307,6 +317,10 @@ const StyledAvatarContainer = styled.div`
|
||||
display: grid;
|
||||
grid-template-columns: min-content 1fr min-content;
|
||||
grid-column-gap: 12px;
|
||||
.zoom-container-svg_zoom-minus,
|
||||
.zoom-container-svg_zoom-plus {
|
||||
margin: auto 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -45,6 +45,7 @@ class ContextMenuSub extends Component {
|
||||
if (item.onClick) {
|
||||
item.onClick({
|
||||
originalEvent: e,
|
||||
action: item.action,
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -110,7 +110,7 @@ const RootFolderContainer = (props) => {
|
||||
</Text>
|
||||
{!isDesktop && (
|
||||
<Text fontSize="12px">
|
||||
<Trans t={this.props.t} i18nKey="PrivateRoomSupport" ns="Home">
|
||||
<Trans t={t} i18nKey="PrivateRoomSupport" ns="Home">
|
||||
Work in Private Room is available via {{ organizationName }} desktop
|
||||
app.{" "}
|
||||
<Link isBold isHovered color="#116d9d" href={privacyInstructions}>
|
||||
|
@ -201,7 +201,9 @@ const SimpleFilesRow = (props) => {
|
||||
finalizeVersionAction(id).catch((err) => toastr.error(err));
|
||||
|
||||
const onClickFavorite = (e) => {
|
||||
const { action } = e.currentTarget.dataset;
|
||||
const data = (e.currentTarget && e.currentTarget.dataset) || e;
|
||||
const { action } = data;
|
||||
|
||||
setFavoriteAction(action, id)
|
||||
.then(() =>
|
||||
action === "mark"
|
||||
@ -324,6 +326,7 @@ const SimpleFilesRow = (props) => {
|
||||
onClick: onClickFavorite,
|
||||
disabled: false,
|
||||
"data-action": "mark",
|
||||
action: "mark",
|
||||
};
|
||||
case "block-unblock-version":
|
||||
return {
|
||||
@ -452,6 +455,7 @@ const SimpleFilesRow = (props) => {
|
||||
onClick: onClickFavorite,
|
||||
disabled: false,
|
||||
"data-action": "remove",
|
||||
action: "remove",
|
||||
};
|
||||
default:
|
||||
break;
|
||||
|
@ -504,7 +504,7 @@ class SectionHeaderContent extends React.Component {
|
||||
<ContextMenuButton
|
||||
className="add-button"
|
||||
directionX="right"
|
||||
iconName="images/actions.header.touch.react.svg"
|
||||
iconName="images/plus.svg"
|
||||
size={17}
|
||||
color="#A3A9AE"
|
||||
hoverColor="#657077"
|
||||
@ -529,7 +529,7 @@ class SectionHeaderContent extends React.Component {
|
||||
<ContextMenuButton
|
||||
className="add-button"
|
||||
directionX="right"
|
||||
iconName="images/actions.header.touch.react.svg"
|
||||
iconName="images/plus.svg"
|
||||
size={17}
|
||||
color="#A3A9AE"
|
||||
hoverColor="#657077"
|
||||
|
@ -14,8 +14,6 @@ import {
|
||||
import FileList from "./FileList";
|
||||
import { inject, observer } from "mobx-react";
|
||||
|
||||
const DownloadBodyStyle = { height: `calc(100vh - 62px)` };
|
||||
|
||||
class UploadPanelComponent extends React.Component {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
@ -60,6 +58,7 @@ class UploadPanelComponent extends React.Component {
|
||||
t,
|
||||
uploadPanelVisible,
|
||||
/* sharingPanelVisible, */ uploaded,
|
||||
uploadDataFiles,
|
||||
} = this.props;
|
||||
|
||||
const visible = uploadPanelVisible;
|
||||
@ -111,7 +110,11 @@ class UploadPanelComponent extends React.Component {
|
||||
<StyledBody
|
||||
stype="mediumBlack"
|
||||
className="upload-panel_body"
|
||||
style={DownloadBodyStyle}
|
||||
style={
|
||||
uploadDataFiles.length > 15
|
||||
? { height: `100vh` }
|
||||
: { height: `calc(100vh - 130px)` }
|
||||
}
|
||||
>
|
||||
<FileList />
|
||||
</StyledBody>
|
||||
@ -134,6 +137,7 @@ export default inject(({ dialogsStore, uploadDataStore }) => {
|
||||
cancelUpload,
|
||||
uploadPanelVisible,
|
||||
setUploadPanelVisible,
|
||||
files,
|
||||
} = uploadDataStore;
|
||||
|
||||
return {
|
||||
@ -144,5 +148,6 @@ export default inject(({ dialogsStore, uploadDataStore }) => {
|
||||
setUploadPanelVisible,
|
||||
clearUploadData,
|
||||
cancelUpload,
|
||||
uploadDataFiles: files,
|
||||
};
|
||||
})(observer(UploadPanel));
|
||||
|
@ -444,9 +444,9 @@ class FilesStore {
|
||||
!isThirdPartyFolder && this.userAccess && options.push("move");
|
||||
options.push("copy");
|
||||
|
||||
if (isFile) {
|
||||
options.push("duplicate");
|
||||
}
|
||||
// if (isFile) {
|
||||
// options.push("duplicate");
|
||||
// }
|
||||
|
||||
this.userAccess && options.push("rename");
|
||||
isThirdPartyFolder &&
|
||||
|
@ -96,7 +96,7 @@ class ConsumerModalDialog extends React.Component {
|
||||
</Box>
|
||||
<Text as="div">
|
||||
<Trans
|
||||
t={this.pros.t}
|
||||
t={this.props.t}
|
||||
i18nKey="ThirdPartyBodyDescription"
|
||||
ns="Settings"
|
||||
>
|
||||
@ -117,7 +117,7 @@ class ConsumerModalDialog extends React.Component {
|
||||
);
|
||||
|
||||
bottomDescription = (
|
||||
<Trans t={this.pros.t} i18nKey="ThirdPartyBottomDescription" ns="Settings">
|
||||
<Trans t={this.props.t} i18nKey="ThirdPartyBottomDescription" ns="Settings">
|
||||
If you still have some questions on how to connect this service or need
|
||||
technical assistance, please feel free to contact our{" "}
|
||||
<Link
|
||||
|
Loading…
Reference in New Issue
Block a user