diff --git a/src/renderer/component/page/view.jsx b/src/renderer/component/page/view.jsx index 7286c9046..7039eb19c 100644 --- a/src/renderer/component/page/view.jsx +++ b/src/renderer/component/page/view.jsx @@ -12,8 +12,8 @@ type Props = { noPadding: ?boolean, extraPadding: ?boolean, notContained: ?boolean, // No max-width, but keep the padding - forContent: ?boolean, loading: ?boolean, + className: ?string, }; type State = { @@ -79,17 +79,16 @@ class Page extends React.PureComponent { extraPadding, notContained, loading, - forContent, + className, } = this.props; const { showLoader } = this.state; return (
{pageTitle && ( diff --git a/src/renderer/page/file/view.jsx b/src/renderer/page/file/view.jsx index 7e5ca421a..42be80354 100644 --- a/src/renderer/page/file/view.jsx +++ b/src/renderer/page/file/view.jsx @@ -158,24 +158,26 @@ class FilePage extends React.Component { } return ( - - {showFile && } - {!showFile && - (thumbnail ? ( - - ) : ( -
-
- {__("Sorry, looks like we can't preview this file.")} + +
+ {showFile && } + {!showFile && + (thumbnail ? ( + + ) : ( +
+
+ {__("Sorry, looks like we can't preview this file.")} +
-
- ))} + ))} +
-
+

{title}

@@ -237,8 +239,9 @@ class FilePage extends React.Component {
- - +
+ +
); } diff --git a/src/renderer/scss/component/_main.scss b/src/renderer/scss/component/_main.scss index 09274b390..d13e921ef 100644 --- a/src/renderer/scss/component/_main.scss +++ b/src/renderer/scss/component/_main.scss @@ -12,3 +12,29 @@ padding: var(--spacing-vertical-large); } } + +.main--file-page { + display: grid; + grid-template-areas: + 'content content' + 'info related' + 'info related'; + + @media (min-width: 1470px) { + grid-template-areas: + 'content related' + 'info related' + 'info related'; + grid-template-rows: 0fr 1fr; + } + + .grid-area--content { + grid-area: content; + } + .grid-area--info { + grid-area: info; + } + .grid-area--related { + grid-area: related; + } +} diff --git a/src/renderer/scss/component/_media.scss b/src/renderer/scss/component/_media.scss index 444fd131b..721114a6a 100644 --- a/src/renderer/scss/component/_media.scss +++ b/src/renderer/scss/component/_media.scss @@ -199,9 +199,7 @@ // C O N T E N T .media__content--large { - float: left; padding-right: var(--spacing-vertical-large); - width: calc(100% - 30rem); } // M E D I A