From c87a035f1ae9763b071a8cfcf8f25df6a4d702f7 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@nonnenberg.com>
Date: Thu, 1 Mar 2018 12:04:13 -0800
Subject: [PATCH] Show View -> Debug on OSX, ensure Debug Log is visible
 (#2089)

* Ensure debug log is visible during registration/import

* Restore the proper View menu on MacOSX
---
 app/menu.js              | 3 ++-
 stylesheets/_global.scss | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/menu.js b/app/menu.js
index ce3111258..e021ee6c2 100644
--- a/app/menu.js
+++ b/app/menu.js
@@ -245,8 +245,9 @@ function updateForMac(template, messages, options) {
   );
 
   // Replace Window menu
+  const windowIndex = options.includeSetup ? 4 : 3;
   // eslint-disable-next-line no-param-reassign
-  template[3].submenu = [
+  template[windowIndex].submenu = [
     {
       accelerator: 'CmdOrCtrl+W',
       role: 'close',
diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss
index 296f73e8d..9b4d7290e 100644
--- a/stylesheets/_global.scss
+++ b/stylesheets/_global.scss
@@ -610,7 +610,6 @@ input[type=text], input[type=search], textarea {
 }
 
 .full-screen-flow {
-  z-index: 1000;
   position: absolute;
   left: 0;
   right: 0;