From 951892a85ce424394f0215ad34652b49a858568a Mon Sep 17 00:00:00 2001 From: vrde Date: Wed, 20 May 2015 17:35:52 +0200 Subject: [PATCH] Add header --- css/main.css | 6 +++++- js/components/ascribe_app.js | 4 ++-- js/components/header.js | 29 ++++++++++++++++++++++++++++- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/css/main.css b/css/main.css index 8a790a64..754233a1 100644 --- a/css/main.css +++ b/css/main.css @@ -1,3 +1,7 @@ +#main { + padding-top: 70px; +} + .ascribe-table-header-column { font-weight: bold; -} \ No newline at end of file +} diff --git a/js/components/ascribe_app.js b/js/components/ascribe_app.js index 093b06dd..7d19c1b0 100644 --- a/js/components/ascribe_app.js +++ b/js/components/ascribe_app.js @@ -11,9 +11,9 @@ let AscribeApp = React.createClass({ return (
- +
); diff --git a/js/components/header.js b/js/components/header.js index 71d67197..b685371a 100644 --- a/js/components/header.js +++ b/js/components/header.js @@ -21,7 +21,34 @@ let Header = React.createClass({ render() { return ( -
hello {this.state.currentUser.username}
+ ) } });