Backed out changeset b6e4c716ea9c (bug 885242)
authorEd Morley <emorley@mozilla.com>
Thu, 18 Jul 2013 11:14:05 +0100
changeset 139004 2f1324bb6e192dd39df8a592ca2e15aa94b268c1
parent 139003 c816006302126f85f5b74d5adfb8bf8e24353b3c
child 139005 acb70848a575d80bba9745a9f0f5d7056160f246
push id31202
push useremorley@mozilla.com
push dateThu, 18 Jul 2013 10:14:49 +0000
treeherdermozilla-inbound@089c92108cef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs885242
milestone25.0a1
backs outb6e4c716ea9ca419f51024c614e01dfd1fce795a
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
Backed out changeset b6e4c716ea9c (bug 885242)
browser/metro/base/content/browser.xul
browser/metro/theme/browser.css
--- a/browser/metro/base/content/browser.xul
+++ b/browser/metro/base/content/browser.xul
@@ -299,88 +299,63 @@
           <toolbarbutton id="pin-button" class="appbar-primary" type="checkbox"
                          oncommand="Appbar.onPinButton()"/>
           <toolbarbutton id="menu-button" class="appbar-primary"
                          oncommand="Appbar.onMenuButton(event)"/>
         </toolbar>
       </vbox>
     </appbar>
 
-    <vbox id="panel-container" class="window-width window-height meta"
-          hidden="true" observes="bcast_windowState">
+    <vbox id="panel-container" hidden="true" class="window-width window-height meta" observes="bcast_windowState">
       <hbox id="panel-header">
-        <toolbarbutton id="panel-close-button" class="appbar-primary"
-                       command="cmd_panel"/>
+        <toolbarbutton id="panel-close-button" command="cmd_panel"/>
 
-        <menulist id="panel-view-switcher"
-                  oncommand="PanelUI.switchPane(this.value);">
+        <menulist id="panel-view-switcher" oncommand="PanelUI.switchPane(this.value);">
           <menupopup>
-            <menuitem id="menuitem-bookmarks" value="bookmarks-container"
-                      label="&bookmarksHeader.label;"/>
-            <menuitem id="menuitem-history" value="history-container"
-                      label="&startHistoryHeader.label;"/>
-            <menuitem id="menuitem-remotetabs" value="remotetabs-container"
-                      label="&startRemoteTabsHeader.label;"/>
-            <menuitem id="menuitem-console" value="console-container"
-                      label="&consoleHeader.label;"/>
+            <menuitem label="&bookmarksHeader.label;" value="bookmarks-container" id="menuitem-bookmarks"/>
+            <menuitem label="&startHistoryHeader.label;" value="history-container" id="menuitem-history"/>
+            <menuitem label="&startRemoteTabsHeader.label;" value="remotetabs-container" id="menuitem-remotetabs"/>
+            <menuitem label="&consoleHeader.label;" value="console-container" id="menuitem-console"/>
           </menupopup>
         </menulist>
       </hbox>
 
       <deck id="panel-items" selectedIndex="0" flex="1" >
         <scrollbox id="bookmarks-container" flex="1">
-          <richgrid id="bookmarks-list" class="canSnapTiles" noun="bookmark"
-                    seltype="multiple" flex="1"/>
+          <richgrid id="bookmarks-list" noun="bookmark" class="canSnapTiles" seltype="multiple" flex="1"/>
         </scrollbox>
         <scrollbox id="history-container" flex="1">
-          <richgrid id="history-list" class="canSnapTiles" noun="history"
-                    seltype="multiple" flex="1"/>
+          <richgrid id="history-list" noun="history" class="canSnapTiles" seltype="multiple" flex="1"/>
         </scrollbox>
         <scrollbox id="downloads-container" flex="1">
-          <richgrid id="downloads-list" class="canSnapTiles" noun="download"
-                    seltype="single" flex="1"/>
+          <richgrid id="downloads-list" noun="download" class="canSnapTiles" seltype="single" flex="1"/>
         </scrollbox>
         <scrollbox id="remotetabs-container" flex="1">
-          <richgrid id="remotetabs-list" class="canSnapTiles" noun="tab"
-                    seltype="single" flex="1"/>
+          <richgrid id="remotetabs-list" noun="tab" class="canSnapTiles" seltype="single" flex="1"/>
         </scrollbox>
         <vbox id="console-container" flex="1">
           <vbox id="console-header" class="panel-list">
             <label class="panel-header" value="&consoleHeader.label;"/>
             <hbox align="center">
-              <label value="&consoleCodeEval.label;"
-                     control="console-eval-textbox"/>
-              <textbox id="console-eval-textbox" class="toolbar search-bar"
-                       value="" flex="1"
-                       onkeypress="ConsolePanelView.onEvalKeyPress(event)"/>
-              <button id="console-button-eval" class="show-text"
-                      label="&consoleEvaluate.label;"
-                      oncommand="ConsolePanelView.evaluateTypein()"/>
+              <label value="&consoleCodeEval.label;" control="console-eval-textbox"/>
+              <textbox id="console-eval-textbox" class="toolbar search-bar" value="" onkeypress="ConsolePanelView.onEvalKeyPress(event)" flex="1"/>
+              <button id="console-button-eval" class="show-text" label="&consoleEvaluate.label;" oncommand="ConsolePanelView.evaluateTypein()"/>
             </hbox>
             <hbox align="center" pack="end">
-              <radiogroup id="console-filter"
-                          oncommand="ConsolePanelView.changeMode();">
-                <radio id="console-filter-all" value="all" selected="true"
-                       label="&consoleAll.label;"/>
-                <radio id="console-filter-messages" value="message"
-                       label="&consoleMessages.label;"/>
-                <radio id="console-filter-warnings" value="warning"
-                       label="&consoleWarnings.label;"/>
-                <radio id="console-filter-errors" value="error"
-                       label="&consoleErrors.label;"/>
+              <radiogroup id="console-filter" oncommand="ConsolePanelView.changeMode();">
+                <radio id="console-filter-all" label="&consoleAll.label;" value="all" selected="true"/>
+                <radio id="console-filter-messages" label="&consoleMessages.label;" value="message"/>
+                <radio id="console-filter-warnings" label="&consoleWarnings.label;" value="warning"/>
+                <radio id="console-filter-errors" label="&consoleErrors.label;" value="error"/>
               </radiogroup>
-              <button id="console-clear" class="show-text"
-                      label="&consoleClear.label;"
-                      oncommand="ConsolePanelView.clearConsole();"/>
+              <button id="console-clear" class="show-text" oncommand="ConsolePanelView.clearConsole();" label="&consoleClear.label;"/>
             </hbox>
           </vbox>
 
-          <richlistbox id="console-box" class="panel-list console-box" flex="1"
-                       onkeypress="ConsolePanelView.onConsoleBoxKeyPress(event)"
-                       oncontextmenu="ConsolePanelView.onContextMenu(event);"/>
+          <richlistbox id="console-box" class="panel-list console-box" flex="1" onkeypress="ConsolePanelView.onConsoleBoxKeyPress(event)" oncontextmenu="ConsolePanelView.onContextMenu(event);"/>
         </vbox>
       </deck>
     </vbox>
 
     <!-- Find bar -->
     <appbar id="findbar" class="window-width" pack="start">
       <textbox id="findbar-textbox" type="search"
                oncommand="FindHelperUI.search(this.value)"
--- a/browser/metro/theme/browser.css
+++ b/browser/metro/theme/browser.css
@@ -720,31 +720,38 @@ documenttab[selected] .documenttab-selec
   padding: 60px 40px;
 }
 
 #panel-container[viewstate="snapped"] .canSnapTiles .richgrid-item-content {
   -moz-box-orient: horizontal;
 }
 
 #panel-close-button {
+  background: transparent;
+  border: 0 none;
+  -moz-appearance: none;
+  margin: 0;
   -moz-margin-end: 40px;
-  list-style-image: url(chrome://browser/skin/images/navbar-back.png);
+  list-style-image: url(chrome://browser/skin/images/appbar-back.png);
+  -moz-image-region: rect(0 40px 40px 0);
+  padding: 0;
+  min-height: 40px;
+  max-height: 40px;
   -moz-box-pack: center;
 }
 
-@media (min-resolution: @min_res_140pc@) {
+@media (min-resolution: 130dpi) {
   #panel-close-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-back@1.4x.png);
+    list-style-image: url(chrome://browser/skin/images/appbar-back@1.4x.png);
+    width: 40px;
   }
 }
 
-@media (min-resolution: @min_res_180pc@) {
-  #panel-close-button {
-    list-style-image: url(chrome://browser/skin/images/navbar-back@1.8x.png);
-  }
+#panel-close-button[disabled] {
+  opacity: .5;
 }
 
 #panel-view-switcher {
   border: 0 none !important;
   color: #000 !important;
   background: transparent;
   padding: 0;
   font-size: @metro_font_xlarge@;