aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Yatskov <alex@foosoft.net>2017-03-25 20:10:58 -0700
committerAlex Yatskov <alex@foosoft.net>2017-03-25 20:10:58 -0700
commit1a9e0243f4cb64fb2ee284e7b96a28ec6aa3d23a (patch)
tree44f9871cfe176beab8a2ce5a06549e0eee548753
parent37321e8d52849b0824132e2339760e96308abbb6 (diff)
fix conflicting hotkeys
-rw-r--r--ext/bg/popup.html4
-rw-r--r--ext/manifest.json6
2 files changed, 2 insertions, 8 deletions
diff --git a/ext/bg/popup.html b/ext/bg/popup.html
index e223e241..968b386d 100644
--- a/ext/bg/popup.html
+++ b/ext/bg/popup.html
@@ -18,12 +18,12 @@
</head>
<body>
<p>
- <input type="checkbox" id="enable-search" title="Toggle (Alt + Delete)">
+ <input type="checkbox" id="enable-search">
</p>
<p>
<div class="btn-group" style="white-space: nowrap">
<button type="button" id="open-search" title="Search (Alt + Insert)" class="btn btn-default btn-xs glyphicon glyphicon-search"></button>
- <button type="button" id="open-options" title="Options (Alt + End)" class="btn btn-default btn-xs glyphicon glyphicon-wrench"></button>
+ <button type="button" id="open-options" title="Options" class="btn btn-default btn-xs glyphicon glyphicon-wrench"></button>
<button type="button" id="open-help" title="Help" class="btn btn-default btn-xs glyphicon glyphicon-question-sign"></button>
</div>
</p>
diff --git a/ext/manifest.json b/ext/manifest.json
index ae7cf8e3..c897345c 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -43,12 +43,6 @@
"default": "Alt+Insert"
},
"description": "Open search window"
- },
- "options": {
- "suggested_key": {
- "default": "Alt+End"
- },
- "description": "Open options page"
}
},
"web_accessible_resources": ["fg/frame.html"],