Bug 1133380 about:privatebrowsing doesn't display properly in Classic any more r=Ratty,stefanh a=IanN
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Thu, 19 Mar 2015 01:14:18 +0000
changeset 25803 c42950dafe40921eea1c26c23fb02d36a2bcfe81
parent 25802 f70c5e679fabfc6dfec44846542b9c0aeb83ed0e
child 25804 360bca7e702638bf5cd0c3f3d3f97f57b6b8cb44
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersRatty, stefanh, IanN
bugs1133380
Bug 1133380 about:privatebrowsing doesn't display properly in Classic any more r=Ratty,stefanh a=IanN
suite/common/aboutPrivateBrowsing.xul
suite/themes/classic/communicator/aboutPrivateBrowsing.css
suite/themes/classic/mac/communicator/aboutPrivateBrowsing.css
--- a/suite/common/aboutPrivateBrowsing.xul
+++ b/suite/common/aboutPrivateBrowsing.xul
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/in-content/info-pages.css" type="text/css"?>
 <?xml-stylesheet href="chrome://global/skin/config.css" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/aboutPrivateBrowsing.css" type="text/css"?>
 
 <!DOCTYPE window [
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
   <!ENTITY % aboutPrivateBrowsingDTD SYSTEM "chrome://communicator/locale/aboutPrivateBrowsing.dtd" >
   %aboutPrivateBrowsingDTD;
@@ -18,31 +20,30 @@
         id="warningScreen"
         align="center">
   <script type="text/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
   <script type="text/javascript" src="chrome://communicator/content/tasksOverlay.js"/>
   <script type="text/javascript" src="chrome://help/content/contextHelp.js"/>
   <script type="text/javascript" src="chrome://communicator/content/aboutPrivateBrowsing.js"/>
   <spacer flex="1"/>
   <hbox id="warningBox" align="start">
-    <image id="warningBoxIcon"/>
     <vbox id="warningOuterBox">
-      <vbox id="warningTitle">
-        <label id="privateTitle" class="private">&privatebrowsingpage.title.private;</label>
-        <label id="normalTitle" class="normal">&privatebrowsingpage.title.normal;</label>
+      <vbox>
+        <label id="privateTitle" class="private title">&privatebrowsingpage.title.private;</label>
+        <label id="normalTitle" class="normal title">&privatebrowsingpage.title.normal;</label>
       </vbox>
-      <vbox id="warningStatus">
+      <vbox id="warningStatus" class="title-text">
         <label class="private">&privatebrowsingpage.status.private;</label>
         <label class="normal">&privatebrowsingpage.status.normal;</label>
       </vbox>
-      <vbox id="warningInnerBox" align="start">
+      <vbox id="warningInnerBox" class="container" align="start">
         <description id="warningText">&privatebrowsingpage.common.description;</description>
         <hbox id="trackWarnBox" class="private">
           <image id="trackWarnIcon"/>
-          <description flex="1">&privatebrowsingpage.track.warn;</description>
+          <label flex="1">&privatebrowsingpage.track.warn;</label>
         </hbox>
         <button id="learnMoreButton"
                 label="&privatebrowsingpage.learnmore.label;"
                 accesskey="&privatebrowsingpage.learnmore.accesskey;"/>
         <description class="private">&privatebrowsingpage.close.info;</description>
         <button id="closeWindowButton"
                 class="private"
                 label="&privatebrowsingpage.close.label;"
--- a/suite/themes/classic/communicator/aboutPrivateBrowsing.css
+++ b/suite/themes/classic/communicator/aboutPrivateBrowsing.css
@@ -6,57 +6,48 @@
 
 /* Hide selected items by default and display them based on the page status */
 
 #warningBox:not(.private) .private,
 #warningBox:not(.normal) .normal {
   display: none;
 }
 
+.title {
+  background-size: auto;
+}
+
 /* Pick the desired icons depending on the window's context */
 
-#warningBox.private > #warningBoxIcon {
-  list-style-image: url("chrome://global/skin/icons/information-48.png");
-  width: 48px;
-  height: 48px;
-  -moz-margin-end: 3em;
+.private.title {
+  background-image: url("chrome://global/skin/icons/information-48.png");
 }
 
-#warningBox.normal > #warningBoxIcon {
-  list-style-image: url("chrome://global/skin/icons/question-48.png");
-  width: 48px;
-  height: 48px;
-  -moz-margin-end: 3em;
+.normal.title {
+  background-image: url("chrome://global/skin/icons/question-48.png");
 }
 
 #trackWarnBox {
   margin-top: 0.6em;
   -moz-margin-end: 7em;
   -moz-box-align: center;
 }
 
 #trackWarnIcon {
   list-style-image: url("chrome://global/skin/icons/warning-24.png");
   width: 24px;
   height: 24px;
 }
 
 /* Define additional styles to look similar to the netError/certError pages */
 
-#warningTitle {
-  font-weight: bold;
-}
-
 #warningStatus {
   margin: 0.4em 0 1.2em 0;
-  padding-bottom: 1.2em;
-  border-bottom: 1px solid ThreeDLightShadow;
   font-size: 135%;
 }
 
 #warningInnerBox > button {
   margin: 0.8em 0 1em 0;
 }
 
-#warningOuterBox > vbox > label,
-#warningInnerBox > description {
+#warningStatus > label {
   -moz-margin-start: 0;
 }
--- a/suite/themes/classic/mac/communicator/aboutPrivateBrowsing.css
+++ b/suite/themes/classic/mac/communicator/aboutPrivateBrowsing.css
@@ -6,30 +6,28 @@
 
 /* Hide selected items by default and display them based on the page status */
 
 #warningBox:not(.private) .private,
 #warningBox:not(.normal) .normal {
   display: none;
 }
 
+.title {
+  background-size: auto;
+}
+
 /* Pick the desired icons depending on the window's context */
 
-#warningBox.private > #warningBoxIcon {
-  list-style-image: url("chrome://global/skin/icons/information-large.png");
-  width: 48px;
-  height: 48px;
-  -moz-margin-end: 1.5em;
+.private.title {
+  background-image: url("chrome://global/skin/icons/information-large.png");
 }
 
-#warningBox.normal > #warningBoxIcon {
-  list-style-image: url("chrome://global/skin/icons/question-large.png");
-  width: 48px;
-  height: 48px;
-  -moz-margin-end: 1.5em;
+.normal.title {
+  background-image: url("chrome://global/skin/icons/question-large.png");
 }
 
 #trackWarnBox {
   margin-top: 0.6em;
   -moz-margin-end: 4em;
   -moz-box-align: start;
 }
 
@@ -37,27 +35,20 @@
   list-style-image: url("chrome://global/skin/icons/warning-24.png");
   width: 24px;
   height: 24px;
   -moz-margin-end: 1em;
 }
 
 /* Define additional styles to look similar to the netError/certError pages */
 
-#warningTitle {
-  font-weight: bold;
-}
-
 #warningStatus {
   margin: 0.4em 0 1.2em 0;
-  padding-bottom: 1.2em;
-  border-bottom: 1px solid ThreeDLightShadow;
   font-size: 135%;
 }
 
 #warningInnerBox > button {
   margin: 0.8em 0 1em 0;
 }
 
-#warningOuterBox > vbox > label,
-#warningInnerBox > description {
+#warningStatus > label,
   -moz-margin-start: 0;
 }