diff options
| -rw-r--r-- | content_scripts/vimium.css | 45 | ||||
| -rw-r--r-- | pages/help_dialog.coffee | 2 | ||||
| -rw-r--r-- | pages/help_dialog.html | 18 |
3 files changed, 33 insertions, 32 deletions
diff --git a/content_scripts/vimium.css b/content_scripts/vimium.css index 1c4f1e37..cddfbc97 100644 --- a/content_scripts/vimium.css +++ b/content_scripts/vimium.css @@ -151,26 +151,32 @@ iframe.vimiumHelpDialogFrame { } div#vimiumHelpDialog { - border:3px solid; opacity:1.0; background-color:white; - position:fixed; border:2px solid #b3b3b3; border-radius:6px; padding:8px 12px; - top:50px; - left: 50%; width: 840px; - height: calc(100% - 100px - 16px); /* 100% -top - 2*padding */ - max-width: calc(100% - 100px - 12px); - margin-left:calc(-420px - 12px); /* -1/2*width - 1*padding */ - overflow: auto; + max-width: calc(100% - 100px); + max-height: calc(100% - 100px); + margin: 50px auto; + overflow-y: auto; } -div#vimiumTitle, div#vimiumTitle span, div#vimiumTitle * { font-size:20px; } +span#vimiumTitle, span#vimiumTitle span, span#vimiumTitle * { font-size:20px; } #vimiumTitle { display: block; line-height: 130%; + white-space: nowrap; +} +td.vimiumHelpDialogTopButtons { + width: 100%; + text-align: right; +} +#helpDialogOptionsPage, #helpDialogWikiPage { + font-size: 14px; + padding-left: 5px; + padding-right: 5px; } div.vimiumColumn { width:50%; @@ -238,34 +244,19 @@ div#vimiumHelpDialog tr.advanced { display: none; } div#vimiumHelpDialog.showAdvanced tr.advanced { display: table-row; } div#vimiumHelpDialog div.advanced td:nth-of-type(3) { color: #555; } div#vimiumHelpDialog a.closeButton { - position:absolute; - right:4px; - top:2px; font-family:"courier new"; font-weight:bold; color:#555; text-decoration:none; - padding-left:10px; font-size:20px; + position: relative; + top: -12px; + right: -10px; } div#vimiumHelpDialog a { text-decoration: underline; } -div#vimiumHelpDialog .wikiPage, div#vimiumHelpDialog .optionsPage { - position: absolute; - display: block; - font-size: 14px; - line-height: 130%; - color:#555; - top: 11px; -} -div#vimiumHelpDialog .optionsPage { - right: 40px; -} -div#vimiumHelpDialog .wikiPage { - right: 100px; -} div#vimiumHelpDialog a.closeButton:hover { color:black; -webkit-user-select:none; diff --git a/pages/help_dialog.coffee b/pages/help_dialog.coffee index ebcf8486..6eb13660 100644 --- a/pages/help_dialog.coffee +++ b/pages/help_dialog.coffee @@ -15,7 +15,7 @@ HelpDialog = clickEvent.preventDefault() @hide() false) - @dialogElement.getElementsByClassName("optionsPage")[0].addEventListener("click", (clickEvent) -> + document.getElementById("helpDialogOptionsPage").addEventListener("click", (clickEvent) -> clickEvent.preventDefault() chrome.runtime.sendMessage({handler: "openOptionsPageInNewTab"}) false) diff --git a/pages/help_dialog.html b/pages/help_dialog.html index 389f09f2..e95dd403 100644 --- a/pages/help_dialog.html +++ b/pages/help_dialog.html @@ -16,10 +16,20 @@ <!-- Note that the template placeholders (e.g. "pageNavigation") will be filled in by the background page with the up-to-date key bindings when the dialog is shown. --> <div id="vimiumHelpDialog"> - <a class="vimiumReset optionsPage" href="#">Options</a> - <a class="vimiumReset wikiPage" href="https://github.com/philc/vimium/wiki" target="_blank">Wiki</a> - <a class="vimiumReset closeButton" href="#">×</a> - <div id="vimiumTitle" class="vimiumReset"><span class="vimiumReset" style="color:#2f508e">Vim</span>ium <span id="help-dialog-title"></span></div> + <div> + <table> + <tr> + <td> + <span id="vimiumTitle" class="vimiumReset"><span class="vimiumReset" style="color:#2f508e">Vim</span>ium <span id="help-dialog-title"></span></span> + </td> + <td class="vimiumHelpDialogTopButtons"> + <a class="vimiumReset" id="helpDialogOptionsPage" href="#">Options</a> + <a class="vimiumReset" id="helpDialogWikiPage" href="https://github.com/philc/vimium/wiki" target="_blank">Wiki</a> + <a class="vimiumReset closeButton" href="#">×</a> + </td> + </tr> + </table> + </div> <div class="vimiumReset vimiumDivider"></div> <div class="vimiumReset vimiumColumn"> <table class="vimiumReset"> |