From e6310a17f8e028d5b9d138d4441a6ceaf9100f3e Mon Sep 17 00:00:00 2001
From: Eugene Pankov <e@ajenti.org>
Date: Mon, 17 Apr 2017 22:43:26 +0200
Subject: [PATCH] .

---
 app/main.js                                   |  8 +++---
 .../src/components/appRoot.component.scss     |  2 +-
 .../src/components/tabHeader.component.scss   |  4 +--
 terminus-core/src/configDefaults.macos.yaml   | 26 +++++++++----------
 terminus-core/src/services/hotkeys.util.ts    |  2 +-
 terminus-core/src/theme.scss                  |  4 +++
 terminus-terminal/src/config.ts               |  3 ++-
 7 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/app/main.js b/app/main.js
index 1dd653a5..dcdde88d 100644
--- a/app/main.js
+++ b/app/main.js
@@ -144,12 +144,12 @@ start = () => {
     }
     Object.assign(options, windowConfig.get('windowBoundaries'))
 
-    if (platform == 'darwin') {
-        options.titleBarStyle = 'hidden-inset'
-    }
-
     if ((configData.appearance || {}).useNativeFrame) {
         options.frame = true
+    } else {
+        if (platform == 'darwin') {
+            options.titleBarStyle = 'hidden-inset'
+        }
     }
 
     app.commandLine.appendSwitch('disable-http-cache')
diff --git a/terminus-core/src/components/appRoot.component.scss b/terminus-core/src/components/appRoot.component.scss
index 9af4786f..ab1cf5a2 100644
--- a/terminus-core/src/components/appRoot.component.scss
+++ b/terminus-core/src/components/appRoot.component.scss
@@ -29,7 +29,7 @@ $tab-border-radius: 4px;
     display: flex;
 
     &>button {
-        line-height: $tabs-height - 2px;
+        line-height: $tabs-height + 2px;
         cursor: pointer;
 
         padding: 0 15px;
diff --git a/terminus-core/src/components/tabHeader.component.scss b/terminus-core/src/components/tabHeader.component.scss
index c8802088..62bd2ed2 100644
--- a/terminus-core/src/components/tabHeader.component.scss
+++ b/terminus-core/src/components/tabHeader.component.scss
@@ -25,13 +25,11 @@ $tabs-height: 40px;
         .index {
             flex: none;
             font-weight: bold;
-            align-self: center;
 
             margin-left: 10px;
             width: 20px;
-            height: 20px;
             border-radius: 10px;
-            line-height: 20px;
+            line-height: 38px;
             text-align: center;
             transition: 0.25s all;
         }
diff --git a/terminus-core/src/configDefaults.macos.yaml b/terminus-core/src/configDefaults.macos.yaml
index 97357d97..f42be530 100644
--- a/terminus-core/src/configDefaults.macos.yaml
+++ b/terminus-core/src/configDefaults.macos.yaml
@@ -2,44 +2,44 @@ hotkeys:
   toggle-window:
     - 'Ctrl+Space'
   close-tab:
-    - 'Cmd-W'
+    - '⌘-W'
     - ['Ctrl-A', 'K']
   toggle-last-tab:
     - ['Ctrl-A', 'A']
     - ['Ctrl-A', 'Ctrl-A']
   next-tab:
-    - 'Cmd-ArrowRight'
+    - '⌘-ArrowRight'
     - ['Ctrl-A', 'N']
   previous-tab:
-    - 'Cmd-ArrowLeft'
+    - '⌘-ArrowLeft'
     - ['Ctrl-A', 'P']
   tab-1:
-    - 'Cmd-1'
+    - '⌘-1'
     - ['Ctrl-A', '1']
   tab-2:
-    - 'Cmd-2'
+    - '⌘-2'
     - ['Ctrl-A', '2']
   tab-3:
-    - 'Cmd-3'
+    - '⌘-3'
     - ['Ctrl-A', '3']
   tab-4:
-    - 'Cmd-4'
+    - '⌘-4'
     - ['Ctrl-A', '4']
   tab-5:
-    - 'Cmd-5'
+    - '⌘-5'
     - ['Ctrl-A', '5']
   tab-6:
-    - 'Cmd-6'
+    - '⌘-6'
     - ['Ctrl-A', '6']
   tab-7:
-    - 'Cmd-7'
+    - '⌘-7'
     - ['Ctrl-A', '7']
   tab-8:
-    - 'Cmd-8'
+    - '⌘-8'
     - ['Ctrl-A', '8']
   tab-9:
-    - 'Cmd-9'
+    - '⌘-9'
     - ['Ctrl-A', '9']
   tab-10:
-    - 'Cmd-0'
+    - '⌘-0'
     - ['Ctrl-A', '0']
diff --git a/terminus-core/src/services/hotkeys.util.ts b/terminus-core/src/services/hotkeys.util.ts
index 331b2173..782ef69e 100644
--- a/terminus-core/src/services/hotkeys.util.ts
+++ b/terminus-core/src/services/hotkeys.util.ts
@@ -46,7 +46,7 @@ export function stringifyKeySequence(events: NativeKeyEvent[]): string[] {
                 itemKeys.push('Shift')
             }
 
-            if (['Control', 'Shift', 'Alt', 'Command'].includes(event.key)) {
+            if (['Control', 'Shift', 'Alt', 'Meta'].includes(event.key)) {
                 // TODO make this optional?
                 continue
             }
diff --git a/terminus-core/src/theme.scss b/terminus-core/src/theme.scss
index 14625afd..82d1fef8 100644
--- a/terminus-core/src/theme.scss
+++ b/terminus-core/src/theme.scss
@@ -323,3 +323,7 @@ ngb-tabset .tab-content {
 .input-group-addon + .form-control {
     border-left: none;
 }
+
+.input-group > select.form-control {
+    flex-direction: row;
+}
diff --git a/terminus-terminal/src/config.ts b/terminus-terminal/src/config.ts
index b2310b21..99c40df7 100644
--- a/terminus-terminal/src/config.ts
+++ b/terminus-terminal/src/config.ts
@@ -29,7 +29,8 @@ export class TerminalConfigProvider extends ConfigProvider {
                 'new-tab': [
                     ['Ctrl-A', 'C'],
                     ['Ctrl-A', 'Ctrl-C'],
-                    'Cmd-T',
+                    '⌘-T',
+                    '⌘-N',
                 ]
             },
         },