From 5906b1237562e28faa1e2f2206d953ae3ab59f62 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sat, 23 Apr 2016 08:57:51 +0100
Subject: Fix help-dialog scroll bars and min width.

---
 content_scripts/vimium.css |   9 ++-
 pages/help_dialog.html     | 150 +++++++++++++++++++++++----------------------
 2 files changed, 83 insertions(+), 76 deletions(-)

diff --git a/content_scripts/vimium.css b/content_scripts/vimium.css
index a1d88a18..09548268 100644
--- a/content_scripts/vimium.css
+++ b/content_scripts/vimium.css
@@ -150,17 +150,22 @@ iframe.vimiumHelpDialogFrame {
   z-index: 2147483645; /* One less than hint markers. */
 }
 
-div#vimiumHelpDialog {
+div#vimiumHelpDialogContainer {
   opacity:1.0;
   background-color:white;
   border:2px solid #b3b3b3;
   border-radius:6px;
-  padding:8px 12px;
   width: 840px;
   max-width: calc(100% - 100px);
   max-height: calc(100% - 100px);
   margin: 50px auto;
   overflow-y: auto;
+  overflow-x: auto;
+}
+
+div#vimiumHelpDialog {
+  min-width: 600px;
+  padding:8px 12px;
 }
 
 span#vimiumTitle, span#vimiumTitle span,  span#vimiumTitle * { font-size:20px; }
diff --git a/pages/help_dialog.html b/pages/help_dialog.html
index a0ba6de5..f8152d60 100644
--- a/pages/help_dialog.html
+++ b/pages/help_dialog.html
@@ -15,83 +15,85 @@
 
   <!-- 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">
-      <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="#">&times;</a>
-            </td>
-          </tr>
-        </table>
-      </div>
-      <div class="vimiumReset vimiumDivider"></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="vimiumHelpDialogContainer">
+      <div id="vimiumHelpDialog">
+        <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="#">&times;</a>
+              </td>
+            </tr>
+          </table>
+        </div>
+        <div class="vimiumReset vimiumDivider"></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>
-        <table>
-          <tr>
-            <td class="helpDialogBottomLeft">
-              <span id="help-dialog-tip"></span>
-            </td>
-            <td class="helpDialogBottomRight">
-              <a href="#" id="toggleAdvancedCommands">Show advanced commands</a>
-            </td>
-          </tr>
-        </table>
-      </div>
+        <div>
+          <table>
+            <tr>
+              <td class="helpDialogBottomLeft">
+                <span id="help-dialog-tip"></span>
+              </td>
+              <td class="helpDialogBottomRight">
+                <a href="#" id="toggleAdvancedCommands">Show advanced commands</a>
+              </td>
+            </tr>
+          </table>
+        </div>
 
-      <br clear="both"/>
-      <div class="vimiumReset vimiumDivider"></div>
+        <br clear="both"/>
+        <div class="vimiumReset vimiumDivider"></div>
 
-      <div id="vimiumHelpDialogFooter" class="vimiumReset">
-        <div class="vimiumReset vimiumColumn">
-          Enjoying Vimium?
-          <a class="vimiumHelDialogLink" target="_blank"
-            href="https://chrome.google.com/webstore/detail/vimium/dbepggeogbaibhgnhhndojpepiihcmeb/reviews">Leave us
-                feedback</a>.<br/>
-          Found a bug? <a class="vimiumHelDialogLink" target="_blank" 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" target="_blank" class="vimiumHelDialogLink">What's new?</a>
+        <div id="vimiumHelpDialogFooter" class="vimiumReset">
+          <div class="vimiumReset vimiumColumn">
+            Enjoying Vimium?
+            <a class="vimiumHelDialogLink" target="_blank"
+              href="https://chrome.google.com/webstore/detail/vimium/dbepggeogbaibhgnhhndojpepiihcmeb/reviews">Leave us
+                  feedback</a>.<br/>
+            Found a bug? <a class="vimiumHelDialogLink" target="_blank" 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" target="_blank" class="vimiumHelDialogLink">What's new?</a>
+          </div>
         </div>
       </div>
     </div>
-- 
cgit v1.2.3