diff --git a/packages/components-faraday/src/components/Dashboard/Dashboard.js b/packages/components-faraday/src/components/Dashboard/Dashboard.js index e949271a1dc9bd8817f10a0615fdbf05f18aef98..259aad9b59165767076ce0ea77fc9fd94ad68900 100644 --- a/packages/components-faraday/src/components/Dashboard/Dashboard.js +++ b/packages/components-faraday/src/components/Dashboard/Dashboard.js @@ -16,7 +16,7 @@ const Dashboard = ({ }) => ( <Fragment> <Row alignItems="center" justify="space-between"> - <H1>Dashboard</H1> + <H1 mb={1}>Dashboard</H1> <Button data-test="new-manuscript" disabled={!canCreateDraft} @@ -40,12 +40,3 @@ export default compose( dashboardItems: filterItems(dashboard.all), })), )(Dashboard) - -// #region styles -// const Root = styled.div` -// display: flex; -// flex-direction: column; -// overflow: auto; -// padding: 0 calc(${th('gridUnit')} * 17); -// ` -// #endregion diff --git a/packages/components-faraday/src/components/Dashboard/DashboardFilters.js b/packages/components-faraday/src/components/Dashboard/DashboardFilters.js index 619c63809ec0912d152e1e6a509869bcf414d899..aea159fd763b3196a879c27a6a9b279b3569ec5b 100644 --- a/packages/components-faraday/src/components/Dashboard/DashboardFilters.js +++ b/packages/components-faraday/src/components/Dashboard/DashboardFilters.js @@ -8,7 +8,7 @@ const DashboardFilters = ({ changeFilterValue, getDefaultFilterValue, }) => ( - <Row alignItems="flex-end" justify="flex-start"> + <Row alignItems="flex-end" justify="flex-start" mb={1}> <Text mr={1} pb={1} secondary> Filters </Text> diff --git a/packages/components-faraday/src/components/Dashboard/DashboardItems.js b/packages/components-faraday/src/components/Dashboard/DashboardItems.js index 1bfd33538855e2e5c48d8e2b2999684782252e1e..a978c0b0e709c3ecbb9911695473f029a5a48515 100644 --- a/packages/components-faraday/src/components/Dashboard/DashboardItems.js +++ b/packages/components-faraday/src/components/Dashboard/DashboardItems.js @@ -1,6 +1,7 @@ -import React, { Fragment } from 'react' +import React from 'react' import { H3 } from '@pubsweet/ui' import { get, has } from 'lodash' +import styled from 'styled-components' import { withRouter } from 'react-router-dom' import { ManuscriptCard, Row } from 'pubsweet-component-faraday-ui' import { compose, setDisplayName, withHandlers, withProps } from 'recompose' @@ -10,7 +11,7 @@ import withVersion from './withVersion' const DashboardItem = withVersion(ManuscriptCard) const DashboardItems = ({ onClick, list, deleteProject, listView = true }) => ( - <Fragment> + <Root> {!list.length ? ( <Row justify="center" mt={4}> <H3>Nothing to do at the moment. Please upload a manuscript.</H3> @@ -24,7 +25,7 @@ const DashboardItems = ({ onClick, list, deleteProject, listView = true }) => ( /> )) )} - </Fragment> + </Root> ) export default compose( @@ -53,3 +54,13 @@ export default compose( }), setDisplayName('DashboardItems'), )(DashboardItems) + +// #region styles +const Root = styled.div` + height: calc(100vh - 200px); + overflow-y: auto; + div[open] { + width: auto; + } +` +// #endregion diff --git a/packages/xpub-faraday/app/FaradayApp.js b/packages/xpub-faraday/app/FaradayApp.js index f78e91ef7b77edebef2fd424d9568acac8d9d0f0..1ef508a8c807911d838522e92a2e169e9b746820 100644 --- a/packages/xpub-faraday/app/FaradayApp.js +++ b/packages/xpub-faraday/app/FaradayApp.js @@ -46,7 +46,7 @@ export default compose( // #region styles const Root = styled.div` height: 100%; - overflow-y: scroll; + overflow-y: auto; div[open] { width: auto; } @@ -55,8 +55,8 @@ const Root = styled.div` const MainContainer = styled.div` display: flex; flex-direction: column; - overflow-y: scroll; + overflow-y: auto; padding: 0 calc(${th('gridUnit')} * 17); - padding-top: ${th('appBar.height')}; + padding-top: calc(${th('appBar.height')} + ${th('gridUnit')} * 3 )}; ` // #endregion