Add platform-specific css files for windows and mac,
bug 390881. A joint production of zach and ben.
--- a/testing/extensions/community/build.xml
+++ b/testing/extensions/community/build.xml
@@ -14,16 +14,17 @@ build.xml adapted from Shawn Wilsher's r
<target name="createxpi" depends="createjar">
<zip destfile="qa.xpi">
<zipfileset dir="" includes="chrome/qa.jar"/>
<zipfileset dir="" includes="chatzilla.jar"/>
<zipfileset dir="" includes="install.rdf"/>
<zipfileset dir="" includes="jar-chrome.manifest" fullpath="chrome.manifest"/>
<zipfileset dir="" includes="README" />
<zipfileset dir="" includes="defaults/**" excludes="**CVS"/>
+ <zipfileset dir="" includes="platform/**" excludes="**CVS"/>
<zipfileset dir="" includes="components/chatzilla-service.js" />
</zip>
</target>
<target name="createjar">
<zip destfile="chrome/qa.jar">
<zipfileset dir="chrome" includes="content/**" excludes="**CVS"/>
<zipfileset dir="chrome" includes="skin/**" excludes="**CVS"/>
<zipfileset dir="chrome" includes="locale/**" excludes="**CVS"/>
--- a/testing/extensions/community/chrome/content/qa.xul
+++ b/testing/extensions/community/chrome/content/qa.xul
@@ -32,16 +32,17 @@
# and other provisions required by the LGPL or the GPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK ***** -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://qa/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://qa/skin/platform.css" type="text/css"?>
<!DOCTYPE window [
<!ENTITY % qaDTD SYSTEM "chrome://qa/locale/qa.dtd"> %qaDTD;
]>
<?xul-overlay href="chrome://qa/content/tabs/litmus.xul"?>
<?xul-overlay href="chrome://qa/content/tabs/settings.xul"?>
<?xul-overlay href="chrome://qa/content/tabs/qmo.xul"?>
@@ -53,33 +54,28 @@
id="qa-mainwindow"
title="&qa.mainwindow.title;"
width="400"
height="720"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
onload="qaMain.onToolOpen();">
-<style xmlns="http://www.w3.org/1999/xhtml">
-@import url(chrome://qa/skin/);
-</style>
-
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_qa" src="chrome://qa/locale/qa.properties" />
<stringbundle id="bundle_urls" src="chrome://qa/locale/urls.properties" />
</stringbundleset>
<script type="application/x-javascript" src="chrome://qa/content/MochiKit/MochiKit.js" />
<script type="application/x-javascript" src="chrome://qa/content/litmusReporter.js" />
<script type="application/x-javascript" src="chrome://qa/content/prefs.js" />
<script type="application/x-javascript" src="chrome://qa/content/common.js" />
<script type="application/x-javascript" src="chrome://qa/content/litmus.js" />
<script type="application/x-javascript" src="chrome://qa/content/qa.js" />
-
<tabbox id="qa_tabbox">
<tabs id="qa_tabrow">
<tab image="chrome://qa/skin/qmo.png" />
<tab label="&qa.litmus.title;" />
<tab label="&qa.bugzilla.title;" />
<tab label="&qa.chat.title;" />
<spacer width="30" />
<tab label="&qa.preferences.title;" id="qa-tabbar-prefs" />
--- a/testing/extensions/community/chrome/content/tabs/bugzilla.xul
+++ b/testing/extensions/community/chrome/content/tabs/bugzilla.xul
@@ -30,18 +30,16 @@
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the LGPL or the GPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK ***** -->
-<?xml-stylesheet href="chrome://qa/skin/" type="text/css"?>
-
<!DOCTYPE overlay [
<!ENTITY % qaDTD SYSTEM "chrome://qa/locale/qa.dtd"> %qaDTD;
]>
<overlay id="qa-bz-overlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml">
--- a/testing/extensions/community/chrome/content/tabs/chat.xul
+++ b/testing/extensions/community/chrome/content/tabs/chat.xul
@@ -30,18 +30,16 @@
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the LGPL or the GPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK ***** -->
-<?xml-stylesheet href="chrome://qa/skin/" type="text/css"?>
-
<!DOCTYPE overlay [
<!ENTITY % qaDTD SYSTEM "chrome://qa/locale/qa.dtd"> %qaDTD;
]>
<overlay id="qa-qmo-overlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml">
--- a/testing/extensions/community/chrome/content/tabs/help.xul
+++ b/testing/extensions/community/chrome/content/tabs/help.xul
@@ -30,18 +30,16 @@
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the LGPL or the GPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK ***** -->
-<?xml-stylesheet href="chrome://qa/skin/" type="text/css"?>
-
<!DOCTYPE overlay [
<!ENTITY % qaDTD SYSTEM "chrome://qa/locale/qa.dtd"> %qaDTD;
]>
<overlay id="qa-help-overlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml">
--- a/testing/extensions/community/chrome/content/tabs/qmo.xul
+++ b/testing/extensions/community/chrome/content/tabs/qmo.xul
@@ -30,18 +30,16 @@
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the LGPL or the GPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK ***** -->
-<?xml-stylesheet href="chrome://qa/skin/" type="text/css"?>
-
<!DOCTYPE overlay [
<!ENTITY % qaDTD SYSTEM "chrome://qa/locale/qa.dtd"> %qaDTD;
]>
<overlay id="qa-qmo-overlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml">
--- a/testing/extensions/community/chrome/content/tabs/settings.xul
+++ b/testing/extensions/community/chrome/content/tabs/settings.xul
@@ -30,18 +30,16 @@
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the LGPL or the GPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK ***** -->
-<?xml-stylesheet href="chrome://qa/skin/" type="text/css"?>
-
<!DOCTYPE overlay [
<!ENTITY % qaDTD SYSTEM "chrome://qa/locale/qa.dtd"> %qaDTD;
]>
<overlay id="qa-settings-overlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/x-javascript" src="chrome://qa/content/settings.js" />
--- a/testing/extensions/community/chrome/skin/qa.css
+++ b/testing/extensions/community/chrome/skin/qa.css
@@ -53,23 +53,22 @@ tab {
PANELS
-------------------------------*/
tabpanel {
color: #5F6775;
line-height: 1.6;
}
groupbox {
border-color: #e0e0e0;
- background-color: #fff;
padding: 6px 8px;
}
caption {
font: bold 12px helvetica, arial, sans-serif;
color: #ec891d;
- background: white none repeat-x left 6px;
+ background: transparent none repeat-x left 6px;
padding: 0;
}
/*-------------------------------
NOTIFY
-------------------------------*/
@@ -101,19 +100,22 @@ caption {
/*-------------------------------
GENERAL
-------------------------------*/
.list {
padding-left: 10px;
-}
+}
+
+#qa-tab-qmo > html|li {
+ list-style-type: none;
+}
-/* @group test overview */
#qa-litmus-testoverview {
text-decoration: underline;
font-size: x-small;
}
.testoverview-previous {
background-color: #d8d8d8;
}
.testoverview-next {
--- a/testing/extensions/community/install.rdf
+++ b/testing/extensions/community/install.rdf
@@ -1,28 +1,20 @@
<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
- <Description about="urn:mozilla:install-manifest">
- <em:id>{667e9f3d-0096-4d2b-b171-9a96afbabe20}</em:id>
- <em:version>0.0.3</em:version>
- <em:type>2</em:type>
-
- <!-- Target Application this extension can install into,
- with minimum and maximum supported versions. -->
- <em:targetApplication>
- <Description>
- <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
- <em:minVersion>2.0</em:minVersion>
- <em:maxVersion>3.0a8</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- <!-- Front End MetaData -->
- <em:name>Mozilla Quality Extension</em:name>
- <em:description>The QA tool</em:description>
- <em:creator>Mozilla Quality Assurance</em:creator>
- <em:homepageURL>http://quality.mozilla.org/</em:homepageURL>
- <em:updateURL>https://landfill.bugzilla.org/mozillaQA/update.rdf</em:updateURL>
- </Description>
-</RDF>
\ No newline at end of file
+<RDF:RDF xmlns:em="http://www.mozilla.org/2004/em-rdf#"
+ xmlns:NC="http://home.netscape.com/NC-rdf#"
+ xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <RDF:Description RDF:about="rdf:#$QJqvE"
+ em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
+ em:minVersion="2.0"
+ em:maxVersion="3.0a9" />
+ <RDF:Description RDF:about="urn:mozilla:install-manifest"
+ em:id="{667e9f3d-0096-4d2b-b171-9a96afbabe20}"
+ em:version="0.1.0"
+ em:type="2"
+ em:name="Mozilla Quality Extension"
+ em:description="The QA tool"
+ em:creator="Mozilla Quality Assurance"
+ em:homepageURL="http://quality.mozilla.org/"
+ em:updateURL="https://landfill.bugzilla.org/mozillaQA/update.rdf">
+ <em:targetApplication RDF:resource="rdf:#$QJqvE"/>
+ </RDF:Description>
+</RDF:RDF>
new file mode 100644
--- /dev/null
+++ b/testing/extensions/community/platform/Darwin/chrome.manifest
@@ -0,0 +1,2 @@
+skin qa-mac classic/1.0 chrome/skin/
+override chrome://qa/skin/platform.css chrome/skin/platform.css
\ No newline at end of file
new file mode 100644
--- /dev/null
+++ b/testing/extensions/community/platform/WINNT/chrome.manifest
@@ -0,0 +1,2 @@
+skin qa-win classic/1.0 chrome/skin/
+override chrome://qa/skin/platform.css chrome/skin/platform.css
\ No newline at end of file