diff --git a/themes/modern/communicator/MANIFEST b/themes/modern/communicator/MANIFEST index 8130a9f180b2..09ec98290499 100644 --- a/themes/modern/communicator/MANIFEST +++ b/themes/modern/communicator/MANIFEST @@ -27,3 +27,7 @@ tb-menubutton-dm-hover.gif tb-menubutton-dm.gif toolbar.css unlock.gif +throbber-groove-bottom.gif +throbber-groove-left.gif +throbber-groove-right.gif +throbber-groove-top.gif diff --git a/themes/modern/communicator/Makefile.in b/themes/modern/communicator/Makefile.in index 76969fbc15fc..dbc32724cf1b 100644 --- a/themes/modern/communicator/Makefile.in +++ b/themes/modern/communicator/Makefile.in @@ -57,6 +57,10 @@ EXPORT_RESOURCE = \ $(srcdir)/tb-menubutton-dm.gif \ $(srcdir)/toolbar.css \ $(srcdir)/unlock.gif \ + $(srcdir)/throbber-groove-bottom.gif \ + $(srcdir)/throbber-groove-left.gif \ + $(srcdir)/throbber-groove-right.gif \ + $(srcdir)/throbber-groove-top.gif \ $(NULL) DIRS = search xpinstall sidebar bookmarks directory profile regviewer related diff --git a/themes/modern/communicator/brand.css b/themes/modern/communicator/brand.css index d6c7947201ac..f6226aeaa636 100644 --- a/themes/modern/communicator/brand.css +++ b/themes/modern/communicator/brand.css @@ -1,13 +1,14 @@ #navigator-throbber { - -moz-binding : url("chrome://global/content/xulBindings.xml#buttontop"); + -moz-binding : url("chrome://global/skin/globalBindings.xml#throbber"); list-style-image : url("chrome://global/skin/animthrob_single.gif"); - margin : 5px 1px 9px 8px; + margin : 2px 1px 6px 8px; padding : 0px; cursor : pointer; border : 0px; background-color : transparent; + text-align : center; -moz-user-focus : ignore; } @@ -18,18 +19,38 @@ #navigator-throbber:hover:active { - margin : 4px 0px 5px 9px; + margin : 2px 1px 6px 8px; } -#navigator-throbber > .button-internal-box +.throbber-icon { - border : 0px; - padding : 0px; - margin : 0px; + margin : 0px 0px; } - -#navigator-throbber > .button-internal-box > .button-text-container + +.throbber-groove-left { - display : none; - } - + background : url(chrome://communicator/skin/throbber-groove-left.gif) no-repeat; + width : 3px; + height : 38px; + } + +.throbber-groove-right + { + background : url(chrome://communicator/skin/throbber-groove-right.gif) no-repeat; + width : 3px; + height : 38px; + } + +.throbber-groove-top + { + background : url(chrome://communicator/skin/throbber-groove-top.gif) no-repeat; + height : 3px; + width : 32px; + } + +.throbber-groove-bottom + { + background : url(chrome://communicator/skin/throbber-groove-bottom.gif) no-repeat; + height : 3px; + width : 32px; + } diff --git a/themes/modern/communicator/button.css b/themes/modern/communicator/button.css index 04438122dbc0..0df770a5d552 100644 --- a/themes/modern/communicator/button.css +++ b/themes/modern/communicator/button.css @@ -56,7 +56,7 @@ .button-toolbar[toggled="true"] { border : 0px solid #036; - background-color : #AAA; + background-color : #DFFFFF; -moz-border-radius : 4px; } @@ -75,7 +75,7 @@ .button-toolbar-1 { color : #D0E7E7; - margin : 3px 2px 6px 2px; + margin : 3px 2px 9px 2px; font-size : smaller; border : 0px; padding : 0px; @@ -98,7 +98,7 @@ .button-toolbar-1[disabled="true"]:hover, .button-toolbar-1[disabled="true"]:hover:active { - margin : 3px 2px 6px 2px; + margin : 3px 2px 9px 2px; border : none; } diff --git a/themes/modern/communicator/makefile.win b/themes/modern/communicator/makefile.win index c2f0d15f7f6e..c69c22c65c83 100644 --- a/themes/modern/communicator/makefile.win +++ b/themes/modern/communicator/makefile.win @@ -56,6 +56,10 @@ install:: $(MAKE_INSTALL) tb-menubutton-dm.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin $(MAKE_INSTALL) toolbar.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin $(MAKE_INSTALL) unlock.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin + $(MAKE_INSTALL) throbber-groove-bottom.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin + $(MAKE_INSTALL) throbber-groove-left.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin + $(MAKE_INSTALL) throbber-groove-right.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin + $(MAKE_INSTALL) throbber-groove-top.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin clobber:: rm -f $(DIST)\chrome\$(THEME)\communicator\skin\*.* diff --git a/themes/modern/communicator/menubutton.css b/themes/modern/communicator/menubutton.css index f54d4bb83243..e24dce124e95 100644 --- a/themes/modern/communicator/menubutton.css +++ b/themes/modern/communicator/menubutton.css @@ -68,7 +68,7 @@ { -moz-binding : url("chrome://communicator/skin/menubuttonBindings.xml#menubutton-dual-foo"); border : 0px solid red; - margin : 3px 2px 6px 2px; + margin : 3px 2px 9px 2px; padding : 0px; } @@ -76,7 +76,7 @@ .menubutton-dual.toolbar[disabled="true"]:hover, .menubutton-dual.toolbar[disabled="true"]:hover:active { - margin : 3px 2px 6px 2px; + margin : 3px 2px 9px 2px; padding : 0px; } diff --git a/themes/modern/communicator/toolbar.css b/themes/modern/communicator/toolbar.css index 0d3afb10ff5f..a18b8fbe3268 100644 --- a/themes/modern/communicator/toolbar.css +++ b/themes/modern/communicator/toolbar.css @@ -42,7 +42,7 @@ toolbargrippy[tbgrippy-collapsed="true"]:hover:active toolbar[collapsed="true"] > toolbargrippy { - width : 30px; + width : 20px; } .toolbar-standard > toolbargrippy diff --git a/themes/modern/editor/EditorToolbars.css b/themes/modern/editor/EditorToolbars.css index c4847f7ed1e3..bd0533d4859d 100644 --- a/themes/modern/editor/EditorToolbars.css +++ b/themes/modern/editor/EditorToolbars.css @@ -27,7 +27,15 @@ } #FormatToolbar { - border-bottom: 1px solid #003366; + border-top: 1px solid #B6CADF; + border-bottom: 1px solid #000000; + border-left: 1px solid #48607E; + border-right: 2px solid #4D6685; + background-color: #7B94B2; +} + +#FormatToolbar > toolbargrippy { + margin-left: 0px; } .separator_small { @@ -383,19 +391,19 @@ button.edit-mode > .button-internal-box > .button.icon:hover:active } #linkButton-dark { - list-style-image:url("chrome://editor/skin/images/link.gif"); + //list-style-image:url("chrome://editor/skin/images/link.gif"); } #imageButton-dark { - list-style-image:url("chrome://editor/skin/images/image.gif"); + //list-style-image:url("chrome://editor/skin/images/image.gif"); } #namedAnchorButton-dark { - list-style-image:url("chrome://editor/skin/images/anchor.gif"); + //list-style-image:url("chrome://editor/skin/images/anchor.gif"); } #hlineButton-dark { - list-style-image:url("chrome://editor/skin/images/hline.gif"); + //list-style-image:url("chrome://editor/skin/images/hline.gif"); } #tableButton-dark { - list-style-image:url("chrome://editor/skin/images/table.gif"); + //list-style-image:url("chrome://editor/skin/images/table.gif"); } #spellingButton { diff --git a/themes/modern/editor/images/align.gif b/themes/modern/editor/images/align.gif index c3d880c83f88..03cb08b51858 100644 Binary files a/themes/modern/editor/images/align.gif and b/themes/modern/editor/images/align.gif differ diff --git a/themes/modern/editor/images/bold.gif b/themes/modern/editor/images/bold.gif index 3b55ffd3125f..c315e1906b63 100644 Binary files a/themes/modern/editor/images/bold.gif and b/themes/modern/editor/images/bold.gif differ diff --git a/themes/modern/editor/images/bold_disabled.gif b/themes/modern/editor/images/bold_disabled.gif index b393ca4433ab..af1bb9da6ed8 100644 Binary files a/themes/modern/editor/images/bold_disabled.gif and b/themes/modern/editor/images/bold_disabled.gif differ diff --git a/themes/modern/editor/images/bullets.gif b/themes/modern/editor/images/bullets.gif index 6111ac5f7e0a..49437f3829ef 100644 Binary files a/themes/modern/editor/images/bullets.gif and b/themes/modern/editor/images/bullets.gif differ diff --git a/themes/modern/editor/images/bullets_disabled.gif b/themes/modern/editor/images/bullets_disabled.gif index 09d678c678b1..1f1a652e64fc 100644 Binary files a/themes/modern/editor/images/bullets_disabled.gif and b/themes/modern/editor/images/bullets_disabled.gif differ diff --git a/themes/modern/editor/images/center.gif b/themes/modern/editor/images/center.gif index 113c13daed80..b9eec949367e 100644 Binary files a/themes/modern/editor/images/center.gif and b/themes/modern/editor/images/center.gif differ diff --git a/themes/modern/editor/images/center_disabled.gif b/themes/modern/editor/images/center_disabled.gif index dd0a3a1626c1..b396140a17c4 100644 Binary files a/themes/modern/editor/images/center_disabled.gif and b/themes/modern/editor/images/center_disabled.gif differ diff --git a/themes/modern/editor/images/dec-font-size.gif b/themes/modern/editor/images/dec-font-size.gif index 61e7f5e07f1b..1e4fcd7b6b2f 100644 Binary files a/themes/modern/editor/images/dec-font-size.gif and b/themes/modern/editor/images/dec-font-size.gif differ diff --git a/themes/modern/editor/images/dec-font-size_disabled.gif b/themes/modern/editor/images/dec-font-size_disabled.gif index 83419fd7e170..7438a74f7187 100644 Binary files a/themes/modern/editor/images/dec-font-size_disabled.gif and b/themes/modern/editor/images/dec-font-size_disabled.gif differ diff --git a/themes/modern/editor/images/editmode-html.gif b/themes/modern/editor/images/editmode-html.gif index c354a9a2466e..d7f912458340 100644 Binary files a/themes/modern/editor/images/editmode-html.gif and b/themes/modern/editor/images/editmode-html.gif differ diff --git a/themes/modern/editor/images/editmode-normal.gif b/themes/modern/editor/images/editmode-normal.gif index 60ed37e5fba7..888d5900e228 100644 Binary files a/themes/modern/editor/images/editmode-normal.gif and b/themes/modern/editor/images/editmode-normal.gif differ diff --git a/themes/modern/editor/images/editmode-preview.gif b/themes/modern/editor/images/editmode-preview.gif index 8538cbf4d70a..25ed16caf45b 100644 Binary files a/themes/modern/editor/images/editmode-preview.gif and b/themes/modern/editor/images/editmode-preview.gif differ diff --git a/themes/modern/editor/images/inc-font-size.gif b/themes/modern/editor/images/inc-font-size.gif index 647617ba6f63..9f8b801700f1 100644 Binary files a/themes/modern/editor/images/inc-font-size.gif and b/themes/modern/editor/images/inc-font-size.gif differ diff --git a/themes/modern/editor/images/inc-font-size_disabled.gif b/themes/modern/editor/images/inc-font-size_disabled.gif index 106b217e2df5..d416b5e2f8a5 100644 Binary files a/themes/modern/editor/images/inc-font-size_disabled.gif and b/themes/modern/editor/images/inc-font-size_disabled.gif differ diff --git a/themes/modern/global/global.css b/themes/modern/global/global.css index eb0d018fc695..f8e92b94cf5b 100644 --- a/themes/modern/global/global.css +++ b/themes/modern/global/global.css @@ -63,7 +63,7 @@ window.dialog { - background-color : #CCCCCC; + background-color : #B4C3D4; padding : 7px 5px 5px 5px; } @@ -127,11 +127,13 @@ #status-bar { border-top : 1px solid #11151F; - background-color : #6D88AA; + background-color : #6E89AB; -moz-user-focus : ignore; overflow : hidden; margin : 0px; padding : 0px; + color : #D0E7E7; + font-size : 10px; } /** diff --git a/themes/modern/global/globalBindings.xml b/themes/modern/global/globalBindings.xml index cf46cf7e6b71..b153d79c748d 100644 --- a/themes/modern/global/globalBindings.xml +++ b/themes/modern/global/globalBindings.xml @@ -107,4 +107,16 @@ + + + + + + + + + + + + diff --git a/themes/modern/global/menu.css b/themes/modern/global/menu.css index ad9be5b74f65..815db0069d46 100644 --- a/themes/modern/global/menu.css +++ b/themes/modern/global/menu.css @@ -54,9 +54,9 @@ menupopup > menuitem, popup > menuitem menuseparator { - border-top : 1px solid #172254; - border-bottom : 1px solid #5A518A; - margin : 2px 0px; + border-top : 1px solid #FEFEFE; + border-bottom : 1px solid #012655; + margin : 2px 3px; } menubar > menu @@ -203,6 +203,7 @@ menuitem[checked="true"][type="radio"][menuactive="true"] color : #000000; font-size : 10px; padding : 2px; + padding-right : 3px; } /* diff --git a/themes/modern/global/menulist.css b/themes/modern/global/menulist.css index c1d64a6a5cec..bca227978071 100644 --- a/themes/modern/global/menulist.css +++ b/themes/modern/global/menulist.css @@ -151,13 +151,13 @@ border-bottom : 1px inset #CCCCCC; border-top : 0px; } - +/* menulist > menupopup > menuseparator { border-top: 1px solid #172254; border-bottom: 1px solid #5A518A; } - +*/ menulist > menupopup > menuitem { diff --git a/themes/modern/jar.mn b/themes/modern/jar.mn index 341ed917f40f..2f5258c9db29 100644 --- a/themes/modern/jar.mn +++ b/themes/modern/jar.mn @@ -29,6 +29,10 @@ skins/modern.jar: communicator/skin/tb-menubutton-dm.gif (communicator/tb-menubutton-dm.gif) communicator/skin/toolbar.css (communicator/toolbar.css) communicator/skin/unlock.gif (communicator/unlock.gif) + communicator/skin/throbber-groove-bottom.gif (communicator/throbber-groove-bottom.gif) + communicator/skin/throbber-groove-left.gif (communicator/throbber-groove-left.gif) + communicator/skin/throbber-groove-right.gif (communicator/throbber-groove-right.gif) + communicator/skin/throbber-groove-top.gif (communicator/throbber-groove-top.gif) editor/skin/EdImageMap.css (editor/EdImageMap.css) editor/skin/EdImageMapPage.css (editor/EdImageMapPage.css) editor/skin/EditorDialog.css (editor/EditorDialog.css) diff --git a/themes/modern/messenger/messengercompose/messengercompose.css b/themes/modern/messenger/messengercompose/messengercompose.css index 995d3d645f3f..1900cdcd5b5f 100644 --- a/themes/modern/messenger/messengercompose/messengercompose.css +++ b/themes/modern/messenger/messengercompose/messengercompose.css @@ -20,6 +20,26 @@ box.padded { width: 100%; } +/* Header toolbar */ + +#MsgHeadersToolbar { + background-color : #7B94B2; + border-top : 2px solid #4C6484; + border-bottom : 0px; + border-left : 1px solid #48607E; + border-right : 2px solid #4D6685; +} + +#MsgHeadersToolbar > toolbargrippy { + border-top : 1px solid #B6CADF; + margin-left : 0px; +} + +#msgheaderstoolbar-box { + border-top : 1px solid #B6CADF; +} + + /* addressing widget */ @@ -229,10 +249,6 @@ textfield.addressingWidget[autocomplete="true"] > box list-style-image : url("chrome://global/skin/stop-clicked.gif"); } -toolbar#MsgHeadersToolbar { - border-bottom: 1px solid #999999; -} - box#addressingWidget { -moz-user-focus: normal; } diff --git a/themes/modern/navigator/navigator.css b/themes/modern/navigator/navigator.css index 2268f39bc6bc..b247e71c9587 100644 --- a/themes/modern/navigator/navigator.css +++ b/themes/modern/navigator/navigator.css @@ -331,8 +331,6 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome { #statusbar-display { list-style-image : url("chrome://communicator/skin/document.gif"); - font-size : 10px; - color : #D0E7E7; } #statusbar-display[error="true"] @@ -360,3 +358,7 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome { -moz-user-focus : ignore !important; } +#PersonalToolbar + { + background-color : #394B6E; + }