Bug 1408613 - stop trying to use a smaller image in the overflow panel which is wide enough, r=mikedeboer
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Wed, 08 Nov 2017 17:52:20 +0100
changeset 444129 7e2fd1290064c714a2bd22b6c2ebeb8aca31b10c
parent 444128 7474dc45cbe36534ad063540b5fe4ae4a17eb59c
child 444130 59846f5437b14841a0a1556103cc8ef4d190acbf
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmikedeboer
bugs1408613
milestone58.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1408613 - stop trying to use a smaller image in the overflow panel which is wide enough, r=mikedeboer MozReview-Commit-ID: Kh83oju1Dud
browser/components/customizableui/content/panelUI.inc.xul
browser/themes/shared/customizableui/panelUI.inc.css
browser/themes/shared/jar.inc.mn
browser/themes/shared/panic-panel/header-small.png
browser/themes/shared/panic-panel/header-small@2x.png
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -561,20 +561,17 @@
     </panelview>
 
     <panelview id="PanelUI-panicView" flex="1"
                descriptionheightworkaround="true">
       <vbox class="panel-subview-body">
         <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"/>
               <radio id="PanelUI-panic-2hr" label="&panicButton.view.2hr;"
                      value="2" class="subviewradio"/>
               <radio id="PanelUI-panic-day" label="&panicButton.view.day;"
                      value="6" class="subviewradio"/>
             </radiogroup>
--- a/browser/themes/shared/customizableui/panelUI.inc.css
+++ b/browser/themes/shared/customizableui/panelUI.inc.css
@@ -1373,55 +1373,33 @@ menuitem[checked="true"].subviewbutton >
 }
 
 #PanelUI-panic-timeframe {
   padding: 15px;
   border-bottom: 1px solid var(--panel-separator-color);
 }
 
 #panic-button-success-icon,
-#PanelUI-panic-timeframe-icon,
-#PanelUI-panic-timeframe-icon-small {
+#PanelUI-panic-timeframe-icon {
   background-color: transparent;
   margin-inline-end: 10px;
 }
 
 #panic-button-success-icon,
 #PanelUI-panic-timeframe-icon {
   list-style-image: url(chrome://browser/skin/panic-panel/header.png);
   max-height: 48px;
   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);
 }
 
 .subviewradio {
   -moz-appearance: none;
   -moz-box-align: center;
   padding: 1px;
@@ -1555,20 +1533,16 @@ menuitem[checked="true"].subviewbutton >
     list-style-image: url(chrome://branding/content/icon32.png);
   }
 
   #panic-button-success-icon,
   #PanelUI-panic-timeframe-icon {
     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);
   }
 
   #PanelUI-panic-actionlist-history {
     background-image: -moz-image-rect(url(chrome://browser/skin/panic-panel/icons@2x.png), 0, 64, 32, 32);
   }
 
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -212,18 +212,16 @@
   skin/classic/browser/wifi.svg                                (../shared/incontent-icons/wifi.svg)
   skin/classic/browser/tab-crashed.svg                         (../shared/incontent-icons/tab-crashed.svg)
   skin/classic/browser/favicon-search-16.svg                   (../shared/favicon-search-16.svg)
   skin/classic/browser/icon-search-64.svg                      (../shared/incontent-icons/icon-search-64.svg)
   skin/classic/browser/welcome-back.svg                        (../shared/incontent-icons/welcome-back.svg)
   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)
   skin/classic/browser/places/bookmarks-notification-finish@2x.png (../shared/places/bookmarks-notification-finish@2x.png)
   skin/classic/browser/places/bookmarksMenu.svg                (../shared/places/bookmarksMenu.svg)
   skin/classic/browser/places/bookmarksToolbar.svg             (../shared/places/bookmarksToolbar.svg)
   skin/classic/browser/places/folder.svg                       (../shared/places/folder.svg)
   skin/classic/browser/places/folder-live.svg                  (../shared/places/folder-live.svg)
deleted file mode 100644
index ef1956fb83aae991ac0c35969d7bebb42e52caae..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index ae445a4a99a697683f42617f88456d68e8b6a126..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001