Bug 590201 - Remove buttons are difficult to discover in list view. r=bmcbride, a=blocking-beta6

toolkit/mozapps/extensions/content/extensions.xml

@@ -817,12 +817,11 @@
             <xul:button anonid="disable-btn" class="addon-control disable"
                         label="&cmd.disableAddon.label;"
                         oncommand="document.getBindingParent(this).userDisabled = true;"/>
+            <xul:button anonid="remove-btn" class="addon-control remove"
+                        label="&cmd.uninstallAddon.label;"
+                        oncommand="document.getBindingParent(this).uninstall();"/>
           </xul:hbox>
         </xul:vbox>
-        <xul:vbox pack="start" class="remove-container">
-          <xul:button anonid="remove-btn" class="remove-button"
-                      oncommand="document.getBindingParent(this).uninstall();"/>
-        </xul:vbox>
       </xul:hbox>
     </content>
 

toolkit/themes/gnomestripe/mozapps/extensions/extensions.css

@@ -768,26 +768,6 @@
   display: none;
 }
 
-.remove-button {
-  -moz-appearance: toolbarbutton;
-  margin: 0;
-  list-style-image: url("moz-icon://stock/gtk-close?size=menu");
-  min-width: 0;
-  margin: 0;
-}
-
-.remove-button .button-text {
-  display: none;
-}
-
-.remove-button .button-icon {
-  margin: 0;
-}
-
-.remove-button .button-box {
-  padding: 0;
-}
-
 .button-link {
   -moz-appearance: none;
   background: transparent;

toolkit/themes/pinstripe/mozapps/extensions/extensions.css

@@ -493,10 +493,6 @@
   list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
 }
 
-.remove-container {
-  width: 16px;
-}
-
 /*** item - uninstalled ***/
 
 .addon[status="uninstalled"] {
@@ -829,28 +825,6 @@
   display: none;
 }
 
-.remove-button {
-  -moz-appearance: none;
-  padding: 0;
-  margin: 0;
-  list-style-image: url("chrome://global/skin/icons/closetab.png");
-  border: none;
-  min-width: 0;
-  margin: 0;
-}
-
-.remove-button .button-text {
-  display: none;
-}
-
-.remove-button:hover {
-  list-style-image: url("chrome://global/skin/icons/closetab-hover.png");
-}
-
-.remove-button:hover:active {
-  list-style-image: url("chrome://global/skin/icons/closetab-active.png");
-}
-  
 .button-link {
   -moz-appearance: none;
   background: transparent;

toolkit/themes/winstripe/mozapps/extensions/extensions.css

@@ -469,10 +469,6 @@
   list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
 }
 
-.remove-container {
-  width: 16px;
-}
-
 /*** item - uninstalled ***/
 
 .addon[status="uninstalled"] {
@@ -787,38 +783,6 @@
   display: none;
 }
 
-.remove-button {
-  -moz-appearance: none;
-  background: transparent;
-  padding: 0;
-  margin: 0;
-  list-style-image: url("chrome://global/skin/icons/close.png");
-  -moz-image-region: rect(0, 64px, 16px, 48px);
-  border: none;
-  min-width: 0;
-  margin: 0;
-}
-
-.remove-button .button-box {
-  padding: 0;
-}
-
-.addon[selected] .remove-button:not(:hover):not(:active) {
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-.remove-button:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-.remove-button:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
-}
-
-.remove-button .button-text {
-  display: none;
-}
-
 .button-link {
   -moz-appearance: none;
   background: transparent;