From 104ed75f388815550bf42c6cf29db38461b622e2 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sat, 1 Nov 2014 09:05:02 +0000
Subject: Remove "Restore to defaults" button.

And line up main frame with the first two columns of the main options
table.
---
 pages/options.coffee |  7 -------
 pages/options.html   | 11 +++--------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/pages/options.coffee b/pages/options.coffee
index 84c40b9f..95db5282 100644
--- a/pages/options.coffee
+++ b/pages/options.coffee
@@ -135,12 +135,6 @@ saveOptions = ->
   Option.all.map (option) -> option.save()
   $("saveOptions").disabled = true
 
-restoreToDefaults = ->
-  return unless confirm "Are you sure you want to permanently return all of Vimium's settings to their defaults?"
-  Option.all.map (option) -> option.restoreToDefault()
-  maintainLinkHintsView()
-  $("saveOptions").disabled = true
-
 # Display either "linkHintNumbers" or "linkHintCharacters", depending upon "filterLinkHints".
 maintainLinkHintsView = ->
   hide = (el) -> el.parentNode.parentNode.style.display = "none"
@@ -189,7 +183,6 @@ document.addEventListener "DOMContentLoaded", ->
   }
 
   $("saveOptions").addEventListener "click", saveOptions
-  $("restoreSettings").addEventListener "click", restoreToDefaults
   $("advancedOptionsLink").addEventListener "click", toggleAdvancedOptions
   $("showCommands").addEventListener "click", activateHelpDialog
   $("filterLinkHints").addEventListener "click", maintainLinkHintsView
diff --git a/pages/options.html b/pages/options.html
index ece4df7a..1b2e9c56 100644
--- a/pages/options.html
+++ b/pages/options.html
@@ -19,7 +19,7 @@
       }
       a, a:visited { color: #15c; }
       a:active { color: #052577; }
-      div#wrapper { width: 500px; }
+      div#wrapper { width: 538px; }
       header {
         font-size: 18px;
         font-weight: normal;
@@ -142,10 +142,8 @@
       #buttonsPanel { width: 100%; }
       #advancedOptions { display: none; }
       #advancedOptionsLink { line-height: 24px; }
-      #buttonContainer { float: right; }
-      #buttonContainer button:last-child {
-        margin-right: 0;
-      }
+      #saveOptions { float: right; }
+      #saveOptions { margin-right: 0; }
       #showHelpDialogMessage { width: 100%; }
       .help {
         position: absolute;
@@ -406,10 +404,7 @@ unmapAll
 
       <div id="buttonsPanel">
         <a href="#" id="advancedOptionsLink">Show advanced options&hellip;</a>
-        <div id="buttonContainer">
-          <button id="restoreSettings">Restore to Defaults</button>
           <button id="saveOptions" disabled="true">Save Options</button>
-        </div>
       </div>
 
       <br/>
-- 
cgit v1.2.3