This commit is contained in:
Eugene Pankov
2017-04-17 22:43:26 +02:00
parent 4d6c63a0e3
commit e6310a17f8
7 changed files with 26 additions and 23 deletions

View File

@@ -144,12 +144,12 @@ start = () => {
} }
Object.assign(options, windowConfig.get('windowBoundaries')) Object.assign(options, windowConfig.get('windowBoundaries'))
if ((configData.appearance || {}).useNativeFrame) {
options.frame = true
} else {
if (platform == 'darwin') { if (platform == 'darwin') {
options.titleBarStyle = 'hidden-inset' options.titleBarStyle = 'hidden-inset'
} }
if ((configData.appearance || {}).useNativeFrame) {
options.frame = true
} }
app.commandLine.appendSwitch('disable-http-cache') app.commandLine.appendSwitch('disable-http-cache')

View File

@@ -29,7 +29,7 @@ $tab-border-radius: 4px;
display: flex; display: flex;
&>button { &>button {
line-height: $tabs-height - 2px; line-height: $tabs-height + 2px;
cursor: pointer; cursor: pointer;
padding: 0 15px; padding: 0 15px;

View File

@@ -25,13 +25,11 @@ $tabs-height: 40px;
.index { .index {
flex: none; flex: none;
font-weight: bold; font-weight: bold;
align-self: center;
margin-left: 10px; margin-left: 10px;
width: 20px; width: 20px;
height: 20px;
border-radius: 10px; border-radius: 10px;
line-height: 20px; line-height: 38px;
text-align: center; text-align: center;
transition: 0.25s all; transition: 0.25s all;
} }

View File

@@ -2,44 +2,44 @@ hotkeys:
toggle-window: toggle-window:
- 'Ctrl+Space' - 'Ctrl+Space'
close-tab: close-tab:
- 'Cmd-W' - '-W'
- ['Ctrl-A', 'K'] - ['Ctrl-A', 'K']
toggle-last-tab: toggle-last-tab:
- ['Ctrl-A', 'A'] - ['Ctrl-A', 'A']
- ['Ctrl-A', 'Ctrl-A'] - ['Ctrl-A', 'Ctrl-A']
next-tab: next-tab:
- 'Cmd-ArrowRight' - '-ArrowRight'
- ['Ctrl-A', 'N'] - ['Ctrl-A', 'N']
previous-tab: previous-tab:
- 'Cmd-ArrowLeft' - '-ArrowLeft'
- ['Ctrl-A', 'P'] - ['Ctrl-A', 'P']
tab-1: tab-1:
- 'Cmd-1' - '-1'
- ['Ctrl-A', '1'] - ['Ctrl-A', '1']
tab-2: tab-2:
- 'Cmd-2' - '-2'
- ['Ctrl-A', '2'] - ['Ctrl-A', '2']
tab-3: tab-3:
- 'Cmd-3' - '-3'
- ['Ctrl-A', '3'] - ['Ctrl-A', '3']
tab-4: tab-4:
- 'Cmd-4' - '-4'
- ['Ctrl-A', '4'] - ['Ctrl-A', '4']
tab-5: tab-5:
- 'Cmd-5' - '-5'
- ['Ctrl-A', '5'] - ['Ctrl-A', '5']
tab-6: tab-6:
- 'Cmd-6' - '-6'
- ['Ctrl-A', '6'] - ['Ctrl-A', '6']
tab-7: tab-7:
- 'Cmd-7' - '-7'
- ['Ctrl-A', '7'] - ['Ctrl-A', '7']
tab-8: tab-8:
- 'Cmd-8' - '-8'
- ['Ctrl-A', '8'] - ['Ctrl-A', '8']
tab-9: tab-9:
- 'Cmd-9' - '-9'
- ['Ctrl-A', '9'] - ['Ctrl-A', '9']
tab-10: tab-10:
- 'Cmd-0' - '-0'
- ['Ctrl-A', '0'] - ['Ctrl-A', '0']

View File

@@ -46,7 +46,7 @@ export function stringifyKeySequence(events: NativeKeyEvent[]): string[] {
itemKeys.push('Shift') itemKeys.push('Shift')
} }
if (['Control', 'Shift', 'Alt', 'Command'].includes(event.key)) { if (['Control', 'Shift', 'Alt', 'Meta'].includes(event.key)) {
// TODO make this optional? // TODO make this optional?
continue continue
} }

View File

@@ -323,3 +323,7 @@ ngb-tabset .tab-content {
.input-group-addon + .form-control { .input-group-addon + .form-control {
border-left: none; border-left: none;
} }
.input-group > select.form-control {
flex-direction: row;
}

View File

@@ -29,7 +29,8 @@ export class TerminalConfigProvider extends ConfigProvider {
'new-tab': [ 'new-tab': [
['Ctrl-A', 'C'], ['Ctrl-A', 'C'],
['Ctrl-A', 'Ctrl-C'], ['Ctrl-A', 'Ctrl-C'],
'Cmd-T', '-T',
'⌘-N',
] ]
}, },
}, },