From ff2bb00565eb1111a5b2d5ced5f6405591ae7bc6 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Thu, 21 Apr 2016 06:32:41 +0100
Subject: Revert "Rework the help dialog styling."

This reverts commit 86470f13d853b33cda8cb006ae24aeb2dcec0c9c.
---
 content_scripts/vimium.css |  27 ++++++------
 pages/help_dialog.html     | 104 ++++++++++++++++++++++-----------------------
 2 files changed, 64 insertions(+), 67 deletions(-)

diff --git a/content_scripts/vimium.css b/content_scripts/vimium.css
index 516859e2..f902363c 100644
--- a/content_scripts/vimium.css
+++ b/content_scripts/vimium.css
@@ -137,22 +137,18 @@ div.vimiumHighlightedFrame {
 
 /* Help Dialog CSS */
 
-/* The help dialog iframe covers most of the height of the window, but is only
- * as wide as it needs to be; so clicking to the left or right of it is
- * clicking outside of the iframe. */
 iframe.vimiumHelpDialogFrame {
   background-color: transparent;
   padding: 0px;
+  overflow: hidden;
 
   display: block;
   position: fixed;
-  /* The width of div#vimiumHelpDialog, plus twice its padding and twice its border. */
-  width: calc(640px + 24px + 4px);
-  height: calc(100% - 100px); /* 100% minus 2 * top. */
-  top: 50px;
-  left: 50%;
-  /* This needs to be 1/2 the width to horizontally center the dialog */
-  margin-left:-320px;
+  width: 100%;
+  min-width: 400px;
+  height: 100%;
+  top: 0px;
+  left: 0px;
   border: none;
 
   /* One less than hint markers. */
@@ -167,12 +163,15 @@ div#vimiumHelpDialog {
   border:2px solid #b3b3b3;
   border-radius:6px;
   padding:8px 12px;
-  top:0px;
-  left:0px;
+  top:50px;
+  left:50%;
   width:640px;
-  max-height: calc(100% - 24px); /* 100% - twice the padding. */
+  max-height: calc(100% - 100px - 16px); /* 100% - 2*top - 2*padding for top/bottom */
+  /* This needs to be 1/2 width to horizontally center the help dialog */
+  margin-left:-320px;
   -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0px 0px 6px;
-  overflow: auto;
+  overflow-x: auto;
+  overflow-y: auto;
 }
 
 div#vimiumHelpDialog a { color:blue; }
diff --git a/pages/help_dialog.html b/pages/help_dialog.html
index 0696bc12..b51aef9c 100644
--- a/pages/help_dialog.html
+++ b/pages/help_dialog.html
@@ -15,62 +15,60 @@
 
   <!-- 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="vimiumHelpDialogContainer" class="vimiumReset">
-      <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="#">&times;</a>
-        <div id="vimiumTitle" class="vimiumReset"><span class="vimiumReset" style="color:#2f508e">Vim</span>ium <span id="help-dialog-title"></span></div>
-        <div class="vimiumReset vimiumColumn">
-          <table class="vimiumReset">
-            <thead class="vimiumReset">
-              <tr class="vimiumReset" ><td class="vimiumReset"></td><td class="vimiumReset" ></td><td class="vimiumReset vimiumHelpSectionTitle">Navigating the page</td></tr>
-            </thead>
-            <tbody id="help-dialog-pageNavigation" class="vimiumReset">
-            </tbody>
-          </table>
-        </div>
-        <div class="vimiumReset vimiumColumn">
-          <table class="vimiumReset" >
-            <thead class="vimiumReset">
-            <tr class="vimiumReset" ><td class="vimiumReset" ></td><td class="vimiumReset" ></td><td class="vimiumReset vimiumHelpSectionTitle">Using the vomnibar</td></tr>
-            </thead>
-            <tbody class="vimiumReset" id="help-dialog-vomnibarCommands"></tbody>
-            <thead class="vimiumReset">
-            <tr class="vimiumReset" ><td class="vimiumReset" ></td><td class="vimiumReset" ></td><td class="vimiumReset vimiumHelpSectionTitle">Using find</td></tr>
-            </thead>
-            <tbody class="vimiumReset" id="help-dialog-findCommands"></tbody>
-            <thead class="vimiumReset">
-            <tr class="vimiumReset" ><td class="vimiumReset" ></td><td class="vimiumReset" ></td><td class="vimiumReset vimiumHelpSectionTitle">Navigating history</td></tr>
-            </thead>
-            <tbody class="vimiumReset" id="help-dialog-historyNavigation"></tbody>
-            <thead class="vimiumReset">
-            <tr class="vimiumReset" ><td class="vimiumReset" ></td><td class="vimiumReset" ></td><td class="vimiumReset vimiumHelpSectionTitle">Manipulating tabs</td></tr>
-            </thead>
-            <tbody class="vimiumReset" id="help-dialog-tabManipulation"></tbody>
-            <thead class="vimiumReset">
-            <tr class="vimiumReset" ><td class="vimiumReset" ></td><td class="vimiumReset" ></td><td class="vimiumReset vimiumHelpSectionTitle">Miscellaneous</td></tr>
-            </thead>
-            <tbody class="vimiumReset" id="help-dialog-misc"></tbody>
-          </table>
-        </div>
+    <div id="vimiumHelpDialog" class="vimiumReset">
+      <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="#">&times;</a>
+      <div id="vimiumTitle" class="vimiumReset"><span class="vimiumReset" style="color:#2f508e">Vim</span>ium <span id="help-dialog-title"></span></div>
+      <div class="vimiumReset vimiumColumn">
+        <table class="vimiumReset">
+          <thead class="vimiumReset">
+            <tr class="vimiumReset" ><td class="vimiumReset"></td><td class="vimiumReset" ></td><td class="vimiumReset vimiumHelpSectionTitle">Navigating the page</td></tr>
+          </thead>
+          <tbody id="help-dialog-pageNavigation" class="vimiumReset">
+          </tbody>
+        </table>
+      </div>
+      <div class="vimiumReset vimiumColumn">
+        <table class="vimiumReset" >
+          <thead class="vimiumReset">
+          <tr class="vimiumReset" ><td class="vimiumReset" ></td><td class="vimiumReset" ></td><td class="vimiumReset vimiumHelpSectionTitle">Using the vomnibar</td></tr>
+          </thead>
+          <tbody class="vimiumReset" id="help-dialog-vomnibarCommands"></tbody>
+          <thead class="vimiumReset">
+          <tr class="vimiumReset" ><td class="vimiumReset" ></td><td class="vimiumReset" ></td><td class="vimiumReset vimiumHelpSectionTitle">Using find</td></tr>
+          </thead>
+          <tbody class="vimiumReset" id="help-dialog-findCommands"></tbody>
+          <thead class="vimiumReset">
+          <tr class="vimiumReset" ><td class="vimiumReset" ></td><td class="vimiumReset" ></td><td class="vimiumReset vimiumHelpSectionTitle">Navigating history</td></tr>
+          </thead>
+          <tbody class="vimiumReset" id="help-dialog-historyNavigation"></tbody>
+          <thead class="vimiumReset">
+          <tr class="vimiumReset" ><td class="vimiumReset" ></td><td class="vimiumReset" ></td><td class="vimiumReset vimiumHelpSectionTitle">Manipulating tabs</td></tr>
+          </thead>
+          <tbody class="vimiumReset" id="help-dialog-tabManipulation"></tbody>
+          <thead class="vimiumReset">
+          <tr class="vimiumReset" ><td class="vimiumReset" ></td><td class="vimiumReset" ></td><td class="vimiumReset vimiumHelpSectionTitle">Miscellaneous</td></tr>
+          </thead>
+          <tbody class="vimiumReset" id="help-dialog-misc"></tbody>
+        </table>
+      </div>
 
-        <br clear="both"/>
-        <div class="vimiumReset vimiumDivider"></div>
+      <br clear="both"/>
+      <div class="vimiumReset vimiumDivider"></div>
 
-        <div id="vimiumHelpDialogFooter" class="vimiumReset">
-          <a href="#" class="vimiumReset toggleAdvancedCommands">Show advanced commands</a>
+      <div id="vimiumHelpDialogFooter" class="vimiumReset">
+        <a href="#" class="vimiumReset toggleAdvancedCommands">Show advanced commands</a>
 
-          <div class="vimiumReset vimiumColumn">
-            Enjoying Vimium?
-            <a class="vimiumReset" href="https://chrome.google.com/extensions/detail/dbepggeogbaibhgnhhndojpepiihcmeb">Leave us
-                feedback</a>.<br/>
-            Found a bug? <a class="vimiumReset" href="http://github.com/philc/vimium/issues">Report it here</a>.
-          </div>
-          <div class="vimiumReset vimiumColumn" style="text-align:right">
-            <span class="vimiumReset">Version <span id="help-dialog-version"></span></span><br/>
-            <a href="https://github.com/philc/vimium#release-notes" class="vimiumReset">What's new?</a>
-          </div>
+        <div class="vimiumReset vimiumColumn">
+          Enjoying Vimium?
+          <a class="vimiumReset" href="https://chrome.google.com/extensions/detail/dbepggeogbaibhgnhhndojpepiihcmeb">Leave us
+              feedback</a>.<br/>
+          Found a bug? <a class="vimiumReset" href="http://github.com/philc/vimium/issues">Report it here</a>.
+        </div>
+        <div class="vimiumReset vimiumColumn" style="text-align:right">
+          <span class="vimiumReset">Version <span id="help-dialog-version"></span></span><br/>
+          <a href="https://github.com/philc/vimium#release-notes" class="vimiumReset">What's new?</a>
         </div>
       </div>
     </div>
-- 
cgit v1.2.3