Skip to content

Commit

Permalink
Slight UI tweaks
Browse files Browse the repository at this point in the history
crittermike committed Dec 10, 2017
1 parent 10ae3f5 commit a5cf949
Showing 2 changed files with 11 additions and 7 deletions.
12 changes: 8 additions & 4 deletions app/pages/options.html
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@
<div class="row">
<div class="col-sm-4">
<div class="form-group">
<label>Keyboard Shortcut (<a href="https://github.com/mikecrittenden/chrome-shortkeys/wiki/How-To-Use-Shortkeys#supported-keyboard-shortcuts">Help</a>)</label>
<label>Keyboard shortcut (<a href="https://github.com/mikecrittenden/chrome-shortkeys/wiki/How-To-Use-Shortkeys#supported-keyboard-shortcuts">Help</a>)</label>
<input ng-model="key.key" class="kbd-input form-control" placeholder="Example: ctrl+b" type="text"/>
</div></div>
<div class="col-sm-4">
@@ -78,9 +78,13 @@
</div>

<div ng-show="key.action == 'trigger'" class="form-group">
<p>Note that this can ONLY trigger shortcuts that were added on this same form.</p>
<label>Keyboard shortcut to trigger</label>
<input type="text" ng-model="key.trigger" class="form-control" />
<div uib-alert class="alert-warning">Note that this can ONLY trigger shortcuts that were added on this same form.</div>
<div class="row">
<div class="col-sm-4">
<label>Keyboard shortcut to trigger</label>
<input type="text" ng-model="key.trigger" class="form-control" />
</div>
</div>
</div>

<div ng-show="key.action == 'buttonnexttab'" class="form-group">
6 changes: 3 additions & 3 deletions app/scripts/options.js
Original file line number Diff line number Diff line change
@@ -39,9 +39,9 @@ app.controller('ShortkeysOptionsCtrl', ['$scope', function ($scope) {
{value: 'reload', label: 'Reload page', group: 'Location', builtin: true},
{value: 'copyurl', label: 'Copy URL', group: 'Location', builtin: true},
{value: 'searchgoogle', label: 'Search Google for selected text', group: 'Location', builtin: true},
{value: 'openbookmark', label: 'Open Bookmark/Bookmarklet in current tab', group: 'Bookmarks'},
{value: 'openbookmarknewtab', label: 'Open Bookmark/Bookmarklet in new tab', group: 'Bookmarks'},
{value: 'openbookmarkbackgroundtab', label: 'Open Bookmark/Bookmarklet in new background tab', group: 'Bookmarks'},
{value: 'openbookmark', label: 'Open bookmark/bookmarklet in current tab', group: 'Bookmarks'},
{value: 'openbookmarknewtab', label: 'Open bookmark/bookmarklet in new tab', group: 'Bookmarks'},
{value: 'openbookmarkbackgroundtab', label: 'Open bookmark/bookmarklet in new background tab', group: 'Bookmarks'},
{value: 'gototab', label: 'Jump to tab or URL', group: 'Tabs'},
{value: 'newtab', label: 'New tab', group: 'Tabs', builtin: true},
{value: 'closetab', label: 'Close tab', group: 'Tabs', builtin: true},

0 comments on commit a5cf949

Please sign in to comment.