diff --git a/themes/modern/communicator/sidebar/customize.css b/themes/modern/communicator/sidebar/customize.css
index 8d5ba3226efd..38b064e11662 100644
--- a/themes/modern/communicator/sidebar/customize.css
+++ b/themes/modern/communicator/sidebar/customize.css
@@ -70,14 +70,10 @@ treeitem[selected="true"][container="true"][open="true"] > treerow > .treecell-p
list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open-sel.gif");
}
-box#header {
+#header {
list-style-image: url("chrome://communicator/skin/sidebar/sidebar-icon.gif");
}
-box#header > toolbar > .circle {
- padding-top: 2px;
-}
-
box#reorder {
text-align: center;
}
diff --git a/themes/modern/messenger/MANIFEST b/themes/modern/messenger/MANIFEST
index 1ea8c8cd32d3..ffb3c07d1c0b 100644
--- a/themes/modern/messenger/MANIFEST
+++ b/themes/modern/messenger/MANIFEST
@@ -95,3 +95,4 @@ winclassic.gif
wink.gif
winwide.gif
wizard.css
+importDialog.css
diff --git a/themes/modern/messenger/Makefile.in b/themes/modern/messenger/Makefile.in
index 6d6253308399..ce5dda2a082f 100644
--- a/themes/modern/messenger/Makefile.in
+++ b/themes/modern/messenger/Makefile.in
@@ -128,6 +128,7 @@ EXPORT_RESOURCE_SAMPLES = \
wink.gif \
winwide.gif \
wizard.css \
+ importDialog.css \
$(NULL)
DIRS = addressbook messengercompose
diff --git a/themes/modern/messenger/importDialog.css b/themes/modern/messenger/importDialog.css
new file mode 100644
index 000000000000..638e3d44ea92
--- /dev/null
+++ b/themes/modern/messenger/importDialog.css
@@ -0,0 +1,24 @@
+/*
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ */
+
+
diff --git a/themes/modern/messenger/mailWidgets.xml b/themes/modern/messenger/mailWidgets.xml
index f7f147202bae..d91f00f1dc00 100644
--- a/themes/modern/messenger/mailWidgets.xml
+++ b/themes/modern/messenger/mailWidgets.xml
@@ -26,11 +26,9 @@
var targets = this.targets;
if (targets) {
for (var i=0; i< targets.length; i++) {
- dump("searchScopeSet: targets[" + i + "] = " + targets[i] + "\n")
targets[i].searchScope = val;
}
}
- dump("done\n");
]]>
@@ -67,16 +65,25 @@
for (var i=0; i
+
+
+
+
+
+
+
\n");
var menuItemIds = this.valueIds;
var menuItemStrings = this.valueStrings;
@@ -113,15 +120,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/themes/modern/messenger/makefile.win b/themes/modern/messenger/makefile.win
index 9703f20e85dc..9b7cd195d658 100644
--- a/themes/modern/messenger/makefile.win
+++ b/themes/modern/messenger/makefile.win
@@ -128,3 +128,4 @@ install::
$(MAKE_INSTALL) wink.gif $(DIST)\bin\chrome\$(THEME)\messenger\skin
$(MAKE_INSTALL) winwide.gif $(DIST)\bin\chrome\$(THEME)\messenger\skin
$(MAKE_INSTALL) wizard.css $(DIST)\bin\chrome\$(THEME)\messenger\skin
+ $(MAKE_INSTALL) importDialog.css $(DIST)\bin\chrome\$(THEME)\messenger\skin
diff --git a/themes/modern/messenger/messenger.css b/themes/modern/messenger/messenger.css
index 2be3a134c0cc..e3ed04c4f08a 100644
--- a/themes/modern/messenger/messenger.css
+++ b/themes/modern/messenger/messenger.css
@@ -313,3 +313,7 @@ searchoperator {
searchvalue {
behavior: url(chrome://messenger/skin/mailWidgets.xml#searchvalue);
}
+
+searchterm {
+ behavior: url(chrome://messenger/skin/mailWidgets.xml#searchterm);
+}
\ No newline at end of file
diff --git a/themes/modern/navigator/navigator.css b/themes/modern/navigator/navigator.css
index 9ea85196bb92..e453655f8b40 100644
--- a/themes/modern/navigator/navigator.css
+++ b/themes/modern/navigator/navigator.css
@@ -67,7 +67,7 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
}
-#sessionhist-popup
+#ubhist-keyword-popup
{
margin : 0px 4px 0px 0px;
width : 10px;