bug 1178008 Add content privatebrowsing CSS to jar.mn and move some rules from content aboutPrivateBrowsing.css r=Neil a=Ratty CLOSED TREE a=IanN all branches.
authorRyan Nematz [:rn10950] <rn10950@gmail.com>
Tue, 14 Jul 2015 05:02:58 +0800
changeset 22834 a38bd6d34748136d70e8614edf04a25ebe4748a3
parent 22833 9c3b32b0cc34724a6fbc425e71f7539c45a77833
child 22835 89a926b8c66f0894652a64bac298f8534b23edbd
push id1443
push usermbanner@mozilla.com
push dateMon, 10 Aug 2015 18:31:17 +0000
treeherdercomm-beta@8fe07d686c22 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersNeil, Ratty, IanN
bugs1178008
bug 1178008 Add content privatebrowsing CSS to jar.mn and move some rules from content aboutPrivateBrowsing.css r=Neil a=Ratty CLOSED TREE a=IanN all branches.
suite/common/aboutPrivateBrowsing.css
suite/common/aboutPrivateBrowsing.xul
suite/common/jar.mn
suite/themes/classic/communicator/aboutPrivateBrowsing.css
suite/themes/classic/mac/communicator/aboutPrivateBrowsing.css
suite/themes/modern/communicator/aboutPrivateBrowsing.css
new file mode 100644
--- /dev/null
+++ b/suite/common/aboutPrivateBrowsing.css
@@ -0,0 +1,12 @@
+/* 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/. */
+
+#warningBox:not(.private) .private,
+#warningBox:not(.normal) .normal {
+  display: none;
+}
+
+.title {
+  background-size: auto;
+}
--- a/suite/common/aboutPrivateBrowsing.xul
+++ b/suite/common/aboutPrivateBrowsing.xul
@@ -2,16 +2,17 @@
 
 <!-- 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;
 ]>
--- a/suite/common/jar.mn
+++ b/suite/common/jar.mn
@@ -44,16 +44,17 @@ comm.jar:
 % overlay chrome://messenger/content/mailViewSetup.xul chrome://communicator/content/helpMessengerOverlay.xul
 % overlay chrome://messenger-smime/content/msgCompSecurityInfo.xul chrome://communicator/content/helpMessengerOverlay.xul
 % overlay chrome://messenger-smime/content/msgReadSecurityInfo.xul chrome://communicator/content/helpMessengerOverlay.xul
 % content communicator-platform %content/communicator-platform/ platform
 % content communicator-region %content/communicator-region/
    content/communicator/about.js
    content/communicator/about.xhtml
    content/communicator/aboutLife.xhtml
+   content/communicator/aboutPrivateBrowsing.css
    content/communicator/aboutPrivateBrowsing.js
    content/communicator/aboutPrivateBrowsing.xul
    content/communicator/aboutSessionRestore.js
    content/communicator/aboutSessionRestore.xhtml
    content/communicator/askViewZoom.xul
    content/communicator/askViewZoom.js
    content/communicator/blockedSite.js
    content/communicator/blockedSite.xhtml
--- a/suite/themes/classic/communicator/aboutPrivateBrowsing.css
+++ b/suite/themes/classic/communicator/aboutPrivateBrowsing.css
@@ -1,25 +1,14 @@
 /* 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");
 
-/* 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 */
 
 .private.title {
   background-image: url("chrome://global/skin/icons/information-48.png");
 }
 
 .normal.title {
   background-image: url("chrome://global/skin/icons/question-48.png");
--- a/suite/themes/classic/mac/communicator/aboutPrivateBrowsing.css
+++ b/suite/themes/classic/mac/communicator/aboutPrivateBrowsing.css
@@ -1,25 +1,14 @@
 /* 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");
 
-/* 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 */
 
 .private.title {
   background-image: url("chrome://global/skin/icons/information-large.png");
 }
 
 .normal.title {
   background-image: url("chrome://global/skin/icons/question-large.png");
--- a/suite/themes/modern/communicator/aboutPrivateBrowsing.css
+++ b/suite/themes/modern/communicator/aboutPrivateBrowsing.css
@@ -1,21 +1,14 @@
 /* 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");
 
-/* Hide selected items by default and display them based on the page status */
-
-#warningBox:not(.private) .private,
-#warningBox:not(.normal) .normal {
-  display: none;
-}
-
 /* Pick the desired icons depending on the window's context */
 
 #warningBox.private {
   background-image: url("chrome://global/skin/icons/information-48.png");
 }
 
 #warningBox.normal {
   background-image: url("chrome://global/skin/icons/question-48.png");