diff --git a/themes/README b/themes/README index c1866696f92..b86712714d6 100644 --- a/themes/README +++ b/themes/README @@ -1,2 +1 @@ -foo bar cheese burger. -sspitzer +questions to pixeljockeys@netscape.com diff --git a/themes/modern/README b/themes/modern/README index 6f5fadba24e..e69de29bb2d 100644 --- a/themes/modern/README +++ b/themes/modern/README @@ -1,2 +0,0 @@ -foobar, coming soon. -hangas, hyatt, sspitzer, alecf diff --git a/themes/modern/communicator/bookmarks/bookmarks.css b/themes/modern/communicator/bookmarks/bookmarks.css index 78e3a16bb24..a760534116f 100644 --- a/themes/modern/communicator/bookmarks/bookmarks.css +++ b/themes/modern/communicator/bookmarks/bookmarks.css @@ -51,96 +51,96 @@ } -treeitem[container="true"][open="true"][loading="true"] > treerow > treecell > .tree-icon +treeitem[container="true"][open="true"][loading="true"] > treerow > .treecell-bookmark { list-style-image: url("resource:/res/rdf/loading.gif") ! important ; } -treeitem[status="new"] > treerow > treecell > .tree-icon +treeitem[status="new"] > treerow > .treecell-bookmark { list-style-image: url("resource:/res/rdf/loading.gif") ! important ; } -treeitem[type="http://home.netscape.com/NC-rdf#Folder"] > treerow > treecell > .tree-icon, -treeitem[type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"] > treerow > treecell > .tree-icon, -treeitem[container="true"][open="true"] > treerow > treecell > .tree-icon +treeitem[type="http://home.netscape.com/NC-rdf#Folder"] > treerow > .treecell-bookmark, +treeitem[type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"] > treerow > .treecell-bookmark, +treeitem[container="true"][open="true"] > treerow > .treecell-bookmark { list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif"); } -treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"] > treerow > treecell > .tree-icon, -treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"] > treerow > treecell > .tree-icon, -treeitem[selected="true"][container="true"][open="true"] > treerow > treecell > .tree-icon +treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"] > treerow > .treecell-bookmark, +treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"] > treerow > .treecell-bookmark, +treeitem[selected="true"][container="true"][open="true"] > treerow > .treecell-bookmark { list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed-sel.gif"); } -treeitem[type="http://home.netscape.com/NC-rdf#Folder"][open="true"] > treerow > treecell > .tree-icon -treeitem[type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"][open="true"] > treerow > treecell > .tree-icon +treeitem[type="http://home.netscape.com/NC-rdf#Folder"][open="true"] > treerow > .treecell-bookmark +treeitem[type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"][open="true"] > treerow > .treecell-bookmark { list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif"); } -treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"][open="true"] > treerow > treecell > .tree-icon, -treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"][open="true"] > treerow > treecell > .tree-icon +treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"][open="true"] > treerow > .treecell-bookmark, +treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"][open="true"] > treerow > .treecell-bookmark { list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open-sel.gif"); } -treeitem[container="true"][open="true"] > treerow > treecell > .tree-icon { +treeitem[container="true"][open="true"] > treerow > .treecell-bookmark { list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif"); } -treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"] > treerow > treecell > .tree-icon +treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"] > treerow > .treecell-bookmark { list-style-image: url("chrome://communicator/skin/bookmarks/personal-folder-closed.gif"); } -treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"] > treerow > treecell > .tree-icon +treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"] > treerow > .treecell-bookmark { list-style-image: url("chrome://communicator/skin/bookmarks/personal-folder-closed-sel.gif"); } -treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"][open="true"] > > treerow > treecell > .tree-icon +treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"][open="true"] > > treerow > .treecell-bookmark { list-style-image: url("chrome://communicator/skin/bookmarks/personal-folder-open.gif"); } -treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"][open="true"] > > treerow > treecell > .tree-icon +treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"][open="true"] > > treerow > .treecell-bookmark { list-style-image: url("chrome://communicator/skin/bookmarks/personal-folder-open-sel.gif"); } -treeitem[type="http://home.netscape.com/NC-rdf#BookmarkSeparator"] > treerow > treecell > .tree-icon +treeitem[type="http://home.netscape.com/NC-rdf#BookmarkSeparator"] > treerow > .treecell-bookmark { list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); } -treeitem[type="http://home.netscape.com/NC-rdf#IEFavorite"] > treerow > treecell > .tree-icon +treeitem[type="http://home.netscape.com/NC-rdf#IEFavorite"] > treerow > .treecell-bookmark { list-style-image: url("chrome://communicator/skin/bookmarks/iefavorite.gif"); } -treeitem[type="http://home.netscape.com/NC-rdf#Bookmark"] > treerow > treecell > .tree-icon +treeitem[type="http://home.netscape.com/NC-rdf#Bookmark"] > treerow > .treecell-bookmark { list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); } -treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"][container="true"][open="true"] > treerow > treecell > .tree-icon +treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"][container="true"][open="true"] > treerow > .treecell-bookmark { list-style-image: url("resource:/res/rdf/folder-open.gif"); } -treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"][container="true"] > treerow > treecell > .tree-icon +treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"][container="true"] > treerow > .treecell-bookmark { list-style-image: url("resource:/res/rdf/folder-closed.gif"); } -treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"] > treerow > treecell > .tree-icon +treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"] > treerow > .treecell-bookmark { list-style-image: url("resource:/res/rdf/article.gif"); } -treeitem > treerow > treecell > .tree-icon { +treeitem > treerow > .treecell-bookmark { list-style-image:url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); } diff --git a/themes/modern/communicator/related/related.css b/themes/modern/communicator/related/related.css index 37e4460db69..e59022d3fc9 100644 --- a/themes/modern/communicator/related/related.css +++ b/themes/modern/communicator/related/related.css @@ -28,32 +28,17 @@ @import url(chrome://global/skin/global.css); -treeitem[container="true"][open="true"][loading="true"] > treerow > treecell > .tree-icon +treeitem[container="true"][open="true"] > treerow > .tree-icon { - list-style-image: url("resource:/res/rdf/loading.gif") ! important ; -} - -treeitem[container="true"][open="true"] > treerow > treecell > .tree-icon { list-style-image: url("resource:/res/rdf/folder-open.gif"); } -treeitem[container="true"] > treerow > treecell > .tree-icon { +treeitem[container="true"] > treerow > .tree-icon +{ list-style-image: url("resource:/res/rdf/folder-closed.gif"); } -treeitem[container="true"][id="NC:SiteMapRoot"] > treerow > treecell > .tree-icon { - list-style-image: url("chrome://communicator/skin/related/sitemap.gif"); -} - -treeitem[container="true"][open="true"][id="NC:SiteMapRoot"] > treerow > treecell > .tree-icon { - list-style-image: url("chrome://communicator/skin/related/sitemap.gif"); -} - -treeitem > treerow > treecell > .tree-icon { +.tree-icon +{ list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); } - -treeitem > treerow > treecell > .tree-icon > .twisty { - display: none; -} - diff --git a/themes/modern/communicator/sidebar/MANIFEST b/themes/modern/communicator/sidebar/MANIFEST index 6b85b839e46..17b701b6840 100644 --- a/themes/modern/communicator/sidebar/MANIFEST +++ b/themes/modern/communicator/sidebar/MANIFEST @@ -10,3 +10,11 @@ sidebar-icon.gif sidebar-topright-cap.gif sidebar.css sidebarOverlay.css +sbgrippy-left-hover.gif +sbgrippy-left.gif +sbgrippy-right-hover.gif +sbgrippy-right.gif +sidebar-close-hover.gif +sidebar-close.gif +sidebar-open-hover.gif +sidebar-open.gif diff --git a/themes/modern/communicator/sidebar/Makefile.in b/themes/modern/communicator/sidebar/Makefile.in index 66d41084f51..c474825c791 100644 --- a/themes/modern/communicator/sidebar/Makefile.in +++ b/themes/modern/communicator/sidebar/Makefile.in @@ -42,7 +42,15 @@ EXPORT_RESOURCE_SAMPLES = \ list-down.gif \ sidebar-bottomright-cap.gif \ sidebarOverlay.css \ - $(NULL) + sbgrippy-left-hover.gif \ + sbgrippy-left.gif \ + sbgrippy-right-hover.gif \ + sbgrippy-right.gif \ + sidebar-close-hover.gif \ + sidebar-close.gif \ + sidebar-open-hover.gif \ + sidebar-open.gif \ + $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/themes/modern/communicator/sidebar/customize.css b/themes/modern/communicator/sidebar/customize.css index 38b064e1166..706b0c22c78 100644 --- a/themes/modern/communicator/sidebar/customize.css +++ b/themes/modern/communicator/sidebar/customize.css @@ -77,7 +77,3 @@ treeitem[selected="true"][container="true"][open="true"] > treerow > .treecell-p box#reorder { text-align: center; } -box#saveCancelButtons { - margin-bottom: 0.5em; - text-align: center; -} diff --git a/themes/modern/communicator/sidebar/makefile.win b/themes/modern/communicator/sidebar/makefile.win index 4b11b2237e9..733f69c3d3d 100644 --- a/themes/modern/communicator/sidebar/makefile.win +++ b/themes/modern/communicator/sidebar/makefile.win @@ -40,3 +40,12 @@ install:: $(MAKE_INSTALL) sidebar-topright-cap.gif $(DIST)\bin\chrome\$(THEME)\communicator\skin\sidebar $(MAKE_INSTALL) sidebar.css $(DIST)\bin\chrome\$(THEME)\communicator\skin\sidebar $(MAKE_INSTALL) sidebarOverlay.css $(DIST)\bin\chrome\$(THEME)\communicator\skin\sidebar + $(MAKE_INSTALL) sbgrippy-left-hover.gif $(DIST)\bin\chrome\$(THEME)\communicator\skin\sidebar + $(MAKE_INSTALL) sbgrippy-left.gif $(DIST)\bin\chrome\$(THEME)\communicator\skin\sidebar + $(MAKE_INSTALL) sbgrippy-right-hover.gif $(DIST)\bin\chrome\$(THEME)\communicator\skin\sidebar + $(MAKE_INSTALL) sbgrippy-right.gif $(DIST)\bin\chrome\$(THEME)\communicator\skin\sidebar + $(MAKE_INSTALL) sidebar-close-hover.gif $(DIST)\bin\chrome\$(THEME)\communicator\skin\sidebar + $(MAKE_INSTALL) sidebar-close.gif $(DIST)\bin\chrome\$(THEME)\communicator\skin\sidebar + $(MAKE_INSTALL) sidebar-open-hover.gif $(DIST)\bin\chrome\$(THEME)\communicator\skin\sidebar + $(MAKE_INSTALL) sidebar-open.gif $(DIST)\bin\chrome\$(THEME)\communicator\skin\sidebar + diff --git a/themes/modern/communicator/sidebar/preview.css b/themes/modern/communicator/sidebar/preview.css index 09fdfeb2b5e..d31dec3302b 100644 --- a/themes/modern/communicator/sidebar/preview.css +++ b/themes/modern/communicator/sidebar/preview.css @@ -21,14 +21,16 @@ */ /* - Style rules specific to the Preview dialog. - */ iframe#previewframe { min-width: 10px; min-height: 10px; width: 162px; - height: 200px; + height: 300px; + border: none; + margin: 0px; } + + diff --git a/themes/modern/communicator/sidebar/sbgrippy-left-hover.gif b/themes/modern/communicator/sidebar/sbgrippy-left-hover.gif new file mode 100644 index 00000000000..605f4b39267 Binary files /dev/null and b/themes/modern/communicator/sidebar/sbgrippy-left-hover.gif differ diff --git a/themes/modern/communicator/sidebar/sbgrippy-left.gif b/themes/modern/communicator/sidebar/sbgrippy-left.gif new file mode 100644 index 00000000000..454be4d948c Binary files /dev/null and b/themes/modern/communicator/sidebar/sbgrippy-left.gif differ diff --git a/themes/modern/communicator/sidebar/sbgrippy-right-hover.gif b/themes/modern/communicator/sidebar/sbgrippy-right-hover.gif new file mode 100644 index 00000000000..3be95ae76c8 Binary files /dev/null and b/themes/modern/communicator/sidebar/sbgrippy-right-hover.gif differ diff --git a/themes/modern/communicator/sidebar/sbgrippy-right.gif b/themes/modern/communicator/sidebar/sbgrippy-right.gif new file mode 100644 index 00000000000..3f910b84113 Binary files /dev/null and b/themes/modern/communicator/sidebar/sbgrippy-right.gif differ diff --git a/themes/modern/communicator/sidebar/sidebar-close-hover.gif b/themes/modern/communicator/sidebar/sidebar-close-hover.gif new file mode 100644 index 00000000000..e69de29bb2d diff --git a/themes/modern/communicator/sidebar/sidebar-close.gif b/themes/modern/communicator/sidebar/sidebar-close.gif new file mode 100644 index 00000000000..e69de29bb2d diff --git a/themes/modern/communicator/sidebar/sidebar-open-hover.gif b/themes/modern/communicator/sidebar/sidebar-open-hover.gif new file mode 100644 index 00000000000..e69de29bb2d diff --git a/themes/modern/communicator/sidebar/sidebar-open.gif b/themes/modern/communicator/sidebar/sidebar-open.gif new file mode 100644 index 00000000000..e69de29bb2d diff --git a/themes/modern/communicator/sidebar/sidebarOverlay.css b/themes/modern/communicator/sidebar/sidebarOverlay.css index 75283e8a0a1..aaa540e2f63 100644 --- a/themes/modern/communicator/sidebar/sidebarOverlay.css +++ b/themes/modern/communicator/sidebar/sidebarOverlay.css @@ -19,135 +19,178 @@ * Contributor(s): Stephen Lamm */ -splitter#sidebar-splitter { - margin-right: 2px; - margin-top: 2px; - padding: 0px; - border: none; - background-color: #003366; +#sidebar-splitter { + margin-right: 1px; + margin-top: 1px; + padding: 0px; + border: none; + background-color: #003366; } -splitter#sidebar-splitter #bottomright-cap { - min-height: 8px; - background-image: url("chrome://communicator/skin/sidebar/sidebar-bottomright-cap.gif"); - background-repeat: no-repeat; - background-position: 100% 100%; +#sidebar-topright-cap { + min-height: 8px; + background-repeat: no-repeat; + background-position: 100% 0%; + background-image: + url("chrome://communicator/skin/sidebar/sidebar-topright-cap.gif"); } -splitter#sidebar-splitter #topright-cap { - min-height: 8px; - background-image: url("chrome://communicator/skin/sidebar/sidebar-topright-cap.gif"); - background-repeat: no-repeat; - background-position: 100% 0%; +#sidebar-bottomright-cap { + min-height: 8px; + background-repeat: no-repeat; + background-position: 100% 100%; + background-image: + url("chrome://communicator/skin/sidebar/sidebar-bottomright-cap.gif"); } -splitter#sidebar-splitter grippy { - margin: 0px; - border: 2px solid #003366; - padding: 0px; - background-color: #6699CC; - list-style-image: none; +splitter#sidebar-splitter > grippy { + margin: 0px; + padding: 0px; + border: 2px solid #003366; + background-color: #6699CC; + background-image: + url("chrome://communicator/skin/sidebar/sbgrippy-left.gif"); + background-repeat: no-repeat; + background-position: 50% 50%; } -splitter#sidebar-splitter grippy:hover { - background-color: #99CCFF; +splitter#sidebar-splitter > grippy:hover, +splitter#sidebar-splitter > grippy:active { + background-color: #99CCFF; + background-image: + url("chrome://communicator/skin/sidebar/sbgrippy-left-hover.gif"); } -splitter#sidebar-splitter grippy:active { - background-color: #99CCFF; +splitter#sidebar-splitter[collapsed="true"] > grippy { + background-image: + url("chrome://communicator/skin/sidebar/sbgrippy-right.gif"); +} + +splitter#sidebar-splitter[collapsed="true"] > grippy:hover, +splitter#sidebar-splitter[collapsed="true"] > grippy:active { + background-image: + url("chrome://communicator/skin/sidebar/sbgrippy-right-hover.gif"); +} + +image#sidebar-status-grippy { + padding: 2px 2px 2px 0px; + background-color: #003366; + background-image: + url("chrome://communicator/skin/sidebar/sidebar-open.gif"); +} +image#sidebar-status-grippy:hover { + background-image: + url("chrome://communicator/skin/sidebar/sidebar-open-hover.gif"); +} +image#sidebar-status-grippy[open="true"] { + background-image: + url("chrome://communicator/skin/sidebar/sidebar-close.gif"); +} +image#sidebar-status-grippy[open="true"]:hover { + background-image: + url("chrome://communicator/skin/sidebar/sidebar-close-hover.gif"); } /**/ box#sidebar-box { - margin-top: 2px; - width: 162px; - min-height: 1px; - max-width: 400px; - border: none; - border-bottom: 8px solid #003366; + margin-top: 1px; + width: 162px; + min-height: 1px; + min-width: 30px; + max-width: 400px; + border: none; + border-bottom: 8px solid #003366; } box#sidebar-panels { - min-width: 1px; - min-height: 1px; + min-width: 1px; + min-height: 1px; + margin-top: 1px; +} + +text.loading-image { + margin: 5px 0px; +} + +image.loading-image { + margin: 5px; + list-style-image: url("resource:/res/rdf/loading.gif"); } iframe.panel-frame { - min-width: 1px; + min-width: 1px; } /* - * Sidebar and Panel title buttons + * Sidebar and Panel title buttons */ .sidebar-main-header { - color: #CCFFFF; - background-color: #003366; - padding: 0px; - padding-left: 5px; - padding-right: 5px; + color: #CCFFFF; + background-color: #003366; + border: 0px !important; + padding-left: 4px; + min-width: 1px; } - .sidebar-main-header > text { - font-weight: bold; - margin: 2px; + font-weight: bold; + margin: 2px; } -menu#panel-picker:hover { - background-color: #336699; +menu#sidebar-panel-picker:hover { + background-color: #336699; } - -menu#panel-picker > .menu-right { - list-style-image: url("chrome://global/skin/toolbar-menu-arrow.gif"); +menu#sidebar-panel-picker:hover { + background-color: #336699; +} +menu#sidebar-panel-picker > .menu-right { + list-style-image: url("chrome://global/skin/toolbar-menu-arrow.gif"); + padding-right: 2px; +} +menu#sidebar-panel-picker > .menu-text { + color: #CCFFFF; + padding-left: 4px; +} +menu#sidebar-panel-picker > .menu-accel { + display: none; } sidebarheader[type="box"] { - behavior: url(chrome://global/content/globalBindings.xml#sidebar-header-box); + behavior: url(chrome://global/content/globalBindings.xml#sidebar-header-box); } sidebarheader[type="splitter"] { - behavior: url(chrome://global/content/globalBindings.xml#sidebar-header-splitter); - /* a vertical splitter */ - cursor: n-resize; + behavior: url(chrome://global/content/globalBindings.xml#sidebar-header-splitter); + /* a vertical splitter */ + cursor: n-resize; } -box.texttab { - min-width: 10px; +box.texttab.sidebar-tab { + background-color: #CCCCCC; + padding: 0px; + margin: 0px; +} +box.texttab.sidebar-tab[top-panel="true"], +box.texttab.sidebar-tab[first-panel-after-selected="true"] { + background-color: white; } -box.texttab > .remain-space { - width: 30px; +box.texttab.sidebar-tab > .remain-space { + width: 30px; + min-width: 1px; } - -box#sidebar-panels > box.texttab:first-child { - background-color: white; +box.texttab.sidebar-tab[last-panel="true"] > .remain-space { + border-bottom: none; } - -box#sidebar-panels > box.texttab + box.texttab { - background-color: #CCCCCC; -} - - -box#sidebar-panels-bottom > box.texttab[hidden] + box.texttab { - background-color: white; -} - -box#sidebar-panels-bottom > box.texttab[hidden] + box.texttab + box.texttab { - background-color: #CCCCCC; -} - -box#sidebar-panels-bottom > box.texttab + box.texttab { - background-color: #CCCCCC; -} - -box#title-box { - min-width: 10px; +box.texttab.sidebar-tab[last-panel="true"][selected="true"] > .remain-space { + border-bottom: 1px solid black; } *[hidden="true"] { - display: none; + display: none; } *[collapsed="true"] { - visibility: collapse; + visibility: collapse; } + diff --git a/themes/modern/editor/EdImageMap.css b/themes/modern/editor/EdImageMap.css index 864912f5f80..5c4837c2d73 100644 --- a/themes/modern/editor/EdImageMap.css +++ b/themes/modern/editor/EdImageMap.css @@ -27,16 +27,16 @@ toolbar#toolbox { padding: 4px; 0px; 0px; 0px; } -toolbar#toolbox titledbutton.tool:active { - margin: 2px 0px 0px 2px; +toolbar#toolbox button.tool:active { + margin: 2px 0px 0px 2px; } -toolbar#toolbox titledbutton.tool[toggled="1"] { +toolbar#toolbox button.tool[toggled="1"] { margin: 2px 0px 0px 2px; border: 1px white inset; } -toolbar#toolbox titledbutton.tool { +toolbar#toolbox button.tool { border: 1px solid transparent; margin: 1px 1px 1px 1px; padding: 2px; @@ -44,42 +44,46 @@ toolbar#toolbox titledbutton.tool { color: inherit; } -toolbar#toolbox titledbutton#pointerButton { +toolbar.toolbox > toolbargrippy { + visibility: collapse; +} + +#pointerButton { list-style-image:url("chrome://editor/skin/images/Map_pointerTool.gif"); } -toolbar#toolbox titledbutton#rectButton { +#rectButton { list-style-image:url("chrome://editor/skin/images/Map_rectangleTool.gif"); } -toolbar#toolbox titledbutton#cirButton { +#cirButton { list-style-image:url("chrome://editor/skin/images/Map_circleTool.gif"); } -toolbar#toolbox titledbutton#polyButton { +#polyButton { list-style-image:url("chrome://editor/skin/images/Map_polygonTool.gif"); } -toolbar#toolbar titledbutton#cutButton { +#cutButton { list-style-image:url("chrome://editor/skin/images/Map_Cut.gif"); } -toolbar#toolbar titledbutton#copyButton { +#copyButton { list-style-image:url("chrome://editor/skin/images/Map_Copy.gif"); } -toolbar#toolbar titledbutton#pasteButton { +#pasteButton { list-style-image:url("chrome://editor/skin/images/Map_Paste.gif"); } -toolbar#toolbar titledbutton#zoomInButton { +#zoomInButton { list-style-image:url("chrome://editor/skin/images/Map_zoomIn.gif"); } -toolbar#toolbar titledbutton#zoomOutButton { +#zoomOutButton { list-style-image:url("chrome://editor/skin/images/Map_zoomOut.gif"); } -toolbar#toolbar titledbutton#contrastButton { +#contrastButton { list-style-image:url("chrome://editor/skin/images/Map_contrast.gif"); } diff --git a/themes/modern/global/tree.css b/themes/modern/global/tree.css index 08576bf9049..9b69b12ff52 100644 --- a/themes/modern/global/tree.css +++ b/themes/modern/global/tree.css @@ -93,10 +93,6 @@ treeitem[selected="true"] > treerow > treecell > .tree-cell-twisty { text-decoration: none; } -treeitem[empty="true"] > treerow > treecell > .tree-cell-twisty { - list-style-image: none !important; -} - .tree-cell-twisty[disabled="true"] { list-style-image: none; } diff --git a/themes/modern/messenger/addressbook/addressbook.css b/themes/modern/messenger/addressbook/addressbook.css index 7cc82fc9439..79e2d8ed8cc 100644 --- a/themes/modern/messenger/addressbook/addressbook.css +++ b/themes/modern/messenger/addressbook/addressbook.css @@ -26,7 +26,7 @@ Rights Reserved. /* CardView styles - used in the Card View Pane*/ #CardViewBox { - overflow: auto; +/* overflow: auto;*/ background-color: #EEEEEE; min-width: 150px; user-focus: ignore; @@ -128,31 +128,31 @@ tree[class="abResults"] treeitem > treerow > treecell.cardicon { visibility: collapse; } -#button_newcard { +#button-newcard { list-style-image:url("chrome://messenger/skin/addressbook/newcard.gif"); } -#button_newlist { +#button-newlist { list-style-image:url("chrome://messenger/skin/addressbook/newlist.gif"); } -#button_editcard { +#button-editcard { list-style-image:url("chrome://messenger/skin/addressbook/edit.gif"); } -#button_newmessage { +#button-newmessage { list-style-image:url("chrome://messenger/skin/addressbook/newmsgab.gif"); } -#button_delete { +#button-elete { list-style-image:url("chrome://messenger/skin/trash.gif"); } -#button_stop { +#button-stop { list-style-image:url("chrome://global/skin/stop.gif"); } -#button_search { +#button-search { list-style-image:url("chrome://global/skin/search.gif"); } @@ -170,3 +170,8 @@ tree[class="abResults"] treeitem > treerow > treecell.cardicon { padding: 0px; } +treeitem[empty="true"] > treerow > treecell > .tree-cell-twisty { + + list-style-image: none !important; + +} diff --git a/themes/modern/messenger/fieldMapImport.css b/themes/modern/messenger/fieldMapImport.css index 466615f66d5..94e0edd8707 100644 --- a/themes/modern/messenger/fieldMapImport.css +++ b/themes/modern/messenger/fieldMapImport.css @@ -21,8 +21,19 @@ * Pete Collins, Ben Goodger */ +@import url(chrome://communicator/skin/); + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to HTML */ +@namespace html url("http://www.w3.org/TR/REC-html40"); /* namespace for XUL elements */ + treecell.importsampledata { padding-left: 10px; border-left: 3px solid #CCCCCC; } +#fieldList-box { + border: 1px inset white; + width:32em; + height:300px; + margin: 1.5em 3em 1.5em 3em; +} diff --git a/themes/modern/messenger/folderPane.css b/themes/modern/messenger/folderPane.css index df9dcaf19ab..cdaa2c6b329 100644 --- a/themes/modern/messenger/folderPane.css +++ b/themes/modern/messenger/folderPane.css @@ -113,3 +113,8 @@ treeitem[open="true"] > treerow > .tree-cell-folderpane-icon[BiffState="NewMail" min-width: 10px; } +treeitem[empty="true"] > treerow > treecell > .tree-cell-twisty { + + list-style-image: none !important; + +} diff --git a/themes/modern/messenger/importDialog.css b/themes/modern/messenger/importDialog.css index 638e3d44ea9..ad05dbb0bb2 100644 --- a/themes/modern/messenger/importDialog.css +++ b/themes/modern/messenger/importDialog.css @@ -21,4 +21,41 @@ * */ +@import url(chrome://communicator/skin/); + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to HTML */ +@namespace html url("http://www.w3.org/TR/REC-html40"); /* namespace for XUL elements */ + +#import-type-radio-box { + padding-top: 1em; +} + +#import-module-list-box { + padding: 1em 3em 2em 3em; +} + +#import-module-tree-box { + height: 8em; + width: 20em; + border: 1px inset white; + margin-top: .5em; +} + +#description { + margin: 1.5em 0px 0px 0px; + padding: 0px 2px 0px 2px; + height: 4em; + width: 20em; + background-color:white; + border:1px inset white; +} + +#progressStatus { + margin: 1em 0px 0px 0px; +} + +#progressMeter { + margin: 1em 2em 2em 1em; + width: 26em; +} diff --git a/themes/modern/messenger/mailWidgets.xml b/themes/modern/messenger/mailWidgets.xml index fbba7d9a5e2..1b6284a89b9 100644 --- a/themes/modern/messenger/mailWidgets.xml +++ b/themes/modern/messenger/mailWidgets.xml @@ -17,10 +17,13 @@ Components.classes['mozilla.mail.search.validityManager.1'].getService(Components.interfaces.nsIMsgSearchValidityManager); ]]> - + - - - @@ -84,6 +82,7 @@ @@ -277,6 +277,7 @@ + diff --git a/themes/modern/messenger/messenger.css b/themes/modern/messenger/messenger.css index e3ed04c4f08..e488cc3fe09 100644 --- a/themes/modern/messenger/messenger.css +++ b/themes/modern/messenger/messenger.css @@ -64,44 +64,45 @@ iframe { /** * toolbar button images */ -#getmsg-btn { + +#button-getmsg { list-style-image:url("chrome://messenger/skin/getmsg.gif"); } -#newmsg-btn{ +#button-newmsg { list-style-image:url("chrome://messenger/skin/newmsg.gif"); } -#reply-btn{ +#button-reply { list-style-image:url("chrome://messenger/skin/reply.gif"); } -#replyall-btn{ +#button-replyall { list-style-image:url("chrome://messenger/skin/replyall.gif"); } -#forward-btn{ +#button-forward { list-style-image:url("chrome://messenger/skin/forward.gif"); } -#file-btn{ +#button-file { list-style-image:url("chrome://messenger/skin/file.gif"); } -#next-btn{ +#button-next { list-style-image:url("chrome://messenger/skin/next.gif"); } -#delete-btn{ +#button-delete { list-style-image:url("chrome://messenger/skin/trash.gif"); } -#print-btn{ - list-style-image:url("chrome://messenger/skin/print.gif"); +#button-print { + list-style-image:url("chrome://global/skin/print.gif"); } -#stop-btn{ - list-style-image:url("chrome://messenger/skin/stop.gif"); +#button-stop { + list-style-image:url("chrome://global/skin/stop.gif"); } @@ -167,45 +168,6 @@ iframe { list-style-image: url("chrome://messenger/skin/server-news.gif"); } -#button_getmsg { - list-style-image:url("chrome://messenger/skin/getmsg.gif"); -} - -#button_newmsg { - list-style-image:url("chrome://messenger/skin/newmsg.gif"); -} - -#button_reply { - list-style-image:url("chrome://messenger/skin/reply.gif"); -} - -#button_replyall { - list-style-image:url("chrome://messenger/skin/replyall.gif"); -} - -#button_forward { - list-style-image:url("chrome://messenger/skin/forward.gif"); -} - -#button_file { - list-style-image:url("chrome://messenger/skin/file.gif"); -} - -#button_next { - list-style-image:url("chrome://messenger/skin/next.gif"); -} - -#button_delete { - list-style-image:url("chrome://messenger/skin/trash.gif"); -} - -#button_print { - list-style-image:url("chrome://global/skin/print.gif"); -} - -#button_stop { - list-style-image:url("chrome://global/skin/stop.gif"); -} menu.push { border: 1px outset white; diff --git a/themes/modern/messenger/messengercompose/messengercompose.css b/themes/modern/messenger/messengercompose/messengercompose.css index d2853101f10..a4b1cf2b504 100644 --- a/themes/modern/messenger/messengercompose/messengercompose.css +++ b/themes/modern/messenger/messengercompose/messengercompose.css @@ -89,31 +89,31 @@ textfield.addressingWidget[autocomplete="true"] > box border : none; } -#button_send { +#button-send { list-style-image:url("chrome://messenger/skin/messengercompose/send.gif"); } -#button_address { +#button-address { list-style-image:url("chrome://messenger/skin/messengercompose/address.gif"); } -#button_attach { +#button-attach { list-style-image:url("chrome://messenger/skin/messengercompose/attach.gif"); } -#button_quote { +#button-quote { list-style-image:url("chrome://messenger/skin/messengercompose/quote.gif"); } -#button_spelling { +#button-spelling { list-style-image:url("chrome://messenger/skin/messengercompose/spelling.gif"); } -#button_save { +#button-save { list-style-image:url("chrome://messenger/skin/messengercompose/save.gif"); } -#button_stop { +#button-stop { list-style-image:url("chrome://global/skin/stop.gif"); } diff --git a/themes/modern/messenger/threadPane.css b/themes/modern/messenger/threadPane.css index 23d13e48563..4f36221b5c3 100644 --- a/themes/modern/messenger/threadPane.css +++ b/themes/modern/messenger/threadPane.css @@ -100,3 +100,9 @@ treecell.readColumnHeader > .tree-header-image { treecell.flagColumnHeader > .tree-header-image { list-style-image: url("chrome://messenger/skin/flaggedmail.gif"); } + +treeitem[empty="true"] > treerow > treecell > .tree-cell-twisty { + + list-style-image: none !important; + + }