aboutsummaryrefslogtreecommitdiffstats
path: root/content_scripts
diff options
context:
space:
mode:
authorStephen Blott2016-12-11 15:22:02 +0000
committerGitHub2016-12-11 15:22:02 +0000
commit7fe88a70031c09f530ad2c22be88c30c7f1e787e (patch)
tree2f6b3bdefc8456d3427684f1a0079f81b86f3fbb /content_scripts
parentbd06c7ccfbfcf36e6d15fba72b7af90254b05da2 (diff)
parentbd607cf57512580cf5c9c7d81be5b79b93d1ae9f (diff)
downloadvimium-7fe88a70031c09f530ad2c22be88c30c7f1e787e.tar.bz2
Merge pull request #2368 from smblott-github/rework-key-mapping-parsing
Rework key-mapping parsing and help-dialog HTML
Diffstat (limited to 'content_scripts')
-rw-r--r--content_scripts/vimium.css5
-rw-r--r--content_scripts/vimium_frontend.coffee3
2 files changed, 5 insertions, 3 deletions
diff --git a/content_scripts/vimium.css b/content_scripts/vimium.css
index edb1ab85..3e8f65d6 100644
--- a/content_scripts/vimium.css
+++ b/content_scripts/vimium.css
@@ -243,7 +243,7 @@ div#vimiumHelpDialog td.vimiumHelpDescription {
font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;
font-size:14px;
}
-div#vimiumHelpDialog span.commandName {
+div#vimiumHelpDialog span.vimiumCopyCommandNameName {
font-style: italic;
cursor: pointer;
font-size: 12px;
@@ -275,6 +275,9 @@ div#vimiumHelpDialogFooter {
position: relative;
margin-bottom: 37px;
}
+table.helpDialogBottom {
+ width:100%;
+}
td.helpDialogBottomRight {
width:100%;
float:right;
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index fcca98ab..21826944 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -646,8 +646,7 @@ enterFindMode = ->
new FindMode()
window.showHelp = (sourceFrameId) ->
- chrome.runtime.sendMessage handler: "getHelpDialogHtml", (response) ->
- HelpDialog.toggle {sourceFrameId, html: response}
+ HelpDialog.toggle {sourceFrameId, showAllCommandDetails: false}
# If we are in the help dialog iframe, then HelpDialog is already defined with the necessary functions.
window.HelpDialog ?=