diff --git a/themes/modern/communicator/MANIFEST b/themes/modern/communicator/MANIFEST index c493ce875a98..bdfb55b7d642 100644 --- a/themes/modern/communicator/MANIFEST +++ b/themes/modern/communicator/MANIFEST @@ -14,3 +14,10 @@ tb-menubutton-dm.gif tb-menubutton-dm-disabled.gif online.gif offline.gif +document.gif +document-error.gif +securityOverlay.css +lock.gif +unlock.gif +tasksOverlay.css +dialogOverlay.css diff --git a/themes/modern/communicator/Makefile.in b/themes/modern/communicator/Makefile.in index cba4f60566c7..c68419e2f91a 100644 --- a/themes/modern/communicator/Makefile.in +++ b/themes/modern/communicator/Makefile.in @@ -30,6 +30,7 @@ include $(THEME_ROOT_DEPTH)/theme.mk EXPORT_RESOURCE = \ $(srcdir)/brand.css \ + $(srcdir)/securityOverlay.css \ $(srcdir)/box.css \ $(srcdir)/button.css \ $(srcdir)/communicator.css \ @@ -44,6 +45,12 @@ EXPORT_RESOURCE = \ $(srcdir)/tb-menubutton-dm-disabled.gif \ $(srcdir)/online.gif \ $(srcdir)/offline.gif \ + $(srcdir)/document.gif \ + $(srcdir)/document-error.gif \ + $(srcdir)/lock.gif \ + $(srcdir)/unlock.gif \ + $(srcdir)/tasksOverlay.css \ + $(srcdir)/dialogOverlay.css \ $(NULL) DIRS = search xpinstall sidebar bookmarks directory profile regviewer related wallet diff --git a/themes/modern/communicator/dialogOverlay.css b/themes/modern/communicator/dialogOverlay.css new file mode 100644 index 000000000000..ffe877aa4a4b --- /dev/null +++ b/themes/modern/communicator/dialogOverlay.css @@ -0,0 +1,121 @@ +/** + * Small Dialog Header (without icon) + **/ +.box-smallheader + { + behavior : url(chrome://communicator/content/dialogBindings.xml#smallheader); + border : 1px inset #CCCCCC; + margin : 0px 5px 6px 5px; + } + +.toolbar-primary + { + padding : 0px 0px 3px 0px; + min-height : 0px; + } + +.box-smallheader-left + { + font-size : larger; + font-weight : bold; + color : #FFFFFF; + padding-left : 6px; + } + +.box-smallheader-right + { + color : #FFFFFF; + padding-right : 6px; + } + +.box-smallheader > .toolbar-primary + { + border : 1px solid #000000; + vertical-align : middle; + padding-top : 3px; + } + +/** + * Large Dialog Header (with icon) + **/ +.box-header + { + behavior : url(chrome://communicator/content/dialogBindings.xml#largeheader); + } + +.box-header-header + { + padding : 0px 0px 4px 5px; + min-height : 34px; + } + +.box-header-text-box + { + vertical-align : middle; + } + +.box-header-text + { + color : white; + font-size : large; + font-weight : bold; + text-decoration : underline; + } + +.box-header-icon-box + { + vertical-align : middle; + } + +.box-header-circle + { + background-image : url("chrome://communicator/skin/button28-bg.gif"); + background-repeat : no-repeat; + background-position : 50% 4px; + background-color : transparent; + min-width : 28px; + margin : 1px 7px 1px 1px; + height : 28px; + width : 28px; + } + +/** + * Dialog status line (blue) including progress area + **/ +.box-status + { + behavior : url(chrome://communicator/content/dialogBindings.xml#status); + } + +.box-status-bg + { + padding : 1px 5px 1px 5px; + min-height : 0px ! important; + } + +.box-status-text, .box-status-progress + { + color : #99cccc ! important; + } + + +/** + * Utility classes for use when combined headers/footers are used + **/ +/* display area framed container */ +#contentarea + { + border-top : 2px groove #CCCCCC; + border-bottom : 2px groove #CCCCCC; + padding : 7px; + } + +/* top border on status area */ +#wizardButtons + { + border-bottom : 1px outset #CCCCCC; + padding-top : 1px; + padding-bottom : 1px; + } + + diff --git a/themes/modern/communicator/document-error.gif b/themes/modern/communicator/document-error.gif new file mode 100644 index 000000000000..1fa783934813 Binary files /dev/null and b/themes/modern/communicator/document-error.gif differ diff --git a/themes/modern/communicator/document.gif b/themes/modern/communicator/document.gif new file mode 100644 index 000000000000..fac3438f298c Binary files /dev/null and b/themes/modern/communicator/document.gif differ diff --git a/themes/modern/communicator/lock.gif b/themes/modern/communicator/lock.gif new file mode 100644 index 000000000000..6e59a68467a7 Binary files /dev/null and b/themes/modern/communicator/lock.gif differ diff --git a/themes/modern/communicator/makefile.win b/themes/modern/communicator/makefile.win index 3429845040f2..df020de9b38f 100644 --- a/themes/modern/communicator/makefile.win +++ b/themes/modern/communicator/makefile.win @@ -29,6 +29,7 @@ include <$(THEME_ROOT_DEPTH)\theme.mk> install:: $(MAKE_INSTALL) box.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin + $(MAKE_INSTALL) securityOverlay.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin $(MAKE_INSTALL) menubuttonBindings.xml $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin $(MAKE_INSTALL) brand.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin $(MAKE_INSTALL) button.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin @@ -43,6 +44,12 @@ install:: $(MAKE_INSTALL) offline.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin $(MAKE_INSTALL) online.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin $(MAKE_INSTALL) toolbar.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin + $(MAKE_INSTALL) document.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin + $(MAKE_INSTALL) document-error.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin + $(MAKE_INSTALL) lock.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin + $(MAKE_INSTALL) unlock.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin + $(MAKE_INSTALL) tasksOverlay.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin + $(MAKE_INSTALL) dialogOverlay.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin clobber:: rm -f $(DIST)\chrome\$(THEME)\communicator\skin\*.* diff --git a/themes/modern/communicator/securityOverlay.css b/themes/modern/communicator/securityOverlay.css new file mode 100644 index 000000000000..42ca629460ca --- /dev/null +++ b/themes/modern/communicator/securityOverlay.css @@ -0,0 +1,20 @@ +#security-button + { + list-style-image:url("chrome://communicator/skin/unlock.gif"); + } + +#security-button[level="high"] + { + list-style-image:url("chrome://communicator/skin/lock.gif"); + } + +#security-button[level="low"] + { + list-style-image:url("chrome://communicator/skin/lock.gif"); + } + +#security-button[level="broken"] + { + list-style-image:url("chrome://communicator/skin/broken.gif"); + } + diff --git a/themes/modern/communicator/tasksOverlay.css b/themes/modern/communicator/tasksOverlay.css new file mode 100644 index 000000000000..2877b65250ab --- /dev/null +++ b/themes/modern/communicator/tasksOverlay.css @@ -0,0 +1,42 @@ +#mini-nav + { + list-style-image : url("chrome://global/skin/taskbar-navigator.gif"); + } + +#mini-mail + { + list-style-image : url("chrome://global/skin/taskbar-mail.gif"); + } + +#mini-addr + { + list-style-image : url("chrome://global/skin/taskbar-addressbook.gif"); + } + +#mini-comp + { + list-style-image : url("chrome://global/skin/taskbar-composer.gif"); + } + +#taskbar > toolbar + { + margin-top : 2px; + min-height : 1em; + user-focus : ignore; + } + +.taskbutton + { + margin-right : 1em !important; + } + +.taskbarspacer + { + min-width : 0.3em; + width : 1em; + } + +#taskbar > toolbargrippy + { + display : none; + } \ No newline at end of file diff --git a/themes/modern/communicator/unlock.gif b/themes/modern/communicator/unlock.gif new file mode 100644 index 000000000000..761b85ddfb35 Binary files /dev/null and b/themes/modern/communicator/unlock.gif differ diff --git a/themes/modern/global/MANIFEST b/themes/modern/global/MANIFEST index eaca042339e4..ca98b44d51e9 100644 --- a/themes/modern/global/MANIFEST +++ b/themes/modern/global/MANIFEST @@ -24,7 +24,6 @@ columnselect.gif columnselect-hover.gif commonDialog.css console.css -dialogOverlay.css dir-closed.gif dir-open.gif error-icon.gif @@ -106,7 +105,6 @@ taskbar-tab-hover.gif taskbar-tab-minimized.gif taskbar-tab-trans.gif taskbar-tab.gif -tasksOverlay.css textfield.css toolbar-begincap.gif toolbar-dropdown-hover.gif diff --git a/themes/modern/global/Makefile.in b/themes/modern/global/Makefile.in index 90d69e3bc5be..599d2cb5ff92 100644 --- a/themes/modern/global/Makefile.in +++ b/themes/modern/global/Makefile.in @@ -56,7 +56,6 @@ EXPORT_RESOURCE_SAMPLES = \ columnselect-hover.gif \ commonDialog.css \ console.css \ - dialogOverlay.css \ dir-closed.gif \ dir-open.gif \ error-icon.gif \ @@ -137,7 +136,6 @@ EXPORT_RESOURCE_SAMPLES = \ taskbar-tab-minimized.gif \ taskbar-tab-trans.gif \ taskbar-tab.gif \ - tasksOverlay.css \ textfield.css \ toolbar-begincap.gif \ toolbar-dropdown-hover.gif \ diff --git a/themes/modern/global/console.css b/themes/modern/global/console.css index 5ef2d6161eaf..02784b9de380 100644 --- a/themes/modern/global/console.css +++ b/themes/modern/global/console.css @@ -19,8 +19,28 @@ * Contributor(s): */ -@import url(chrome://global/skin/global.css); - -window { - font-size: 12px; +.error-icon-box { + background-color: #CCCCCC; + padding: 5px; + border-right: 1px solid #999999; } + + + +.treecell-error { + border-bottom: 1px solid #000000 !important; + padding: 0px; +} + +.treecell-error[type="error"] { + list-style-image: url("chrome://global/skin/error-icon.gif") !important; +} + +.treecell-error[type="warning"] { + list-style-image: url("chrome://global/skin/alert-icon.gif") !important; +} + +.error-icon { + list-style-image: inherit !important; +} + diff --git a/themes/modern/global/global.css b/themes/modern/global/global.css index 45433f6375e1..a2c3f25eda9e 100644 --- a/themes/modern/global/global.css +++ b/themes/modern/global/global.css @@ -115,6 +115,11 @@ padding : 0px 1px 0px 1px; } + .statusbar-panel-icon + { + margin : 0px 2px 0px 0px; + } + /** * status-bar */ diff --git a/themes/modern/global/makefile.win b/themes/modern/global/makefile.win index 0fe278938469..74337bc114e1 100644 --- a/themes/modern/global/makefile.win +++ b/themes/modern/global/makefile.win @@ -54,7 +54,6 @@ install:: $(MAKE_INSTALL) columnselect-hover.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) commonDialog.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) console.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin - $(MAKE_INSTALL) dialogOverlay.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) dir-closed.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) dir-open.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) error-icon.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin @@ -137,7 +136,6 @@ install:: $(MAKE_INSTALL) taskbar-tab-minimized.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) taskbar-tab-trans.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) taskbar-tab.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin - $(MAKE_INSTALL) tasksOverlay.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) textfield.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) toolbar-begincap.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) toolbar-dropdown-hover.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin diff --git a/themes/modern/global/tabcontrol.css b/themes/modern/global/tabcontrol.css index 7c05921a5d7b..4fb79bc64330 100644 --- a/themes/modern/global/tabcontrol.css +++ b/themes/modern/global/tabcontrol.css @@ -1,3 +1,7 @@ +tabcontrol { + margin: 1px 5px 2px 5px; +} + /********** Tab widget *********/ tab { border-top: 1px solid white; diff --git a/themes/modern/global/textfield.css b/themes/modern/global/textfield.css index 71abff604a76..c45bc64481ac 100644 --- a/themes/modern/global/textfield.css +++ b/themes/modern/global/textfield.css @@ -78,3 +78,22 @@ margin : 0px !important; border : none !important; } + + .scrollfield + { + border : none !important; + margin : 0px; + margin-top : 1px; + padding : 0px !important; + background : inherit; + } + + .scrollfield > .textfield-internal-box + { + border : none !important; + margin : 0px !important; + padding : 0px !important; + } + + + \ No newline at end of file diff --git a/themes/modern/navigator/MANIFEST b/themes/modern/navigator/MANIFEST index 936cfcc4923e..babede326352 100644 --- a/themes/modern/navigator/MANIFEST +++ b/themes/modern/navigator/MANIFEST @@ -1,5 +1,4 @@ #!dest navigator:skin -NavSecurityOverlay.css alertl.gif back.gif broken.gif @@ -8,7 +7,6 @@ forward.gif home.gif location-hover.gif location.gif -lock.gif messagel.gif mynetscape.gif n-box-persbar.gif @@ -18,5 +16,4 @@ questionl.gif reload.gif search.gif stop.gif -unlock.gif pageInfo.css diff --git a/themes/modern/navigator/Makefile.in b/themes/modern/navigator/Makefile.in index 4edcd8333149..fbabda69c8ee 100644 --- a/themes/modern/navigator/Makefile.in +++ b/themes/modern/navigator/Makefile.in @@ -31,7 +31,6 @@ include $(THEME_ROOT_DEPTH)/theme.mk SAMPLES_DIR = $(DIST)/bin/chrome/skins/$(THEME)/navigator/skin EXPORT_RESOURCE_SAMPLES = \ - NavSecurityOverlay.css \ alertl.gif \ back.gif \ broken.gif \ @@ -40,7 +39,6 @@ EXPORT_RESOURCE_SAMPLES = \ home.gif \ location-hover.gif \ location.gif \ - lock.gif \ messagel.gif \ mynetscape.gif \ n-box-persbar.gif \ @@ -50,7 +48,6 @@ EXPORT_RESOURCE_SAMPLES = \ reload.gif \ search.gif \ stop.gif \ - unlock.gif \ pageInfo.css \ $(NULL) diff --git a/themes/modern/navigator/makefile.win b/themes/modern/navigator/makefile.win index 7510b7c1a380..870acb710f06 100644 --- a/themes/modern/navigator/makefile.win +++ b/themes/modern/navigator/makefile.win @@ -29,7 +29,6 @@ clobber:: rm -f $(DIST)\chrome\skins\$(THEME)\navigator\skin\*.* install:: - $(MAKE_INSTALL) NavSecurityOverlay.css $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin $(MAKE_INSTALL) alertl.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin $(MAKE_INSTALL) back.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin $(MAKE_INSTALL) broken.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin @@ -38,7 +37,6 @@ install:: $(MAKE_INSTALL) home.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin $(MAKE_INSTALL) location-hover.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin $(MAKE_INSTALL) location.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin - $(MAKE_INSTALL) lock.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin $(MAKE_INSTALL) messagel.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin $(MAKE_INSTALL) mynetscape.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin $(MAKE_INSTALL) n-box-persbar.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin @@ -49,4 +47,3 @@ install:: $(MAKE_INSTALL) reload.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin $(MAKE_INSTALL) search.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin $(MAKE_INSTALL) stop.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin - $(MAKE_INSTALL) unlock.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin diff --git a/themes/modern/navigator/navigator.css b/themes/modern/navigator/navigator.css index 74138312cce1..1abff8449845 100644 --- a/themes/modern/navigator/navigator.css +++ b/themes/modern/navigator/navigator.css @@ -96,6 +96,16 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome { { width : 100px; } + +#statusbar-display + { + list-style-image : url("chrome://communicator/skin/document.gif"): + } + +#statusbar-display[error="true"] + { + list-style-image : url("chrome://communicator/skin/document-error.gif"); + } #go-button {