From c698061e8ae7e9ec61a780c1ff0658f4f349a4a3 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sun, 14 Dec 2014 15:58:22 +0000
Subject: FRAMESET frames should not be registered.

Somewhere along the road, this got goofed up.  This reverts to the
intended behaviour.
---
 content_scripts/vimium_frontend.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 469afe71..31f0eab5 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -186,7 +186,7 @@ initializeOnDomReady = ->
 
 registerFrame = ->
   # Don't register frameset containers; focusing them is no use.
-  if document.body.tagName != "FRAMESET"
+  if document.body.tagName.toLowerCase() != "frameset"
     chrome.runtime.sendMessage
       handler: "registerFrame"
       frameId: frameId
-- 
cgit v1.2.3


From 07a67a7ab041ac594e12abcd6b814d21df59da87 Mon Sep 17 00:00:00 2001
From: Phil Crosby
Date: Sun, 14 Dec 2014 12:45:15 -0800
Subject: Remove the custom scrollbar styling

IMO the default styling looks a lot better, at least on OSX
---
 pages/options.html | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pages/options.html b/pages/options.html
index b52974d6..acb26aab 100644
--- a/pages/options.html
+++ b/pages/options.html
@@ -176,18 +176,6 @@
         color: #444;
         width: 100%
       }
-      #exclusionScrollBox::-webkit-scrollbar {
-        width: 12px;
-      }
-      #exclusionScrollBox::-webkit-scrollbar-track {
-        -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
-        border-radius: 2px;
-      }
-
-      #exclusionScrollBox::-webkit-scrollbar-thumb {
-        border-radius: 2px;
-        -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5);
-      }
       #exclusionRules {
         width: 100%;
       }
-- 
cgit v1.2.3


From 4550c90d1c7d2c093ad37074bf4a9c09a2d29ea0 Mon Sep 17 00:00:00 2001
From: Phil Crosby
Date: Sun, 14 Dec 2014 12:45:31 -0800
Subject: Allow more exclusion rules before showing a scrollbar

---
 pages/options.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages/options.html b/pages/options.html
index acb26aab..8e685304 100644
--- a/pages/options.html
+++ b/pages/options.html
@@ -170,7 +170,8 @@
         overflow: scroll;
         overflow-x: hidden;
         overflow-y: auto;
-        max-height: 135px;
+        /* Each exclusion rule is about 30px, so this allows 7 before scrolling */
+        max-height: 215px;
         min-height: 75px;
         border-radius: 2px;
         color: #444;
-- 
cgit v1.2.3


From 5ec7f490b5e9e68bddb415b66b6cae86841a3d52 Mon Sep 17 00:00:00 2001
From: Phil Crosby
Date: Sun, 14 Dec 2014 12:59:33 -0800
Subject: Hide the smooth scroll option from the settings UI

See #1299 for context.
---
 pages/options.html | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pages/options.html b/pages/options.html
index 8e685304..bc4454cd 100644
--- a/pages/options.html
+++ b/pages/options.html
@@ -351,15 +351,6 @@ unmapAll
           </tr>
           <tr>
             <td class="caption" verticalAlign="top">Miscellaneous<br/>options</td>
-            <td verticalAlign="top" class="booleanOption">
-              <label>
-                <input id="smoothScroll" type="checkbox"/>
-                Use smooth scrolling
-              </label>
-            </td>
-          </tr>
-          <tr>
-            <td class="caption"></td>
             <td verticalAlign="top" class="booleanOption">
               <div class="help">
                 <div class="example">
@@ -372,6 +363,15 @@ unmapAll
               </label>
             </td>
           </tr>
+          <tr style="display:none">
+            <td class="caption"></td>
+            <td verticalAlign="top" class="booleanOption">
+              <label>
+                <input id="smoothScroll" type="checkbox"/>
+                Use smooth scrolling
+              </label>
+            </td>
+          </tr>
           <tr>
             <td class="caption"></td>
             <td verticalAlign="top" class="booleanOption">
-- 
cgit v1.2.3