Bug 885242 - Part 5 - Fix back button in and otherwise clean up panel UI. r=mbrubeck
authorJonathan Wilde <jwilde@jwilde.me>
Thu, 18 Jul 2013 00:21:40 -0700
changeset 152050 3f1f8cbdcc8c15b277141c66670ff79ddedb90b6
parent 152049 08f1a0de07d8469c45835d99aef837f4bef20261
child 152051 c64f2402e12eaf2124741f367df7914bafa23fcf
push id2859
push userakeybl@mozilla.com
push dateMon, 16 Sep 2013 19:14:59 +0000
treeherdermozilla-beta@87d3c51cd2bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmbrubeck
bugs885242
milestone25.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 885242 - Part 5 - Fix back button in and otherwise clean up panel UI. r=mbrubeck
browser/metro/base/content/browser.xul
browser/metro/theme/browser.css
browser/metro/theme/images/navbar-back.png
browser/metro/theme/images/navbar-back@1.4x.png
browser/metro/theme/images/navbar-forward.png
browser/metro/theme/images/navbar-forward@1.4x.png
browser/metro/theme/images/navbar-menu.png
browser/metro/theme/images/navbar-menu@1.4x.png
browser/metro/theme/images/navbar-pin.png
browser/metro/theme/images/navbar-pin@1.4x.png
browser/metro/theme/images/navbar-star.png
browser/metro/theme/images/navbar-star@1.4x.png
--- a/browser/metro/base/content/browser.xul
+++ b/browser/metro/base/content/browser.xul
@@ -297,51 +297,70 @@
           <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" hidden="true" class="window-width window-height meta" observes="bcast_windowState">
+    <vbox id="panel-container" class="window-width window-height meta"
+          hidden="true" observes="bcast_windowState">
       <hbox id="panel-header">
-        <toolbarbutton id="panel-close-button" command="cmd_panel"/>
+        <toolbarbutton id="panel-close-button" class="appbar-primary"
+                       command="cmd_panel"/>
       </hbox>
 
       <deck id="panel-items" selectedIndex="0" flex="1" >
         <scrollbox id="bookmarks-container" flex="1">
-          <richgrid id="bookmarks-list" noun="bookmark" class="canSnapTiles" 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" noun="history" class="canSnapTiles" seltype="multiple" flex="1"/>
+          <richgrid id="history-list" noun="history" class="canSnapTiles"
+                    seltype="multiple" flex="1"/>
         </scrollbox>
         <scrollbox id="remotetabs-container" flex="1">
-          <richgrid id="remotetabs-list" noun="tab" class="canSnapTiles" 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="" onkeypress="ConsolePanelView.onEvalKeyPress(event)" flex="1"/>
-              <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="" flex="1"
+                       onkeypress="ConsolePanelView.onEvalKeyPress(event)"/>
+              <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" 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 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>
-              <button id="console-clear" class="show-text" oncommand="ConsolePanelView.clearConsole();" label="&consoleClear.label;"/>
+              <button id="console-clear" class="show-text"
+                      label="&consoleClear.label;"
+                      oncommand="ConsolePanelView.clearConsole();"/>
             </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
@@ -717,38 +717,31 @@ 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/appbar-back.png);
-  -moz-image-region: rect(0 40px 40px 0);
-  padding: 0;
-  min-height: 40px;
-  max-height: 40px;
+  list-style-image: url(chrome://browser/skin/images/navbar-back.png);
   -moz-box-pack: center;
 }
 
-@media (min-resolution: 130dpi) {
+@media (min-resolution: @min_res_140pc@) {
   #panel-close-button {
-    list-style-image: url(chrome://browser/skin/images/appbar-back@1.4x.png);
-    width: 40px;
+    list-style-image: url(chrome://browser/skin/images/navbar-back@1.4x.png);
   }
 }
 
-#panel-close-button[disabled] {
-  opacity: .5;
+@media (min-resolution: @min_res_180pc@) {
+  #panel-close-button {
+    list-style-image: url(chrome://browser/skin/images/navbar-back@1.8x.png);
+  }
 }
 
 #panel-view-switcher {
   border: 0 none !important;
   color: #000 !important;
   background: transparent;
   padding: 0;
   font-size: @metro_font_xlarge@;