add logged-in header back

jweismann · May 17, 2017 · 8ab3dcd · 8ab3dcd
1 parent c2d439b
commit 8ab3dcd
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 11 deletions.
diff --git a/app/components/Header.js b/app/components/Header.js
@@ -81,15 +81,20 @@ export class Header extends Component {
 
     return (
       <div className={styles.header}>
-        <LoggedInAs
-          dropMenu={dropdown}
-          isUploadInProgress={this.props.uploadIsInProgress}
-          onChooseDevices={this.handleClickChooseDevices}
-          onClicked={this.props.sync.toggleDropdown.bind(this, this.props.dropdown)}
-          onLogout={this.props.async.doLogout}
-          user={allUsers[this.props.loggedInUser]}
-          isClinicAccount={this.props.isClinicAccount}
-          targetUsersForUpload={this.props.targetUsersForUpload} />
+        <div className={styles.headerRow}>
+          <div className={styles.smallLogoWrapper}>
+            <img className={styles.smallLogo} src={logo} />
+          </div>
+          <LoggedInAs
+            dropMenu={dropdown}
+            isUploadInProgress={this.props.uploadIsInProgress}
+            onChooseDevices={this.handleClickChooseDevices}
+            onClicked={this.props.sync.toggleDropdown.bind(this, this.props.dropdown)}
+            onLogout={this.props.async.doLogout}
+            user={allUsers[this.props.loggedInUser]}
+            isClinicAccount={this.props.isClinicAccount}
+            targetUsersForUpload={this.props.targetUsersForUpload} />
+        </div>
       </div>
     );
   }

diff --git a/app/package.json b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tidepool-uploader",
   "productName":  "tidepool-uploader",
-  "version": "0.310.0-alpha.3",
+  "version": "0.310.0-alpha.4",
   "description": "Tidepool Project Universal Uploader",
   "main": "./main.js",
   "author": {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tidepool-uploader",
-  "version": "0.310.0-alpha.3",
+  "version": "0.310.0-alpha.4",
   "description": "Tidepool Project Universal Uploader",
   "private": true,
   "main": "main.js",

diff --git a/styles/components/Header.module.less b/styles/components/Header.module.less
@@ -21,6 +21,12 @@
   margin: 0px auto;
 }
 
+.headerRow {
+  composes: flexRow from '../core/layout.module.less';
+  justify-content: space-between;
+  align-items: baseline;
+}
+
 .signup {
   composes: flexRow from '../core/layout.module.less';
   justify-content: flex-end;
@@ -38,12 +44,22 @@
   height: 36px;
 }
 
+.smallLogoWrapper {
+  margin-top: 30px;
+  margin-bottom: 55px;
+}
+
+.smallLogo {
+  width: 230px;
+}
+
 .heroText {
   composes: flexRow from '../core/layout.module.less';
   composes: large from '../core/typography.module.less';
   justify-content: center;
   margin: 35px auto 50px auto;
 }
+
 .signupLink {
   composes: invertLink from '../core/typography.module.less';
   text-decoration: none;