Bug 876816 - Adding a class into flyoutpanels.css for standard widths. r=ally
authorKamil Jozwiak <kamiljoz@gmail.com>
Mon, 29 Jul 2013 16:34:16 -0700
changeset 140478 14724efcf7f7b4569dbdae980aecea6b107e4285
parent 140477 505ad1c506cc6ac3f258b9f1d4284eda4026b1e4
child 140479 fed05531f9e33d7cc647f5436d515572c5c76951
push id1970
push userryanvm@gmail.com
push dateTue, 30 Jul 2013 17:12:32 +0000
treeherderfx-team@72240998c094 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersally
bugs876816
milestone25.0a1
Bug 876816 - Adding a class into flyoutpanels.css for standard widths. r=ally
browser/metro/base/content/browser.xul
browser/metro/theme/browser.css
browser/metro/theme/flyoutpanel.css
--- a/browser/metro/base/content/browser.xul
+++ b/browser/metro/base/content/browser.xul
@@ -391,17 +391,17 @@
         <toolbarbutton id="clear-selected-button" class="appbar-secondary"
                        hidden="true" fade="true"
                        oncommand="Appbar.dispatchContextualAction('clear')"/>
       </toolbar>
     </appbar>
 
     <autoscroller class="autoscroller" id="autoscrollerid"/>
 
-    <flyoutpanel id="about-flyoutpanel" headertext="&aboutHeader.title;">
+    <flyoutpanel id="about-flyoutpanel" class="flyout-narrow" headertext="&aboutHeader.title;">
       <label id="about-product-label" value="&aboutHeader.product.label;"/>
       <label value="&aboutHeader.company.label;"/>
 #expand <label id="about-version-label">__MOZ_APP_VERSION__</label>
       <vbox id="updateBox">
 #ifdef MOZ_UPDATER
         <deck id="updateDeck" orient="vertical">
           <hbox id="updateButtonBox" align="center">
             <button id="updateButton" align="start"
@@ -446,17 +446,17 @@
 #endif
 #endif
       <label id="about-policy-label"
             onclick="if (event.button == 0) { Browser.onAboutPolicyClick(); }"
             class="text-link" value="&aboutHeader.policy.label;"/>
     </flyoutpanel>
 
 #ifdef MOZ_SERVICES_SYNC
-    <flyoutpanel id="sync-flyoutpanel" headertext="&sync.flyout.title;">
+    <flyoutpanel id="sync-flyoutpanel" class="flyout-narrow" headertext="&sync.flyout.title;">
 
       <vbox id="sync-presetup-container" collapsed="true">
         <description>&sync.flyout.presetup.description1;</description>
         <separator />
         <hbox onclick="FlyoutPanelsUI.SyncFlyoutPanel.startEasySetup();"
               align="center"
               class="text-link">
           <image src="chrome://browser/skin/images/plus-34.png" />
@@ -648,17 +648,17 @@
       <vbox id="sync-pair-success-container" collapsed="true">
         <description>&sync.flyout.pairSuccess.description1;</description>
         <description>&sync.flyout.pairSuccess.description2;</description>
       </vbox>
 
     </flyoutpanel>
 #endif
 
-    <flyoutpanel id="prefs-flyoutpanel" headertext="&optionsHeader.title;">
+    <flyoutpanel id="prefs-flyoutpanel" class="flyout-narrow" headertext="&optionsHeader.title;">
       <settings id="prefs-startup" label="&optionsHeader.startup.title;"> <!-- note, this element has a custom margin-top -->
         <setting id="prefs-homepage" title="&optionsHeader.homepage.title;" type="menulist" pref="browser.startup.sessionRestore" class="setting-expanded">
           <menulist id="prefs-homepage-options">
             <menupopup id="prefs-homepage-popup" position="after_end">
               <menuitem id="prefs-homepage-default" label="&optionsHeader.homepage.startPage.button;" value="false"/>
               <menuitem id="prefs-homepage-session" label="&optionsHeader.homepage.sessionRestore.button;" value="true"/>
             </menupopup>
           </menulist>
--- a/browser/metro/theme/browser.css
+++ b/browser/metro/theme/browser.css
@@ -993,17 +993,16 @@ documenttab[selected] .documenttab-selec
 /* don't add a margin to the very top settings entry in flyouts */
 flyoutpanel > settings:first-child {
   margin-top: 0px;
 }
 
 /* Sync flyout pane -------------------------------------------------------- */
 
 #sync-flyoutpanel {
-  width: 346px;
   font-size: @metro_font_normal@;
   font-weight: 400;
 }
 
 #sync-flyoutpanel button {
   font-weight: 700;
 }
 
@@ -1084,17 +1083,16 @@ flyoutpanel > settings:first-child {
 #sync-connected-throbber {
   margin-top: 12px;
   margin-left: 15px;
 }
 
 /* About flyout pane ------------------------------------------------------- */
 
 #about-flyoutpanel {
-  width: 350px;
   background-image:url('chrome://browser/skin/images/about-footer.png');
   background-repeat: no-repeat;
   background-attachment: fixed;
   background-position: right bottom;
 }
 
 #about-product-label {
  font-weight: bold;
@@ -1111,20 +1109,16 @@ flyoutpanel > settings:first-child {
 #currentChannel {
   margin: 0;
   padding: 0;
   font-weight: bold;
 }
 
 /* Preferences flyout pane ------------------------------------------------- */
 
-#prefs-flyoutpanel {
-  width: 400px;
-}
-
 /* Lay out each <setting> in a single row */
 setting {
   min-height: @touch_row@; /* row size */
   -moz-box-align: center;
   -moz-box-orient: horizontal;
 }
 
 /* ...except for some exceptions */
--- a/browser/metro/theme/flyoutpanel.css
+++ b/browser/metro/theme/flyoutpanel.css
@@ -80,8 +80,12 @@ flyoutpanel[visible] {
 
 .flyout-close-button:hover {
   -moz-image-region: rect(0 64px 32px 32px);
 }
 
 .flyout-close-button:active {
   -moz-image-region: rect(0 96px 32px 64px);
 }
+
+.flyout-narrow {
+  width: 346px;
+}