Merge pull request #176 from filecoin-project/@harisbutt

updates to nav

common/navigation-data.js

@@ -72,6 +72,7 @@ export const generate = ({ library = [], slates = [] }) => [
     children: constructSlatesTreeForNavigation(slates),
   },
   constructFilesTreeForNavigation(library),
+  /*
   {
     id: "V1_NAVIGATION_LOCAL",
     decorator: "LOCAL_DATA",
@@ -80,7 +81,6 @@ export const generate = ({ library = [], slates = [] }) => [
     children: [],
     ignore: false,
   },
-  /*
   {
     id: "V1_NAVIGATION_WALLET",
     decorator: "WALLET",
@@ -94,8 +94,7 @@ export const generate = ({ library = [], slates = [] }) => [
         pageTitle: "Your deal history",
       },
     ],
-  },
-  */
+  }, 
   {
     id: "V1_NAVIGATION_NETWORK",
     decorator: "NETWORK",
@@ -103,6 +102,7 @@ export const generate = ({ library = [], slates = [] }) => [
     pageTitle: "The Filecoin Network",
     children: null,
   },
+  */
   {
     id: "V1_NAVIGATION_API",
     decorator: "SETTINGS_DEVELOPER",

components/core/ApplicationControlMenu.js

@@ -96,12 +96,12 @@ export default class ApplicationControlMenu extends React.Component {
         <CircleButtonLight
           onClick={this._handleClick}
           style={{
-            backgroundColor: this.state.visible ? Constants.system.brand : null,
+            backgroundColor: this.state.visible ? Constants.system.brand : Constants.system.white,
             color: this.state.visible ? Constants.system.white : null,
           }}>
           <OldSVG.ChevronDown height="20px" />
         </CircleButtonLight>
-      </TooltipWrapper>
+      </TooltipWrapper> 
     );
   }
 }

components/core/ApplicationNavigation.js

@@ -57,7 +57,7 @@ const STYLES_NAVIGATION_ITEM = css`
 const STYLES_PROFILE = css`
   font-family: ${Constants.font.semiBold};
   color: ${Constants.system.pitchBlack};
-  background-color: ${Constants.system.gray};
+  background-color: ${Constants.system.white};
   font-size: 12px;
   line-height: 12px;
   text-decoration: none;
@@ -69,12 +69,12 @@ const STYLES_PROFILE = css`
   align-items: center;
   justify-content: flex-start;
   transition: 200ms ease all;
-
+/*
   :hover {
     color: ${Constants.system.white};
     background-color: ${Constants.system.brand};
   }
-
+*/
   @media (max-width: ${Constants.sizes.mobile}px) {
     display: none;
   }
@@ -279,15 +279,9 @@ export default class ApplicationNavigation extends React.Component {
     return (
       <nav css={STYLES_NAVIGATION}>
         <div css={STYLES_NAVIGATION_HEADER}>
-          <ApplicationControlMenu
-            onNavigateTo={this.props.onNavigateTo}
-            onAction={this.props.onAction}
-            onSignOut={this.props.onSignOut}
-          />
-
           <a
             css={STYLES_PROFILE}
-            style={{ marginLeft: 16 }}
+            style={{ marginRight: 16 }}
             href={`/${this.props.viewer.username}`}
             target="_blank"
           >
@@ -299,6 +293,11 @@ export default class ApplicationNavigation extends React.Component {
             />
             {this.props.viewer.username}
           </a>
+          <ApplicationControlMenu
+            onNavigateTo={this.props.onNavigateTo}
+            onAction={this.props.onAction}
+            onSignOut={this.props.onSignOut}
+          />
         </div>
         {this.props.navigation.map((each) => {
           if (!each) {

components/core/CircleButtonLight.js

@@ -19,11 +19,12 @@ const STYLES_BUTTON = css`
   cursor: pointer;
   user-select: none;
   flex-shrink: 0;
-
+/*
   :hover {
     color: ${Constants.system.white};
     background-color: ${Constants.system.brand};
-  }
+  } 
+*/
 `;
 
 export default (props) => {