Bug 1192276 Restore about:privatebrowsing UI to before it was messed up by Project Chameleon styles r=Neil ui-r=stefanh f=alfredkayser a=IanN for comm-aurora comm-beta and comm-release CLOSED TREE BETA_BASE_20150921
authorPhilip Chee <philip.chee@gmail.com>
Fri, 18 Sep 2015 23:30:52 +0800
changeset 23119 0e6fd3bedbfbc09ab4c76375d7dd8f5e9c595a14
parent 23118 59f5f2f3a783a26a1b0f30cf6451d877cc7ec660
child 23120 fc55a002e5f7b8c94aed51ae2ee470ea452de823
push idunknown
push userunknown
push dateunknown
reviewersNeil, stefanh, IanN
bugs1192276
Bug 1192276 Restore about:privatebrowsing UI to before it was messed up by Project Chameleon styles r=Neil ui-r=stefanh f=alfredkayser a=IanN for comm-aurora comm-beta and comm-release CLOSED TREE
suite/common/aboutPrivateBrowsing.xul
suite/themes/classic/communicator/aboutPrivateBrowsing.css
suite/themes/classic/communicator/icons/information-48.png
suite/themes/classic/communicator/icons/question-48.png
suite/themes/classic/communicator/icons/warning-24.png
suite/themes/classic/jar.mn
suite/themes/classic/mac/communicator/aboutPrivateBrowsing.css
suite/themes/classic/mac/communicator/icons/warning-24.png
suite/themes/modern/communicator/aboutPrivateBrowsing.css
--- a/suite/common/aboutPrivateBrowsing.xul
+++ b/suite/common/aboutPrivateBrowsing.xul
@@ -1,17 +1,15 @@
 <?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/content/aboutPrivateBrowsing.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;
@@ -21,30 +19,31 @@
         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>
-        <label id="privateTitle" class="private title">&privatebrowsingpage.title.private;</label>
-        <label id="normalTitle" class="normal title">&privatebrowsingpage.title.normal;</label>
+      <vbox id="warningTitle">
+        <label id="privateTitle" class="private">&privatebrowsingpage.title.private;</label>
+        <label id="normalTitle" class="normal">&privatebrowsingpage.title.normal;</label>
       </vbox>
-      <vbox id="warningStatus" class="title-text">
+      <vbox id="warningStatus">
         <label class="private">&privatebrowsingpage.status.private;</label>
         <label class="normal">&privatebrowsingpage.status.normal;</label>
       </vbox>
-      <vbox id="warningInnerBox" class="container" align="start">
+      <vbox id="warningInnerBox" align="start">
         <description id="warningText">&privatebrowsingpage.common.description;</description>
         <hbox id="trackWarnBox" class="private">
           <image id="trackWarnIcon"/>
-          <label flex="1">&privatebrowsingpage.track.warn;</label>
+          <description flex="1">&privatebrowsingpage.track.warn;</description>
         </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
@@ -1,42 +1,86 @@
 /* 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/. */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
+#warningScreen {
+  background-color: -moz-Dialog;
+}
+
+#warningBox {
+  background-color: -moz-Field;
+  color: -moz-FieldText;
+  border: 1px solid ThreeDShadow;
+  border-radius: 10px;
+  padding: 3em;
+  -moz-padding-start: 30px;
+  margin-left: 1em;
+  margin-right: 1em;
+}
+
+#warningInnerBox {
+ max-width: 50em;
+}
+
+#warningTitle {
+  margin: 0 0 .6em 0;
+  font-size: 160%;
+  border-bottom: 1px solid ThreeDLightShadow
+}
+
+#warningText {
+  font-size: 110%;
+  margin-left: 0;
+}
+
 /* Pick the desired icons depending on the window's context */
 
-.private.title {
-  background-image: url("chrome://global/skin/icons/information-48.png");
+#warningBox.private > #warningBoxIcon {
+  list-style-image: url("chrome://communicator/skin/icons/information-48.png");
+
+  width: 48px;
+  height: 48px;
+  -moz-margin-end: 3em;
 }
 
-.normal.title {
-  background-image: url("chrome://global/skin/icons/question-48.png");
+#warningBox.normal > #warningBoxIcon {
+  list-style-image: url("chrome://communicator/skin/icons/question-48.png");
+  width: 48px;
+  height: 48px;
+  -moz-margin-end: 3em;
 }
 
 #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");
+  list-style-image: url("chrome://communicator/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;
 }
 
-#warningStatus > label {
+#warningOuterBox > vbox > label,
+#warningInnerBox > description {
   -moz-margin-start: 0;
 }
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..59893b29b449306ae3d296a22e2fc08193642d92
GIT binary patch
literal 2598
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
IM6N<$f_4|@mH+?%
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..b81863620055b249e8f8252659af323e10b34a23
GIT binary patch
literal 2849
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
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..42f20a7a49b56666870fddced38b5be0c2af0bcc
GIT binary patch
literal 914
zc$@)}18w|?P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#G)Y83RCwCdR!dJ4Q4~JYPM@^4NC9P9
z?6j7LB85J{(2xeA(T&li{sCej5(x_-MnW_(xG_<Qicl1y3H|{Ix-l^>G|`PwAYwpb
zNDN{u4=K}`d%br`2U<i*0t;_)rf1GQ_dLGy%}g1LG3@42!7eYBUP7VJmX2+wK0wo5
zD-(@I;nJBnzC5_R<r#|3b~>ngK9GlA4sw%3x9v1U3}5Mb=&2FmP@Vcfb?x43)Rxgf
z+D7Dp@t;nGMaGtzbEP-+#tAv>%(xkzbbmYC9$Egh6A)$dm3)U*I|)ccvgA2qP#ey9
zK=#xbL8RAhE*`J7lPdx1@Q48A)hv`(u`u!?2A+UE)Yqy%p;D<}Gs$EIE~nSt%;0Gl
zc+7%Yoh=L1&9-^)9<|*kKAJ6Q+SI4ru+iHX1Fm>qzpZeIz!C=s$HM2yL_H3U3_=pY
zRhi`&x}s}+{Z{O{H5}hIi|Sqe+%S&M02VP6@q*Gi)#)sBx?fOQmET5u^S4V=hA-zL
zCd(|Kcw(>tuLuYsS*T8vVhMr0Sh5_eGk0!ATN$G3r+=pyIj8C(@5^zb*qCA~aY<m%
z#}yq(3A-AiQ0&`t{_5HJ+Z{vVXeJ$GyMyiymYGs$iKN7@$0^7{b-4o~RL^w?P*Y>-
z{aZZQpwS>jT!)RFToGfHVvDOVU?o^6ppqpSIGG&8Mez7cq3#CuWI9dRbXvM9_BZ3$
zbRsa5`YNvv{s2=JlJ^pmT76=Pm@M;95zM{^eRCdiE2MPL5Ru43g-P}1{#-i(X=O#J
zFj@WBgc`bf3~-~zm;#&P6BmF#qAGmUtZr!xW0?%;GpIipw1?vhQ;F&&oC3wuXJ#0m
zcEbB{H;jI<Dv8(oXxVuv^;_H5(>9rav3tysEaMy?L0ZE%Ssh6hC^LY?Vu6B!0x%nK
ziVy8ZP9%uHxxo_hF$!&yGtd|eqEm=|Pr;Uv@x`)o-2WBI_(d@21hASGNZ>WvGt8<V
zSxEc|dL#A|mA)QUk_ph8S4(#$Cm>9QzwTr@>1I<+%tj|N3V8Ps57C&)_kdw!Cz{c;
o1K(*Hc!^do$NumCRs0cP0OhxvH7nojTmS$707*qoM6N<$f)c=<bN~PV
--- a/suite/themes/classic/jar.mn
+++ b/suite/themes/classic/jar.mn
@@ -40,16 +40,17 @@ classic.jar:
   skin/classic/communicator/sidebar/sidebar.css                         (mac/communicator/sidebar/sidebar.css)
   skin/classic/communicator/sync/syncSetup.css                          (mac/communicator/sync/syncSetup.css)
   skin/classic/communicator/icons/communicatoricons.png                 (mac/communicator/icons/communicatoricons.png)
   skin/classic/communicator/icons/communicatoricons-small.png           (mac/communicator/icons/communicatoricons-small.png)
   skin/classic/communicator/icons/feedIcon16-disabled.png               (mac/communicator/icons/feedIcon16-disabled.png)
   skin/classic/communicator/icons/geolocation-16.png                    (mac/communicator/icons/geolocation-16.png)
   skin/classic/communicator/icons/geolocation-64.png                    (mac/communicator/icons/geolocation-64.png)
   skin/classic/communicator/icons/item.png                              (mac/communicator/icons/item.png)
+  skin/classic/communicator/icons/warning-24.png                        (mac/communicator/icons/warning-24.png)
   skin/classic/communicator/toolbar/toolbar-gradient22.png              (mac/communicator/toolbar/toolbar-gradient22.png)
   skin/classic/communicator/toolbar/toolbar-gradient34.png              (mac/communicator/toolbar/toolbar-gradient34.png)
 #else
   skin/classic/communicator/aboutPrivateBrowsing.css                    (communicator/aboutPrivateBrowsing.css)
   skin/classic/communicator/aboutSessionRestore.css                     (communicator/aboutSessionRestore.css)
   skin/classic/communicator/button.css                                  (communicator/button.css)
   skin/classic/communicator/communicator.css                            (communicator/communicator.css)
   skin/classic/communicator/helpOverlay.css                             (communicator/helpOverlay.css)
@@ -76,17 +77,20 @@ classic.jar:
   skin/classic/communicator/search/mainwindow-dropdown-arrow.png        (communicator/search/mainwindow-dropdown-arrow.png)
   skin/classic/communicator/search/searchbar.css                        (communicator/search/searchbar.css)
   skin/classic/communicator/sidebar/sidebar.css                         (communicator/sidebar/sidebar.css)
   skin/classic/communicator/sync/syncSetup.css                          (communicator/sync/syncSetup.css)
   skin/classic/communicator/icons/communicatoricons.png                 (communicator/icons/communicatoricons.png)
   skin/classic/communicator/icons/communicatoricons-small.png           (communicator/icons/communicatoricons-small.png)
   skin/classic/communicator/icons/geolocation-16.png                    (communicator/icons/geolocation-16.png)
   skin/classic/communicator/icons/geolocation-64.png                    (communicator/icons/geolocation-64.png)
+  skin/classic/communicator/icons/information-48.png                    (communicator/icons/information-48.png)
   skin/classic/communicator/icons/loading.gif                           (communicator/icons/loading.gif)
+  skin/classic/communicator/icons/question-48.png                       (communicator/icons/question-48.png)
+  skin/classic/communicator/icons/warning-24.png                        (communicator/icons/warning-24.png)
 #endif
   skin/classic/communicator/brand.css                                   (communicator/brand.css)
   skin/classic/communicator/blockedSite.css                             (communicator/blockedSite.css)
   skin/classic/communicator/certError.css                               (communicator/certError.css)
   skin/classic/communicator/dialogs.css                                 (communicator/dialogs.css)
   skin/classic/communicator/communicatorBindings.xml                    (communicator/communicatorBindings.xml)
   skin/classic/communicator/preferences.css                             (communicator/preferences.css)
   skin/classic/communicator/prefpanels.css                              (communicator/prefpanels.css)
--- a/suite/themes/classic/mac/communicator/aboutPrivateBrowsing.css
+++ b/suite/themes/classic/mac/communicator/aboutPrivateBrowsing.css
@@ -1,43 +1,85 @@
 /* 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/. */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
+#warningScreen {
+  background-color: -moz-Dialog;
+}
+
+#warningBox {
+  background-color: -moz-Field;
+  color: -moz-FieldText;
+  border: 1px solid ThreeDShadow;
+  border-radius: 10px;
+  padding: 3em;
+  -moz-padding-start: 30px;
+  margin-left: 1em;
+  margin-right: 1em;
+}
+
+#warningInnerBox {
+ max-width: 50em;
+}
+
+#warningTitle {
+  margin: 0 0 .6em 0;
+  font-size: 160%;
+  border-bottom: 1px solid ThreeDLightShadow
+}
+
+#warningText {
+  font-size: 110%;
+  margin-left: 0;
+}
+
 /* Pick the desired icons depending on the window's context */
 
-.private.title {
-  background-image: url("chrome://global/skin/icons/information-large.png");
+#warningBox.private > #warningBoxIcon {
+  list-style-image: url("chrome://global/skin/icons/information-large.png");
+  width: 48px;
+  height: 48px;
+  -moz-margin-end: 1.5em;
 }
 
-.normal.title {
-  background-image: url("chrome://global/skin/icons/question-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;
 }
 
 #trackWarnBox {
   margin-top: 0.6em;
   -moz-margin-end: 4em;
   -moz-box-align: start;
 }
 
 #trackWarnIcon {
-  list-style-image: url("chrome://global/skin/icons/warning-24.png");
+  list-style-image: url("chrome://communicator/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;
 }
 
-#warningStatus > label,
+#warningOuterBox > vbox > label,
+#warningInnerBox > description {
   -moz-margin-start: 0;
 }
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..65a116a04d9b497b68c99fded4f16872e24a287c
GIT binary patch
literal 1063
zc$@(z1laqDP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#$w@>(RCwB~RbOZvMHv6>%<bLoWzEKf
zUSqJ=G&J{+Scrm2xF8Zyi+>)Z^g(<QQJR9K6#Afu4Uz}@C_ZRgD@Eu-8?|p06rn<C
zp%4B`6hR-fXW=f`Hc4|y_jYGz{ATwyJ<jBEPzOF{c6R3X{eIu~&5WUxLOac%Mjfkv
zO4a5@)+RVxy@na}GlaI~D>$m>+G3`Ov@+d(nnh90TS`_>D!KBZl5>{&^#aD**>7y6
zl$cs8S8=Ih*X!dj145)pVWL(#eZ?NbBz*;~FxVF0`12z6*>2A`>>L3vkd*;zJIrj)
z#9v=wzh2f7V>9n@PLcMm;SaNaDsP~SGv`;}WEJ*5Z_|Q@5tL4qtT7a5U2QX*Rtk)T
zZ*hcWd-Fz0;m7$ZW-q4k>1-N5%vI^H4`%Pkm%qW0Rw~$L?9a|1_kfMJdGAY5L5UJ3
z!5IV7%47(v{SMwWfzA%Rb!Hmd>x$b}z@8byH18gAq3#f14UR1l1ObE)a4d2l1rS!j
zI|kh6ikPN7ye$Ws$rr~ll(o|bdCw@-NQJ;82J;f$T@Rk;VQ`0p3PZ@X8{p0!blB$9
z+4t~>v4IS>QDUDM!3i@r0z*{daMZ0<^N{8>VlJSBwg9Sn9o!zk)1&x^_L|K;niUvV
zPvO~&?M#?mI|*nl3WW+|+cOxTzpoaJLEz9%JPH%<M#i*@mrr1CbHZ5@dn=#A@l4+c
zl)nI_!DYDaMCTyzi8b{y5RpYns%4mVKX&!veZt5zI!HA-`~Eauv)ygOW|rz)P$`CC
z6o2hR5!j1G0v0s(=s=6)pNe{}Ok~oX!}Fird6meXOfJLdplS9WyorbQJ&E6Pj}=|6
zNPZAAg=Xmsed)wtDgkXA%czVcv$3>vefjbn249)MKN>p;5t|&rVawU(vc=m_x0WE6
zt5B;Ru??b%`MWIe)FFY%LlQSCVVoDOMkEOjVR$Prx#JGyaWpAgrrCe~E(%VDPdRQ^
zyf_SF6ZiTrFNLVw=2%$dxbU590I#ppN=dP$IGhYSaPA!xG`3d2clY9$)79;A$U3;B
z93<ee!_h(r%k(3Ae0LDd%R2kU-UvL{M#?Sp;h4^`E}hO_K4!}U!#hdN2Jvl-GnxJu
z_s#S7dZ`RlRznOORBq~xz334>;8lJ74n_--gf=_)52&g;3uS$MJV#d+d|wAgrBk1L
zjax4~s?G_&{4(yl8SCe)bW@$zk5Mx7AX%TjCboJ&+IfZb`#?tb3>MeVLA|UD{69@Q
h3EO&;@3;LczyO|tgSH3l%mn}d002ovPDHLkV1oEz_%Q$g
--- a/suite/themes/modern/communicator/aboutPrivateBrowsing.css
+++ b/suite/themes/modern/communicator/aboutPrivateBrowsing.css
@@ -1,62 +1,82 @@
 /* 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/. */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
+#warningScreen {
+  background-color: #FFF;
+}
+
+#warningBox {
+  background-color: #C7D0D9;
+  color: #22262F;
+  border: 1px solid #494F5D;
+  border-radius: 10px;
+  padding: 3em;
+  -moz-padding-start: 30px;
+  margin: 0 1em;
+}
+
+#warningInnerBox {
+  max-width: 50em;
+}
+
+#warningTitle {
+  font-weight: bold;
+  margin: 0 0 .6em;
+  font-size: 160%;
+  border-bottom: 1px solid #7A8490;
+}
+
+#warningText
+{
+  font-size: 110%;
+  -moz-margin-start: 0;
+}
+
 /* Pick the desired icons depending on the window's context */
 
-#warningBox.private {
-  background-image: url("chrome://global/skin/icons/information-48.png");
+#warningBox.private > #warningBoxIcon {
+  list-style-image: url("chrome://global/skin/icons/information-48.png");
+  width: 48px;
+  height: 48px;
+  -moz-margin-end: 3em;
 }
 
-#warningBox.normal {
-  background-image: url("chrome://global/skin/icons/question-48.png");
+#warningBox.normal > #warningBoxIcon {
+  list-style-image: url("chrome://global/skin/icons/question-48.png");
+  width: 48px;
+  height: 48px;
+  -moz-margin-end: 3em;
 }
 
 #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 */
 
-#privateTitle,
-#normalTitle {
-  -moz-padding-start: 0px;
-  margin: 0 0 .6em;
-  font-size: 160%;
-  font-weight: bold;
-}
-
 #warningStatus {
   margin: 0.4em 0 1.2em 0;
   padding-bottom: 1.2em;
   border-bottom: 1px solid #7A8490;
   font-size: 135%;
 }
 
-#warningInnerBox
-{
-  max-width: 50em;
-}
-
 #warningInnerBox > button {
   margin: 0.8em 0 1em 0;
 }
 
-#warningOuterBox {
-  -moz-padding-start: 3em;
-}
-
 #warningOuterBox > vbox > label,
 #warningInnerBox > description {
   -moz-margin-start: 0;
 }