From 147f14c53e0ef46b1244919fed72f98c6fd957c7 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Tue, 10 Feb 2015 15:06:18 +0100
Subject: [PATCH] Backed out changeset dbe74171ca49 (bug 1125636) for breaking
 dt tests per discussion on IRC on a CLOSED TREE

--HG--
rename : toolkit/themes/shared/config.css => toolkit/themes/windows/global/config.css
---
 .../components/viewconfig/content/config.xul  | 16 ++--
 toolkit/themes/linux/global/jar.mn            |  2 -
 toolkit/themes/osx/global/config.css          | 94 +++++++++++++++++++
 toolkit/themes/osx/global/jar.mn              |  3 +-
 toolkit/themes/shared/config.css              | 49 ----------
 .../themes/shared/in-content/common.inc.css   |  3 +-
 .../themes/shared/incontent-icons/warning.svg | 12 ---
 toolkit/themes/windows/global/config.css      | 84 +++++++++++++++++
 toolkit/themes/windows/global/jar.mn          | 10 +-
 9 files changed, 191 insertions(+), 82 deletions(-)
 create mode 100644 toolkit/themes/osx/global/config.css
 delete mode 100644 toolkit/themes/shared/config.css
 delete mode 100644 toolkit/themes/shared/incontent-icons/warning.svg
 create mode 100644 toolkit/themes/windows/global/config.css

diff --git a/toolkit/components/viewconfig/content/config.xul b/toolkit/components/viewconfig/content/config.xul
index 56df4b5614f3..2cfd3d368867 100644
--- a/toolkit/components/viewconfig/content/config.xul
+++ b/toolkit/components/viewconfig/content/config.xul
@@ -4,13 +4,12 @@
    - 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/in-content/info-pages.css" type="text/css"?>
 <?xml-stylesheet href="chrome://global/skin/config.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://global/locale/config.dtd">
 
 <window id="config"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
         title="&window.title;"
         windowtype="Preferences:ConfigManager"
         role="application"
@@ -53,18 +52,17 @@
 <deck id="configDeck" flex="1">
   <vbox id="warningScreen" flex="1" align="center" style="overflow: auto;">
     <spacer flex="1"/>
-    <vbox id="warningBox" class="container">
-      <hbox class="title" flex="1">
-        <label id="warningTitle" class="title-text" flex="1">&aboutWarningTitle.label;</label>
-      </hbox>
-      <vbox class="description" flex="1">
+    <hbox id="warningBox" align="top">
+      <image id="exclam"/>
+      <vbox id="warningInnerBox" flex="1">
+        <label id="warningTitle">&aboutWarningTitle.label;</label>
         <label id="warningText">&aboutWarningText.label;</label>
         <checkbox id="showWarningNextTime" label="&aboutWarningCheckbox.label;" checked="true"/>
         <hbox pack="center">
-          <button id="warningButton" class="primary" oncommand="ShowPrefs();" label="&aboutWarningButton.label;"/>
+          <button id="warningButton" oncommand="ShowPrefs();" label="&aboutWarningButton.label;"/>
         </hbox>
       </vbox>
-    </vbox>
+    </hbox>
     <spacer flex="2"/>
   </vbox>
   <vbox flex="1">
diff --git a/toolkit/themes/linux/global/jar.mn b/toolkit/themes/linux/global/jar.mn
index 91942791cfb9..0f28595c8f83 100644
--- a/toolkit/themes/linux/global/jar.mn
+++ b/toolkit/themes/linux/global/jar.mn
@@ -8,7 +8,6 @@ toolkit.jar:
 +  skin/classic/global/checkbox.css
 +  skin/classic/global/colorpicker.css
 +  skin/classic/global/commonDialog.css
-+  skin/classic/global/config.css                              (../../shared/config.css)
 +  skin/classic/global/dropmarker.css
 +  skin/classic/global/filepicker.css
 +  skin/classic/global/Filepicker.png                          (filepicker/Filepicker.png)
@@ -52,7 +51,6 @@ toolkit.jar:
 +  skin/classic/global/icons/panelarrow-vertical.svg           (icons/panelarrow-vertical.svg)
 +  skin/classic/global/icons/resizer.png                       (icons/resizer.png)
 +  skin/classic/global/icons/sslWarning.png                    (icons/sslWarning.png)
-+  skin/classic/global/icons/warning.svg                       (../../shared/incontent-icons/warning.svg)
 +  skin/classic/global/icons/wrap.png                          (icons/wrap.png)
 +  skin/classic/global/icons/webapps-16.png                    (icons/webapps-16.png)
 +  skin/classic/global/icons/webapps-64.png                    (icons/webapps-64.png)
diff --git a/toolkit/themes/osx/global/config.css b/toolkit/themes/osx/global/config.css
new file mode 100644
index 000000000000..011ace3abbf5
--- /dev/null
+++ b/toolkit/themes/osx/global/config.css
@@ -0,0 +1,94 @@
+/* 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/. */
+
+%include shared.inc
+@import url("chrome://global/skin/");
+@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;
+}
+
+#warningButton
+{
+  margin-top: 0.6em;
+}
+
+#showWarningNextTime
+{
+  margin-top: 0.6em;
+}
+
+#exclam
+{
+  list-style-image: url("chrome://global/skin/icons/warning-large.png");
+  -moz-margin-end: 3em;
+}
+
+#configTreeBody::-moz-tree-cell-text(user)
+{
+  font-weight: bold;
+}
+
+#configTreeBody::-moz-tree-cell-text(locked)
+{
+  font-style: italic;
+}
+
+#configTree 
+{  
+  margin: 0;
+  border: 0;
+  -moz-appearance: none;
+}
+
+#filterRow
+{
+  background: @scopeBarBackground@;
+  border-bottom: @scopeBarSeparatorBorder@;
+  padding: 1px 2px 0;
+}
+
+#filterRow > label {
+  margin: 0 4px;
+  color: @scopeBarTitleColor@;
+  text-shadow: @loweredShadow@;
+  font-weight: bold;
+}
+
+#textbox {
+  max-width: 35em;
+}
diff --git a/toolkit/themes/osx/global/jar.mn b/toolkit/themes/osx/global/jar.mn
index 5a3c29e10300..f38415f667ee 100644
--- a/toolkit/themes/osx/global/jar.mn
+++ b/toolkit/themes/osx/global/jar.mn
@@ -19,7 +19,7 @@ toolkit.jar:
   skin/classic/global/checkbox.css
   skin/classic/global/colorpicker.css
   skin/classic/global/commonDialog.css
-  skin/classic/global/config.css                                     (../../shared/config.css)
+* skin/classic/global/config.css
   skin/classic/global/customizeToolbar.css
   skin/classic/global/dialog.css
   skin/classic/global/dropmarker.css
@@ -143,7 +143,6 @@ toolkit.jar:
   skin/classic/global/icons/question-64.png                          (icons/question-64.png)
   skin/classic/global/icons/question-large.png                       (icons/question-large.png)
   skin/classic/global/icons/sslWarning.png                           (icons/sslWarning.png)
-  skin/classic/global/icons/warning.svg                              (../../shared/incontent-icons/warning.svg)
   skin/classic/global/icons/webapps-16.png                           (icons/webapps-16.png)
   skin/classic/global/icons/webapps-16@2x.png                        (icons/webapps-16@2x.png)
   skin/classic/global/icons/webapps-64.png                           (icons/webapps-64.png)
diff --git a/toolkit/themes/shared/config.css b/toolkit/themes/shared/config.css
deleted file mode 100644
index f1c73966f22b..000000000000
--- a/toolkit/themes/shared/config.css
+++ /dev/null
@@ -1,49 +0,0 @@
-/* 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/. */
-
-#warningScreen {
-  font-size: 15px;
-  padding-top: 0;
-  padding-bottom: 0;
-  -moz-padding-start: calc(48px + 4.6em);
-  -moz-padding-end: 48px;
-}
-
-.title {
-  background-image: url("chrome://global/skin/icons/warning.svg");
-}
-
-#warningTitle {
-  font-weight: lighter;
-  line-height: 1.2;
-  color: #333;
-  margin: 0;
-  margin-bottom: .5em;
-}
-
-#warningText {
-  margin: 1em 0;
-}
-
-#warningButton {
-  margin-top: 0.6em;
-}
-
-#filterRow {
-  margin-top: 4px;
-  -moz-margin-start: 4px;
-}
-
-#configTree {
-  margin-top: 4px;
-  margin-bottom: 4px;
-}
-
-#configTreeBody::-moz-tree-cell-text(user) {
-  font-weight: bold;
-}
-
-#configTreeBody::-moz-tree-cell-text(locked) {
-  font-style: italic;
-}
diff --git a/toolkit/themes/shared/in-content/common.inc.css b/toolkit/themes/shared/in-content/common.inc.css
index fd93a0661e70..f9c93037d9e6 100644
--- a/toolkit/themes/shared/in-content/common.inc.css
+++ b/toolkit/themes/shared/in-content/common.inc.css
@@ -7,8 +7,7 @@
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
 html|body,
-xul|page,
-xul|window {
+xul|page {
   font: message-box;
   -moz-appearance: none;
   background-color: #fbfbfb;
diff --git a/toolkit/themes/shared/incontent-icons/warning.svg b/toolkit/themes/shared/incontent-icons/warning.svg
deleted file mode 100644
index 00829703ceae..000000000000
--- a/toolkit/themes/shared/incontent-icons/warning.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" viewBox="0 0 60 60" enable-background="new 0 0 60 60">
-  <linearGradient id="gradient" gradientUnits="userSpaceOnUse" x1="30" y1="10" x2="30" y2="50">
-    <stop offset="0" style="stop-color: #fedb00"/>
-    <stop offset="1" style="stop-color: #fcce00"/>
-  </linearGradient>
-  <path fill="url(#gradient)" d="M49.316,42.867L33.829,12.7c-0.879-1.715-2.274-2.7-3.828-2.7c-1.554,0-2.949,0.985-3.829,2.702
-    L10.685,42.864c-0.869,1.69-0.913,3.482-0.121,4.909C11.35,49.187,12.817,50,14.591,50h30.82c1.772,0,3.24-0.81,4.023-2.224
-    C50.227,46.349,50.185,44.56,49.316,42.867z M32.176,22.304l-0.48,14.304h-3.424L27.76,22.304H32.176z M30,44.896
-    c-1.44,0-2.592-1.184-2.592-2.592c0-1.44,1.152-2.592,2.592-2.592c1.472,0,2.592,1.152,2.592,2.592
-    C32.592,43.712,31.472,44.896,30,44.896z"/>
-</svg>
\ No newline at end of file
diff --git a/toolkit/themes/windows/global/config.css b/toolkit/themes/windows/global/config.css
new file mode 100644
index 000000000000..98ce6abaabf3
--- /dev/null
+++ b/toolkit/themes/windows/global/config.css
@@ -0,0 +1,84 @@
+/* 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/. */
+
+
+@import url("chrome://global/skin/");
+@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;
+}
+
+#warningButton
+{
+  margin-top: 0.6em;
+}
+
+#showWarningNextTime
+{
+  margin-top: 0.6em;
+}
+
+#exclam
+{
+%ifdef MOZ_WIDGET_GTK
+  list-style-image: url("moz-icon://stock/gtk-dialog-warning?size=dialog");
+%else
+  list-style-image: url("chrome://global/skin/icons/warning-large.png");
+%endif
+  -moz-margin-end: 3em;
+}
+
+#configTreeBody::-moz-tree-cell-text(user)
+{
+  font-weight: bold;
+}
+
+#configTreeBody::-moz-tree-cell-text(locked)
+{
+  font-style: italic;
+}
+
+#configTree 
+{  
+  margin-top: 5px;
+  margin-bottom: 5px;
+}
+
+#filterRow
+{
+  margin-top: 5px;
+}
diff --git a/toolkit/themes/windows/global/jar.mn b/toolkit/themes/windows/global/jar.mn
index 0e6f2c5cdd41..7008712fa7ee 100644
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -20,7 +20,7 @@ toolkit.jar:
         skin/classic/global/checkbox.css
         skin/classic/global/colorpicker.css
         skin/classic/global/commonDialog.css
-        skin/classic/global/config.css                           (../../shared/config.css)
+*       skin/classic/global/config.css
         skin/classic/global/customizeToolbar.css
         skin/classic/global/datetimepicker.css
         skin/classic/global/dialog.css
@@ -73,7 +73,7 @@ toolkit.jar:
         skin/classic/global/arrow/arrow-lft-hov.gif              (arrow/arrow-lft.gif)
         skin/classic/global/arrow/arrow-lft-sharp.gif            (arrow/arrow-lft-sharp.gif)
         skin/classic/global/arrow/arrow-lft-sharp-end.gif        (arrow/arrow-lft-sharp-end.gif)
-        skin/classic/global/arrow/arrow-rit.gif                  (arrow/arrow-rit.gif)
+        skin/classic/global/arrow/arrow-rit.gif                  (arrow/arrow-rit.gif) 
         skin/classic/global/arrow/arrow-rit-dis.gif              (arrow/arrow-rit-dis.gif)
         skin/classic/global/arrow/arrow-rit-hov.gif              (arrow/arrow-rit.gif)
         skin/classic/global/arrow/arrow-rit-sharp.gif            (arrow/arrow-rit-sharp.gif)
@@ -141,7 +141,6 @@ toolkit.jar:
         skin/classic/global/icons/sslWarning.png                 (icons/sslWarning.png)
         skin/classic/global/icons/tabprompts-bgtexture.png       (icons/tabprompts-bgtexture.png)
         skin/classic/global/icons/Warning.png                    (icons/Warning.png)
-        skin/classic/global/icons/warning.svg                    (../../shared/incontent-icons/warning.svg)
         skin/classic/global/icons/warning-large.png              (icons/warning-large.png)
         skin/classic/global/icons/warning-16.png                 (icons/warning-16.png)
         skin/classic/global/icons/warning-24.png                 (icons/warning-24.png)
@@ -219,7 +218,7 @@ toolkit.jar:
         skin/classic/aero/global/checkbox.css
         skin/classic/aero/global/colorpicker.css
         skin/classic/aero/global/commonDialog.css
-        skin/classic/aero/global/config.css                              (../../shared/config.css)
+*       skin/classic/aero/global/config.css
         skin/classic/aero/global/customizeToolbar.css
         skin/classic/aero/global/datetimepicker.css
         skin/classic/aero/global/dialog.css
@@ -272,7 +271,7 @@ toolkit.jar:
         skin/classic/aero/global/arrow/arrow-lft-hov.gif                 (arrow/arrow-lft.gif)
         skin/classic/aero/global/arrow/arrow-lft-sharp.gif               (arrow/arrow-lft-sharp.gif)
         skin/classic/aero/global/arrow/arrow-lft-sharp-end.gif           (arrow/arrow-lft-sharp-end.gif)
-        skin/classic/aero/global/arrow/arrow-rit.gif                     (arrow/arrow-rit.gif)
+        skin/classic/aero/global/arrow/arrow-rit.gif                     (arrow/arrow-rit.gif) 
         skin/classic/aero/global/arrow/arrow-rit-dis.gif                 (arrow/arrow-rit-dis.gif)
         skin/classic/aero/global/arrow/arrow-rit-hov.gif                 (arrow/arrow-rit.gif)
         skin/classic/aero/global/arrow/arrow-rit-sharp.gif               (arrow/arrow-rit-sharp.gif)
@@ -336,7 +335,6 @@ toolkit.jar:
         skin/classic/aero/global/icons/Search-glass.png                  (icons/Search-glass-aero.png)
         skin/classic/aero/global/icons/sslWarning.png                    (icons/sslWarning-aero.png)
         skin/classic/aero/global/icons/tabprompts-bgtexture.png          (icons/tabprompts-bgtexture.png)
-        skin/classic/aero/global/icons/warning.svg                       (../../shared/incontent-icons/warning.svg)
         skin/classic/aero/global/icons/Warning.png                       (icons/Warning-aero.png)
         skin/classic/aero/global/icons/warning-large.png                 (icons/warning-large-aero.png)
         skin/classic/aero/global/icons/warning-16.png                    (icons/warning-16-aero.png)