[tor-commits] [tor-launcher/master] Wizard improvements for Linux.

[brade at torproject.org]

commit 36dc70aeebe2017c184957d4e409a68ed14e3f53
Author: Kathy Brade <brade at torproject.org>
Date:   Thu May 2 15:00:18 2013 -0400

    Wizard improvements for Linux.
    
    Fix problem where Back button was shown on bridges help panel.
    Avoid vertical scrollbar within bridges help panel.
---
 src/chrome/content/network-settings.js |    4 ++--
 src/chrome/skin/network-settings.css   |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js
index b2c94a4..839d3d2 100644
--- a/src/chrome/content/network-settings.js
+++ b/src/chrome/content/network-settings.js
@@ -432,6 +432,8 @@ function onOpenHelp()
   else
     gRestoreAfterHelpPanelID = getWizard().currentPage.pageid;
 
+  showPanel("bridgeHelp");
+
   if (getWizard())
   {
     showOrHideButton("cancel", false, false);
@@ -441,8 +443,6 @@ function onOpenHelp()
   }
   else
     overrideButtonLabel("cancel", "done");
-
-  showPanel("bridgeHelp");
 }
 
 
diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css
index 436396a..9fcfc96 100644
--- a/src/chrome/skin/network-settings.css
+++ b/src/chrome/skin/network-settings.css
@@ -13,7 +13,7 @@ dialog {
 
 wizard {
   width: 540px;
-  height: 380px;
+  height: 400px;
   font: -moz-dialog;
   padding-top: 0px;
 }