Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
This commit is contained in:
commit
19f73a9255
@ -353,6 +353,7 @@ DropDownContainer.propTypes = {
|
||||
isDefaultMode: PropTypes.bool,
|
||||
/** Needed to open correctly people and group selector when the section width is small */
|
||||
smallSectionWidth: PropTypes.bool,
|
||||
/** It is necessary when we explicitly set the direction, disables check position */
|
||||
fixedDirection: PropTypes.bool,
|
||||
};
|
||||
|
||||
|
@ -235,6 +235,7 @@ const MainButtonMobile = (props) => {
|
||||
directionY="top"
|
||||
directionX="right"
|
||||
isMobile={isMobile || isTablet}
|
||||
fixedDirection={true}
|
||||
heightProp={height}
|
||||
sectionWidth={sectionWidth}
|
||||
isDefaultMode={false}
|
||||
|
@ -155,7 +155,6 @@ class ArticleBodyContent extends React.Component {
|
||||
const items = this.catalogItems();
|
||||
const { isLoadedPage } = this.props;
|
||||
const commonSettings = location.pathname.includes("common");
|
||||
// TODO: styles fix
|
||||
|
||||
const showLoader = commonSettings ? !isLoadedPage : false;
|
||||
|
||||
|
@ -15,7 +15,6 @@ const StyledLoader = styled.div`
|
||||
|
||||
@media (min-width: 1024px) {
|
||||
padding: 0px 20px 0px;
|
||||
margin-top: -7px;
|
||||
|
||||
.loader {
|
||||
width: 216px;
|
||||
|
@ -37,23 +37,11 @@ const StyledSettingsComponent = styled.div`
|
||||
font-weight: 400;
|
||||
}
|
||||
|
||||
.field-container-flex {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
margin-top: 8px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
.toggle {
|
||||
position: inherit;
|
||||
grid-gap: inherit;
|
||||
}
|
||||
|
||||
.field-title {
|
||||
font-weight: 600;
|
||||
line-height: 20px;
|
||||
}
|
||||
|
||||
.errorText {
|
||||
position: absolute;
|
||||
font-size: 10px;
|
||||
|
@ -1,7 +1,6 @@
|
||||
import React from "react";
|
||||
import { withTranslation } from "react-i18next";
|
||||
import FieldContainer from "@appserver/components/field-container";
|
||||
import ToggleButton from "@appserver/components/toggle-button";
|
||||
import ComboBox from "@appserver/components/combobox";
|
||||
import toastr from "@appserver/components/toast/toastr";
|
||||
import HelpButton from "@appserver/components/help-button";
|
||||
@ -433,13 +432,6 @@ class LanguageAndTimeZone extends React.Component {
|
||||
className="dropdown-item-width"
|
||||
/>
|
||||
</FieldContainer>
|
||||
<div className="field-container-flex">
|
||||
<div className="field-title">{`${t("Automatic time zone")}`}</div>
|
||||
<ToggleButton
|
||||
className="toggle"
|
||||
onChange={() => toastr.info(<>Not implemented</>)}
|
||||
/>
|
||||
</div>
|
||||
<FieldContainer
|
||||
id="fieldContainerTimezone"
|
||||
labelText={`${t("TimeZone")}:`}
|
||||
|
@ -60,7 +60,12 @@ class WelcomePageSettings extends React.Component {
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
const { isLoaded, setIsLoadedWelcomePageSettings, tReady } = this.props;
|
||||
window.addEventListener("resize", this.checkInnerWidth);
|
||||
|
||||
const isLoadedSetting = isLoaded && tReady;
|
||||
|
||||
if (isLoadedSetting) setIsLoadedWelcomePageSettings(isLoadedSetting);
|
||||
}
|
||||
|
||||
componentDidUpdate(prevProps, prevState) {
|
||||
@ -68,9 +73,13 @@ class WelcomePageSettings extends React.Component {
|
||||
|
||||
const { hasScroll } = this.state;
|
||||
|
||||
if (isLoaded !== prevProps.isLoaded || tReady !== prevProps.tReady) {
|
||||
const isLoadedSetting = isLoaded && tReady;
|
||||
|
||||
if (isLoadedSetting) setIsLoadedWelcomePageSettings(isLoadedSetting);
|
||||
if (isLoadedSetting) {
|
||||
setIsLoadedWelcomePageSettings(isLoadedSetting);
|
||||
}
|
||||
}
|
||||
|
||||
const checkScroll = checkScrollSettingsBlock();
|
||||
|
||||
|
@ -127,7 +127,6 @@ const LoaderCustomization = ({
|
||||
<Loaders.Rectangle height="32px" className="combo-box" />
|
||||
{lngTZSettings && (
|
||||
<>
|
||||
<Loaders.Rectangle height="20px" className="field-container" />
|
||||
<Loaders.Rectangle height="20px" className="title-long" />
|
||||
<Loaders.Rectangle height="32px" className="combo-box" />
|
||||
</>
|
||||
|
Loading…
Reference in New Issue
Block a user