From 6c0fd4409aacf492909e62b6392b1ad42739f4bb Mon Sep 17 00:00:00 2001
From: Sandy McFadden <sandy.mcfadden@automattic.com>
Date: Tue, 4 May 2021 13:28:48 -0300
Subject: [PATCH 1/3] Enable Mac Electron title bar

---
 desktop/app.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/desktop/app.js b/desktop/app.js
index 068c739cd..8c8add313 100644
--- a/desktop/app.js
+++ b/desktop/app.js
@@ -66,7 +66,6 @@ module.exports = function main() {
       height: mainWindowState.height,
       minWidth: 370,
       minHeight: 520,
-      titleBarStyle: 'hidden',
       show: false,
       webPreferences: {
         contextIsolation: true,

From 20dae8379279827d458c2ead9d0cad61026ca4ef Mon Sep 17 00:00:00 2001
From: Sandy McFadden <sandy.mcfadden@automattic.com>
Date: Tue, 4 May 2021 13:31:05 -0300
Subject: [PATCH 2/3] Remove un-needed CSS to account for previously having the
 titlebar hidden

---
 lib/app.tsx                   |  1 -
 lib/navigation-bar/style.scss |  4 ----
 lib/note-actions/style.scss   |  4 ----
 scss/_general.scss            | 33 ---------------------------------
 4 files changed, 42 deletions(-)

diff --git a/lib/app.tsx b/lib/app.tsx
index 00d6b79f2..96e28daf5 100644
--- a/lib/app.tsx
+++ b/lib/app.tsx
@@ -204,7 +204,6 @@ class AppComponent extends Component<Props> {
     const mainClasses = classNames('simplenote-app', {
       'navigation-open': showNavigation,
       'is-electron': isElectron,
-      'is-macos': isElectron && isMac,
     });
 
     return (
diff --git a/lib/navigation-bar/style.scss b/lib/navigation-bar/style.scss
index c0f6ede71..e08864706 100644
--- a/lib/navigation-bar/style.scss
+++ b/lib/navigation-bar/style.scss
@@ -12,10 +12,6 @@
   transition: transform 200ms ease-in-out;
 }
 
-.is-macos .navigation-bar {
-  padding-top: $toolbar-height + 26px;
-}
-
 .navigation-bar__folders {
   display: flex;
   flex: none;
diff --git a/lib/note-actions/style.scss b/lib/note-actions/style.scss
index 9e3eeded6..8871ead76 100644
--- a/lib/note-actions/style.scss
+++ b/lib/note-actions/style.scss
@@ -1,7 +1,3 @@
-.is-macos .note-actions {
-  top: $toolbar-height + 16px + 26px;
-}
-
 .note-actions {
   width: 200px;
   position: absolute;
diff --git a/scss/_general.scss b/scss/_general.scss
index faab410a3..42b0a2d4c 100644
--- a/scss/_general.scss
+++ b/scss/_general.scss
@@ -62,39 +62,6 @@ optgroup {
   height: 100%;
 }
 
-.is-macos {
-  .note-toolbar-wrapper {
-    box-sizing: border-box;
-    -webkit-app-region: drag;
-    padding: 40px 0 30px;
-  }
-
-  .new-note-toolbar__button-sidebar {
-    border-right: 0;
-    padding-right: 0;
-  }
-
-  .menu-bar {
-    padding: 40px 15px 30px;
-    box-sizing: border-box;
-    -webkit-app-region: drag;
-  }
-
-  .note-toolbar-placeholder {
-    height: 71px;
-    -webkit-app-region: drag;
-  }
-
-  .note-info {
-    padding-top: 10px;
-  }
-
-  .button,
-  .search-field {
-    -webkit-app-region: no-drag;
-  }
-}
-
 .login__draggable-area {
   height: 100px;
   position: absolute;

From ba6efc534f36f99615884478db9a216eeafc9ec4 Mon Sep 17 00:00:00 2001
From: Sandy McFadden <sandy.mcfadden@automattic.com>
Date: Tue, 4 May 2021 14:07:12 -0300
Subject: [PATCH 3/3] remove a bit more unneeded CSS

---
 lib/note-toolbar/style.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/note-toolbar/style.scss b/lib/note-toolbar/style.scss
index 6fb281bc5..9c1a422f6 100644
--- a/lib/note-toolbar/style.scss
+++ b/lib/note-toolbar/style.scss
@@ -19,10 +19,6 @@
   width: 64px;
 }
 
-.is-electron.is-macos .note-toolbar-wrapper .offline-badge {
-  margin-top: -11px;
-}
-
 body[data-theme='dark'] .note-toolbar-wrapper .offline-badge {
   border: solid 1px $studio-gray-80;
   box-shadow: 0 2px 4px 0 rgba(255, 255, 255, 0.02);