Bug 53416 - Client.Files.Desktop: Fixed scrolls under Ubuntu.
This commit is contained in:
parent
cf3c74c50f
commit
5759758f71
@ -9,8 +9,8 @@ import { isMobile } from "react-device-detect";
|
||||
const StyledArticleBody = styled.div`
|
||||
${(props) => props.displayBorder && `outline: 1px dotted;`}
|
||||
flex-grow: 1;
|
||||
height: 100%;
|
||||
|
||||
${(props) => (props.isDesktop ? "height:auto" : "height:100%")};
|
||||
.custom-scrollbar {
|
||||
width: calc(100% + 24px) !important;
|
||||
}
|
||||
|
@ -12,7 +12,9 @@ import { tablet, desktop } from "@appserver/components/utils/device";
|
||||
|
||||
const commonStyles = css`
|
||||
flex-grow: 1;
|
||||
height: 100%;
|
||||
|
||||
${(props) => (props.isDesktop ? "height: auto" : "height: 100%")};
|
||||
|
||||
border-left: none;
|
||||
|
||||
-webkit-user-select: none;
|
||||
@ -114,6 +116,7 @@ class SectionBody extends React.Component {
|
||||
viewAs,
|
||||
withScroll,
|
||||
isLoaded,
|
||||
isDesktop,
|
||||
} = this.props;
|
||||
|
||||
const focusProps = autoFocus
|
||||
@ -131,6 +134,7 @@ class SectionBody extends React.Component {
|
||||
viewAs={viewAs}
|
||||
pinned={pinned}
|
||||
isLoaded={isLoaded}
|
||||
isDesktop={isDesktop}
|
||||
className="section-body"
|
||||
>
|
||||
{withScroll ? (
|
||||
@ -219,7 +223,10 @@ SectionBody.defaultProps = {
|
||||
};
|
||||
|
||||
export default inject(({ auth }) => {
|
||||
const { settingsStore } = auth;
|
||||
const { isDesktopClient: isDesktop } = settingsStore;
|
||||
return {
|
||||
isLoaded: auth.isLoaded,
|
||||
isDesktop,
|
||||
};
|
||||
})(observer(SectionBody));
|
||||
|
Loading…
Reference in New Issue
Block a user