Bug 971825 - [Australis] Undo link after restoring defaults should be a button. r=dao ui-r=shorlander
authorJared Wein <jwein@mozilla.com>
Thu, 13 Feb 2014 17:50:55 -0500
changeset 168682 8e9dfd4baac11abdba071af8d12de9284241c21d
parent 168681 a39438d36c9ac45f015b931c065700cbd2ac86f4
child 168683 e69b0b50156466da83ffa7e00f2d7927022685b2
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersdao, shorlander
bugs971825
milestone30.0a1
Bug 971825 - [Australis] Undo link after restoring defaults should be a button. r=dao ui-r=shorlander
browser/components/customizableui/content/customizeMode.inc.xul
browser/themes/shared/customizableui/customizeMode.inc.css
--- a/browser/components/customizableui/content/customizeMode.inc.xul
+++ b/browser/components/customizableui/content/customizeMode.inc.xul
@@ -25,23 +25,21 @@
 #NB: because oncommand fires after click, by the time we've fired, the checkbox binding
 #    will already have switched the button's state, so this is correct:
               oncommand="gCustomizeMode.toggleTitlebar(this.hasAttribute('checked'))"/>
 #endif
       <button id="customization-toolbar-visibility-button" label="&customizeMode.toolbars;" class="customizationmode-button" type="menu">
         <menupopup id="customization-toolbar-menu" onpopupshowing="onViewToolbarsPopupShowing(event)"/>
       </button>
       <spacer flex="1"/>
-      <label id="customization-undo-reset"
-             hidden="true"
-             onclick="gCustomizeMode.undoReset();"
-             onkeypress="gCustomizeMode.undoReset();"
-             class="text-link">
-        &undoCmd.label;
-      </label>
+      <button id="customization-undo-reset"
+              class="customizationmode-button"
+              hidden="true"
+              oncommand="gCustomizeMode.undoReset();"
+              label="&undoCmd.label;"/>
       <button id="customization-reset-button" oncommand="gCustomizeMode.reset();" label="&customizeMode.restoreDefaults;" class="customizationmode-button"/>
     </hbox>
   </vbox>
   <vbox id="customization-panel-container">
     <vbox id="customization-panelWrapper">
       <html:style html:type="text/html" scoped="scoped">
         @import url(chrome://global/skin/popup.css);
       </html:style>
--- a/browser/themes/shared/customizableui/customizeMode.inc.css
+++ b/browser/themes/shared/customizableui/customizeMode.inc.css
@@ -100,23 +100,17 @@
   background-color: rgb(218, 218, 218);
   border-color: rgb(168, 168, 168);
   text-shadow: 0 1px rgb(236, 236, 236);
   box-shadow: 0 1px rgba(255, 255, 255, 0.5),
               inset 0 1px rgb(196, 196, 196);
 }
 
 #customization-undo-reset {
-  padding-left: 12px;
-  padding-right: 12px;
-%ifdef XP_MACOSX
-  padding-top: 6px;
-%else
-  padding-top: 7px;
-%endif
+  -moz-margin-end: 10px;
 }
 
 #main-window[customize-entered] #customization-panel-container {
   background-image: url("chrome://browser/skin/customizableui/customizeMode-separatorHorizontal.png"),
                     url("chrome://browser/skin/customizableui/customizeMode-separatorVertical.png"),
                     url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png"),
                     url("chrome://browser/skin/customizableui/background-noise-toolbar.png"),
                     linear-gradient(to bottom, #3e86ce, #3878ba);