Bug 1408613 - stop trying to use a smaller image in the overflow panel which is wide enough, r=mikedeboer

MozReview-Commit-ID: Kh83oju1Dud

--HG--
extra : rebase_source : 30219c8ef0a3bc592191df4c01fd32de4004ef5f

browser/components/customizableui/content/panelUI.inc.xul

@@ -566,10 +566,7 @@
         <hbox id="PanelUI-panic-timeframe">
           <image id="PanelUI-panic-timeframe-icon" alt=""/>
           <vbox flex="1">
-            <hbox id="PanelUI-panic-header">
-              <image id="PanelUI-panic-timeframe-icon-small" alt=""/>
-              <description id="PanelUI-panic-mainDesc" flex="1">&panicButton.view.mainTimeframeDesc;</description>
-            </hbox>
+            <description id="PanelUI-panic-mainDesc">&panicButton.view.mainTimeframeDesc;</description>
             <radiogroup id="PanelUI-panic-timeSpan" aria-labelledby="PanelUI-panic-mainDesc" closemenu="none">
               <radio id="PanelUI-panic-5min" label="&panicButton.view.5min;" selected="true"
                      value="5" class="subviewradio"/>

browser/themes/shared/customizableui/panelUI.inc.css

@@ -1378,8 +1378,7 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left {
 }
 
 #panic-button-success-icon,
-#PanelUI-panic-timeframe-icon,
-#PanelUI-panic-timeframe-icon-small {
+#PanelUI-panic-timeframe-icon {
   background-color: transparent;
   margin-inline-end: 10px;
 }
@@ -1391,32 +1390,11 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left {
   width: 48px;
 }
 
-#PanelUI-panic-timeframe-icon-small {
-  list-style-image: url(chrome://browser/skin/panic-panel/header-small.png);
-  max-height: 32px;
-  width: 32px;
-}
-
-/* current attribute is only set when in use as a subview instead of a main view */
-#PanelUI-panicView[current] #PanelUI-panic-timeframe-icon {
-  display: none;
-}
-
-#PanelUI-panicView.cui-widget-panelview #PanelUI-panic-timeframe-icon-small {
-  display: none;
-}
-
-#panic-button-success-header,
-#PanelUI-panic-header {
+#panic-button-success-header {
   -moz-box-align: center;
   margin-bottom: 5px;
 }
 
-#PanelUI-panicView.cui-widget-panelview #PanelUI-panic-header {
-  margin-bottom: 0;
-}
-
-#PanelUI-panic-timeframe-icon-small:-moz-locale-dir(rtl),
 #PanelUI-panic-timeframe-icon:-moz-locale-dir(rtl) {
   transform: scaleX(-1);
 }
@@ -1560,10 +1538,6 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left {
     list-style-image: url(chrome://browser/skin/panic-panel/header@2x.png);
   }
 
-  #PanelUI-panic-timeframe-icon-small {
-    list-style-image: url(chrome://browser/skin/panic-panel/header-small@2x.png);
-  }
-
   #PanelUI-panic-actionlist-cookies {
     background-image: -moz-image-rect(url(chrome://browser/skin/panic-panel/icons@2x.png), 0, 32, 32, 0);
   }

browser/themes/shared/jar.inc.mn

@@ -217,8 +217,6 @@
   skin/classic/browser/readerMode.svg                          (../shared/reader/readerMode.svg)
   skin/classic/browser/panic-panel/header.png                  (../shared/panic-panel/header.png)
   skin/classic/browser/panic-panel/header@2x.png               (../shared/panic-panel/header@2x.png)
-  skin/classic/browser/panic-panel/header-small.png            (../shared/panic-panel/header-small.png)
-  skin/classic/browser/panic-panel/header-small@2x.png         (../shared/panic-panel/header-small@2x.png)
   skin/classic/browser/panic-panel/icons.png                   (../shared/panic-panel/icons.png)
   skin/classic/browser/panic-panel/icons@2x.png                (../shared/panic-panel/icons@2x.png)
   skin/classic/browser/places/bookmarks-notification-finish.png (../shared/places/bookmarks-notification-finish.png)