diff options
| author | Stephen Blott | 2014-12-15 06:40:18 +0000 |
|---|---|---|
| committer | Stephen Blott | 2014-12-15 06:40:18 +0000 |
| commit | 0c75b89acbea356e5c2993fd016e9ccc67ef034b (patch) | |
| tree | 953111357456e1a15eeba5e84e3be0be567e0abe | |
| parent | 886e94e5c1563483702208675c5d12735f007938 (diff) | |
| parent | 5ec7f490b5e9e68bddb415b66b6cae86841a3d52 (diff) | |
| download | vimium-0c75b89acbea356e5c2993fd016e9ccc67ef034b.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into post-1.46
| -rw-r--r-- | pages/options.html | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/pages/options.html b/pages/options.html index b52974d6..bc4454cd 100644 --- a/pages/options.html +++ b/pages/options.html @@ -170,24 +170,13 @@ 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; 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%; } @@ -363,15 +352,6 @@ unmapAll <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"> In link-hint mode, this option lets you also select a link by typing its text. @@ -383,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"> |