coop-cloud-chaos-patchs/outline
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rebase fix

Browse Source
This commit is contained in:
Jori Lallo
2017-05-29 18:22:10 -07:00
parent 201f90030c
commit 5a82430553
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/components/DocumentPreview/DocumentPreview.js
View File

@ -32,6 +32,7 @@ const DocumentLink = styled(Link)`
} }
`; `;
// $FlowIssue
const TruncatedMarkdown = styled(Markdown)` const TruncatedMarkdown = styled(Markdown)`
pointer-events: none; pointer-events: none;
`; `;

4
frontend/scenes/Collection/Collection.js
View File

@ -9,7 +9,7 @@ import CollectionsStore from 'stores/CollectionsStore';
import Layout from 'components/Layout'; import Layout from 'components/Layout';
import CenteredContent from 'components/CenteredContent'; import CenteredContent from 'components/CenteredContent';
import AtlasPreviewLoading from 'components/AtlasPreviewLoading'; import PreviewLoading from 'components/PreviewLoading';
type Props = { type Props = {
collections: CollectionsStore, collections: CollectionsStore,
@ -56,7 +56,7 @@ type State = {
{this.state.redirectUrl && <Redirect to={this.state.redirectUrl} />} {this.state.redirectUrl && <Redirect to={this.state.redirectUrl} />}
<CenteredContent> <CenteredContent>
<AtlasPreviewLoading /> <PreviewLoading />
</CenteredContent> </CenteredContent>
</Layout> </Layout>
); );