Merge branch 'release/v2.0.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.0.0
This commit is contained in:
commit
94fd0a4dca
@ -34,6 +34,7 @@ const StyledComponent = styled.div`
|
|||||||
|
|
||||||
.save-cancel-buttons {
|
.save-cancel-buttons {
|
||||||
margin-top: 24px;
|
margin-top: 24px;
|
||||||
|
bottom: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.description {
|
.description {
|
||||||
@ -45,6 +46,12 @@ const StyledComponent = styled.div`
|
|||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media (max-height: 700px) {
|
||||||
|
.save-cancel-buttons {
|
||||||
|
bottom: auto;
|
||||||
|
}
|
||||||
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const CompanyInfoSettings = (props) => {
|
const CompanyInfoSettings = (props) => {
|
||||||
@ -443,6 +450,8 @@ const CompanyInfoSettings = (props) => {
|
|||||||
cancelButtonLabel={t("Common:Restore")}
|
cancelButtonLabel={t("Common:Restore")}
|
||||||
reminderText={t("YouHaveUnsavedChanges")}
|
reminderText={t("YouHaveUnsavedChanges")}
|
||||||
displaySettings={true}
|
displaySettings={true}
|
||||||
|
hasScroll={true}
|
||||||
|
hideBorder={true}
|
||||||
showReminder={(isSettingPaid && showReminder) || isLoading}
|
showReminder={(isSettingPaid && showReminder) || isLoading}
|
||||||
disableRestoreToDefault={companyInfoSettingsIsDefault || isLoading}
|
disableRestoreToDefault={companyInfoSettingsIsDefault || isLoading}
|
||||||
additionalClassSaveButton="company-info-save"
|
additionalClassSaveButton="company-info-save"
|
||||||
|
@ -10,6 +10,7 @@ import Aside from "../aside";
|
|||||||
import Heading from "../heading";
|
import Heading from "../heading";
|
||||||
import Link from "../link";
|
import Link from "../link";
|
||||||
import { desktop, isTablet, isMobile } from "../utils/device";
|
import { desktop, isTablet, isMobile } from "../utils/device";
|
||||||
|
import { isTablet as Tablet } from "react-device-detect";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
StyledBodyContent,
|
StyledBodyContent,
|
||||||
@ -214,7 +215,7 @@ class ContextMenuButton extends React.Component {
|
|||||||
forwardedRef={this.ref}
|
forwardedRef={this.ref}
|
||||||
clickOutsideAction={this.clickOutsideAction}
|
clickOutsideAction={this.clickOutsideAction}
|
||||||
columnCount={columnCount}
|
columnCount={columnCount}
|
||||||
withBackdrop={isTablet() || isMobile()}
|
withBackdrop={isTablet() || isMobile() || Tablet}
|
||||||
zIndex={zIndex}
|
zIndex={zIndex}
|
||||||
isDefaultMode={usePortal}
|
isDefaultMode={usePortal}
|
||||||
>
|
>
|
||||||
|
Loading…
Reference in New Issue
Block a user