yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into inputs

Browse Source
This commit is contained in:
Tom Moor
2017-06-25 22:06:12 -07:00
parent db1d8c2258 cac4b0811b
commit dcb5017d71
3 changed files with 25 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/scenes/Flatpage/Flatpage.js
View File

@@ -1,8 +1,6 @@
// @flow
import React from 'react';
import { observer } from 'mobx-react';
import Layout, { Title } from 'components/Layout';
import CenteredContent from 'components/CenteredContent';
import { DocumentHtml } from 'components/Document';
import PageTitle from 'components/PageTitle';
@@ -21,12 +19,10 @@ type Props = {
const { title, content } = this.props;
return (
<Layout title={<Title content={title} />} search={false}>
<CenteredContent>
<PageTitle title={title} />
<CenteredContent>
<DocumentHtml html={convertToMarkdown(content)} />
</CenteredContent>
</Layout>
<DocumentHtml html={convertToMarkdown(content)} />
</CenteredContent>
);
}
}

26
server/static/dev.html
View File

@@ -9,30 +9,20 @@
padding: 0;
}
body {
display: flex;
width: 100%;
height: 100%;
}
#root {
flex: 1;
height: 100%;
}
.container {
display: flex;
flex;
}
.header {
display: flex;
flex: 1;
height: 42px;
border-bottom: 1px solid #eee;
}
</style>
</head>
<body style='display: flex; width: 100%; height: 100%;'>
<div id="root">
<div class="container">
<div class="header"></div>
</div>
</div>
<body>
<div id="root"></div>
<script src="/static/bundle.js"></script>
</body>
</html>

31
server/static/index.html
View File

@@ -1,19 +1,16 @@
<!doctype html>
<html>
<head>
<title>Atlas</title>
<style>
body,
html {
display: flex;
margin: 0;
padding: 0;
}
</style>
</head>
<body>
</body>
</html>
<head>
<title>Atlas</title>
<style>
body,
html {
display: flex;
margin: 0;
padding: 0;
}
</style>
</head>
<body>
</body>
</html>