From 6514c34ed8c2ead8fd64244fb5cab0c0f0e7295f Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Wed, 18 Jul 2018 08:05:19 -0700
Subject: Make topbar zIndex 1

---
 packages/website/ts/pages/wiki/wiki.tsx | 1 +
 1 file changed, 1 insertion(+)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/pages/wiki/wiki.tsx b/packages/website/ts/pages/wiki/wiki.tsx
index 55f532b11..268ced773 100644
--- a/packages/website/ts/pages/wiki/wiki.tsx
+++ b/packages/website/ts/pages/wiki/wiki.tsx
@@ -95,6 +95,7 @@ export class Wiki extends React.Component<WikiProps, WikiState> {
                     menuSubsectionsBySection={menuSubsectionsBySection}
                     translate={this.props.translate}
                     sidebarHeader={sidebarHeader}
+                    style={{ zIndex: 1 }}
                 />
                 {_.isUndefined(this.state.articlesBySection) ? (
                     <div className="col col-12" style={mainContainersStyle}>
-- 
cgit v1.2.3


From fc166dea26b55730a43876628c070f3ca0a3f2ed Mon Sep 17 00:00:00 2001
From: fragosti <francesco.agosti93@gmail.com>
Date: Thu, 19 Jul 2018 07:36:41 -0700
Subject: Add zIndex 1 to topbar and fix issue where no box-shadow present on
 /docs

---
 packages/website/ts/components/top_bar/top_bar.tsx | 7 ++++++-
 packages/website/ts/pages/wiki/wiki.tsx            | 1 -
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'packages/website/ts')

diff --git a/packages/website/ts/components/top_bar/top_bar.tsx b/packages/website/ts/components/top_bar/top_bar.tsx
index 63ea3475a..646d3fc94 100644
--- a/packages/website/ts/components/top_bar/top_bar.tsx
+++ b/packages/website/ts/components/top_bar/top_bar.tsx
@@ -59,6 +59,7 @@ const styles: Styles = {
         position: 'relative',
         top: 0,
         paddingBottom: 1,
+        zIndex: 1,
     },
     bottomBar: {
         boxShadow: 'rgba(0, 0, 0, 0.187647) 0px 1px 3px',
@@ -481,6 +482,9 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
     private _isViewingPortal(): boolean {
         return _.includes(this.props.location.pathname, WebsitePaths.Portal);
     }
+    private _isViewingDocs(): boolean {
+        return _.includes(this.props.location.pathname, WebsitePaths.Docs);
+    }
     private _isViewingFAQ(): boolean {
         return _.includes(this.props.location.pathname, WebsitePaths.FAQ);
     }
@@ -523,8 +527,9 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
     private _shouldDisplayBottomBar(): boolean {
         return (
             this._isViewingWiki() ||
-            this._isViewing0xjsDocs() ||
             this._isViewingFAQ() ||
+            this._isViewingDocs() ||
+            this._isViewing0xjsDocs() ||
             this._isViewingSmartContractsDocs() ||
             this._isViewingWeb3WrapperDocs() ||
             this._isViewingSolCompilerDocs() ||
diff --git a/packages/website/ts/pages/wiki/wiki.tsx b/packages/website/ts/pages/wiki/wiki.tsx
index 268ced773..55f532b11 100644
--- a/packages/website/ts/pages/wiki/wiki.tsx
+++ b/packages/website/ts/pages/wiki/wiki.tsx
@@ -95,7 +95,6 @@ export class Wiki extends React.Component<WikiProps, WikiState> {
                     menuSubsectionsBySection={menuSubsectionsBySection}
                     translate={this.props.translate}
                     sidebarHeader={sidebarHeader}
-                    style={{ zIndex: 1 }}
                 />
                 {_.isUndefined(this.state.articlesBySection) ? (
                     <div className="col col-12" style={mainContainersStyle}>
-- 
cgit v1.2.3