From 4eb3e145e9f33a41bc211787100a761cb76edc0d Mon Sep 17 00:00:00 2001
From: sunny <sunny@loafle.com>
Date: Wed, 12 Jul 2017 17:58:34 +0900
Subject: [PATCH] layout
---
src/ts/containers/test/TopBar.tsx | 7 +++----
src/ts/containers/test/layout/Footer.tsx | 4 ++--
src/ts/containers/test/layout/Layout.tsx | 14 ++++++--------
3 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/ts/containers/test/TopBar.tsx b/src/ts/containers/test/TopBar.tsx
index da4af3a..c84a6c0 100644
--- a/src/ts/containers/test/TopBar.tsx
+++ b/src/ts/containers/test/TopBar.tsx
@@ -91,15 +91,14 @@ export class TopBar extends React.Component<any, any> {
<Menu.Item position='right'>
- <Icon name='setting' />
+ <Icon name='setting' size='large' />
</Menu.Item>
<Menu.Item onClick={() => {
this.setState({ notification_visible: !this.state.notification_visible })
}}>
- <Icon name='alarm' />
- <Label color='red' floating>22</Label>
+ <Label color='teal' horizontal>22</Label>
</Menu.Item>
- <Menu.Item>
+ <Menu.Item >
<Dropdown icon='user' className='ui pointing dropdown top right'>
<Dropdown.Menu >
<Dropdown.Item text='Log out' />
diff --git a/src/ts/containers/test/layout/Footer.tsx b/src/ts/containers/test/layout/Footer.tsx
index a8e3f49..15e03ea 100644
--- a/src/ts/containers/test/layout/Footer.tsx
+++ b/src/ts/containers/test/layout/Footer.tsx
@@ -11,8 +11,8 @@ export class Footer extends React.Component<any, any> {
render() {
return (
- <Container>
- Footer area
+ <Container textAlign='center'>
+ <div>Copyright LOAFLE.</div>
</Container>
);
}
diff --git a/src/ts/containers/test/layout/Layout.tsx b/src/ts/containers/test/layout/Layout.tsx
index fd85e3c..fe72c37 100644
--- a/src/ts/containers/test/layout/Layout.tsx
+++ b/src/ts/containers/test/layout/Layout.tsx
@@ -20,9 +20,8 @@ export class Layout extends React.Component<any, any> {
render() {
return (
<div>
- <br />
-
- <Sidebar.Pushable as={Segment} >
+ <Header />
+ <Sidebar.Pushable as={Segment} vertical >
<Sidebar
as={Menu}
animation='overlay'
@@ -47,20 +46,19 @@ export class Layout extends React.Component<any, any> {
</Menu.Item>
</Sidebar>
-
<Sidebar.Pusher >
- <Segment basic >
- <Header />
+ <Segment vertical>
+
<button placeholder='menu' onClick={() => {
this.setState({ notification_visible: !this.state.notification_visible })
}}> sidebar </button>
+
<Container>
- <br />
<Router history={history}>
<Routes />
</Router>
</Container>
- <br />
+
<Footer />
</Segment>
</Sidebar.Pusher>