diff --git a/themes/blue/editor/EditorDialog.css b/themes/blue/editor/EditorDialog.css index dd7f03b1a920..f2f76a50582d 100644 --- a/themes/blue/editor/EditorDialog.css +++ b/themes/blue/editor/EditorDialog.css @@ -82,8 +82,9 @@ titledbox { .color-well { width:20px; - height: 1.2em; + height: 16px; border: 1px inset #CCCCCC; + margin: 4px; } .color-well[default="true"] { @@ -91,6 +92,10 @@ titledbox { background-color: inherit; } +.color-button { + background: transparent; +} + #ColorPickerSwatch { border : 2px outset #CCCCCC; width: 25px; diff --git a/themes/blue/global/MANIFEST b/themes/blue/global/MANIFEST index 1f3f9bb01676..6a80aef9421c 100644 --- a/themes/blue/global/MANIFEST +++ b/themes/blue/global/MANIFEST @@ -46,6 +46,9 @@ menu-arrow.gif menu-check-disabled.gif menu-check-hover.gif menu-check.gif +menu-radio-disabled.gif +menu-radio-hover.gif +menu-radio.gif menu.css menubutton.css menulist.css diff --git a/themes/blue/global/Makefile.in b/themes/blue/global/Makefile.in index be0d2eef5dcb..213d5e7eccfb 100644 --- a/themes/blue/global/Makefile.in +++ b/themes/blue/global/Makefile.in @@ -80,6 +80,9 @@ EXPORT_RESOURCE_SAMPLES_1 = \ menu-check-disabled.gif \ menu-check-hover.gif \ menu-check.gif \ + menu-radio-disabled.gif \ + menu-radio-hover.gif \ + menu-radio.gif \ menu.css \ menubutton.css \ menulist.css \ diff --git a/themes/blue/global/box.css b/themes/blue/global/box.css index 769792bf2d73..4f0064c141a0 100644 --- a/themes/blue/global/box.css +++ b/themes/blue/global/box.css @@ -9,6 +9,7 @@ titledbox title { margin : 0px 6px 2px 6px; + padding : 0px 3px 0px 3px; } .titledbox-body @@ -17,9 +18,6 @@ title padding : inherit; } -title > text { - margin : 0px 3px 0px 3px; -} /** box formatting **/ box[autostretch="never"] diff --git a/themes/blue/global/makefile.win b/themes/blue/global/makefile.win index 177ea3491c89..7fa183227b11 100644 --- a/themes/blue/global/makefile.win +++ b/themes/blue/global/makefile.win @@ -76,6 +76,9 @@ install:: $(MAKE_INSTALL) menu-check-disabled.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) menu-check-hover.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) menu-check.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin + $(MAKE_INSTALL) menu-radio-disabled.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin + $(MAKE_INSTALL) menu-radio-hover.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin + $(MAKE_INSTALL) menu-radio.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) menu.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) menubutton.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) menulist.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin diff --git a/themes/blue/global/menu-radio-disabled.gif b/themes/blue/global/menu-radio-disabled.gif new file mode 100644 index 000000000000..13b5162ff960 Binary files /dev/null and b/themes/blue/global/menu-radio-disabled.gif differ diff --git a/themes/blue/global/menu-radio-hover.gif b/themes/blue/global/menu-radio-hover.gif new file mode 100644 index 000000000000..923630ecaf79 Binary files /dev/null and b/themes/blue/global/menu-radio-hover.gif differ diff --git a/themes/blue/global/menu-radio.gif b/themes/blue/global/menu-radio.gif new file mode 100644 index 000000000000..13b5162ff960 Binary files /dev/null and b/themes/blue/global/menu-radio.gif differ diff --git a/themes/blue/global/menu.css b/themes/blue/global/menu.css index 7e5c79079b61..afff4416ece0 100644 --- a/themes/blue/global/menu.css +++ b/themes/blue/global/menu.css @@ -159,6 +159,21 @@ menuitem[checked="true"][menuactive="true"] list-style-image : url("chrome://global/skin/menu-check-hover.gif"); } +menuitem[checked="true"][type="radio"] + { + list-style-image : url("chrome://global/skin/menu-radio.gif"); + } + +menuitem[checked="true"][type="radio"][disabled="true"] + { + list-style-image : url("chrome://global/skin/menu-radio-disabled.gif"); + } + +menuitem[checked="true"][type="radio"][menuactive="true"] + { + list-style-image : url("chrome://global/skin/menu-radio-hover.gif"); + } + .menu-right[disabled="true"] { list-style-image : url("chrome://global/skin/menu-arrow-disabled.gif"); diff --git a/themes/blue/jar.mn b/themes/blue/jar.mn index cb47208919c8..2c4f8ebdd8e5 100644 --- a/themes/blue/jar.mn +++ b/themes/blue/jar.mn @@ -1,4 +1,4 @@ -skins/blue.jar: +skins/modern.jar: manifest.rdf communicator/skin/box.css (communicator/box.css) communicator/skin/securityOverlay.css (communicator/securityOverlay.css) @@ -76,6 +76,9 @@ skins/blue.jar: global/skin/menu-check-disabled.gif (global/menu-check-disabled.gif) global/skin/menu-check-hover.gif (global/menu-check-hover.gif) global/skin/menu-check.gif (global/menu-check.gif) + global/skin/menu-radio-disabled.gif (global/menu-radio-disabled.gif) + global/skin/menu-radio-hover.gif (global/menu-radio-hover.gif) + global/skin/menu-radio.gif (global/menu-radio.gif) global/skin/menu.css (global/menu.css) global/skin/menubutton.css (global/menubutton.css) global/skin/menulist.css (global/menulist.css) diff --git a/themes/classic/editor/EditorDialog.css b/themes/classic/editor/EditorDialog.css index 32b3f8970709..f2f76a50582d 100644 --- a/themes/classic/editor/EditorDialog.css +++ b/themes/classic/editor/EditorDialog.css @@ -82,9 +82,9 @@ titledbox { .color-well { width:20px; - height: 1em; + height: 16px; border: 1px inset #CCCCCC; - /* Background color is set at runtime */ + margin: 4px; } .color-well[default="true"] { @@ -92,6 +92,10 @@ titledbox { background-color: inherit; } +.color-button { + background: transparent; +} + #ColorPickerSwatch { border : 2px outset #CCCCCC; width: 25px; diff --git a/themes/classic/global/Makefile.in b/themes/classic/global/Makefile.in index 17b7d357251f..3be66a270201 100644 --- a/themes/classic/global/Makefile.in +++ b/themes/classic/global/Makefile.in @@ -67,6 +67,9 @@ EXPORT_RESOURCE_SAMPLES_1 = \ menu-check-disabled.gif \ menu-check-hover.gif \ menu-check.gif \ + menu-radio-disabled.gif \ + menu-radio-hover.gif \ + menu-radio.gif \ moreCols.gif \ moreCols_dis.gif \ moreCols_mo.gif \ diff --git a/themes/classic/global/makefile.win b/themes/classic/global/makefile.win index 610eb62d4682..d73bddfa8384 100644 --- a/themes/classic/global/makefile.win +++ b/themes/classic/global/makefile.win @@ -65,6 +65,9 @@ install:: $(MAKE_INSTALL) menu-check-disabled.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) menu-check-hover.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) menu-check.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin + $(MAKE_INSTALL) menu-radio-disabled.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin + $(MAKE_INSTALL) menu-radio-hover.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin + $(MAKE_INSTALL) menu-radio.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) moreCols.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) moreCols_dis.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) moreCols_mo.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin diff --git a/themes/classic/global/menu-radio-disabled.gif b/themes/classic/global/menu-radio-disabled.gif new file mode 100644 index 000000000000..13b5162ff960 Binary files /dev/null and b/themes/classic/global/menu-radio-disabled.gif differ diff --git a/themes/classic/global/menu-radio-hover.gif b/themes/classic/global/menu-radio-hover.gif new file mode 100644 index 000000000000..923630ecaf79 Binary files /dev/null and b/themes/classic/global/menu-radio-hover.gif differ diff --git a/themes/classic/global/menu-radio.gif b/themes/classic/global/menu-radio.gif new file mode 100644 index 000000000000..13b5162ff960 Binary files /dev/null and b/themes/classic/global/menu-radio.gif differ diff --git a/themes/classic/global/unix/menu.css b/themes/classic/global/unix/menu.css index 9a345da19eae..2c620538659e 100644 --- a/themes/classic/global/unix/menu.css +++ b/themes/classic/global/unix/menu.css @@ -168,6 +168,16 @@ menuitem[checked="true"][disabled="true"] list-style-image : url("chrome://global/skin/menu-check-disabled.gif"); } +menuitem[checked="true"][type="radio"] + { + list-style-image : url("chrome://global/skin/menu-radio.gif"); + } + +menuitem[checked="true"][type="radio"][disabled="true"] + { + list-style-image : url("chrome://global/skin/menu-radio-disabled.gif"); + } + .menu-right[disabled="true"] { list-style-image : url("chrome://global/skin/menu-arrow-disabled.gif"); diff --git a/themes/classic/global/win/menu.css b/themes/classic/global/win/menu.css index faa3ea156f83..63f980fe3f75 100644 --- a/themes/classic/global/win/menu.css +++ b/themes/classic/global/win/menu.css @@ -170,6 +170,21 @@ menuitem[checked="true"][disabled="true"] list-style-image : url("chrome://global/skin/menu-check-disabled.gif"); } +menuitem[checked="true"][type="radio"] + { + list-style-image : url("chrome://global/skin/menu-radio.gif"); + } + +menuitem[checked="true"][type="radio"][disabled="true"] + { + list-style-image : url("chrome://global/skin/menu-radio-disabled.gif"); + } + +menuitem[checked="true"][type="radio"][menuactive="true"] + { + list-style-image : url("chrome://global/skin/menu-radio-hover.gif"); + } + .menu-right[disabled="true"] { list-style-image : url("chrome://global/skin/menu-arrow-disabled.gif"); diff --git a/themes/classic/jar.mn b/themes/classic/jar.mn index 4866c6f38a30..b93f16d96e4c 100644 --- a/themes/classic/jar.mn +++ b/themes/classic/jar.mn @@ -248,6 +248,9 @@ skins/classic.jar: global/skin/menu-check-disabled.gif (global/menu-check-disabled.gif) global/skin/menu-check-hover.gif (global/menu-check-hover.gif) global/skin/menu-check.gif (global/menu-check.gif) + global/skin/menu-radio-disabled.gif (global/menu-radio-disabled.gif) + global/skin/menu-radio-hover.gif (global/menu-radio-hover.gif) + global/skin/menu-radio.gif (global/menu-radio.gif) global/skin/moreCols.gif (global/moreCols.gif) global/skin/moreCols_dis.gif (global/moreCols_dis.gif) global/skin/moreCols_mo.gif (global/moreCols_mo.gif) diff --git a/themes/modern/editor/EditorDialog.css b/themes/modern/editor/EditorDialog.css index dd7f03b1a920..5437b07470dd 100644 --- a/themes/modern/editor/EditorDialog.css +++ b/themes/modern/editor/EditorDialog.css @@ -31,7 +31,7 @@ titledbox { margin: 2px 5px; 4px; 5px; padding-top: 2px; - padding-bottom: 4px; + padding-bottom: 10px; } .MinWidth5em { @@ -82,8 +82,9 @@ titledbox { .color-well { width:20px; - height: 1.2em; + height: 16px; border: 1px inset #CCCCCC; + margin: 1px 0px 2px 4px; } .color-well[default="true"] { @@ -91,6 +92,10 @@ titledbox { background-color: inherit; } +.color-button { + background: transparent; +} + #ColorPickerSwatch { border : 2px outset #CCCCCC; width: 25px; diff --git a/themes/modern/global/MANIFEST b/themes/modern/global/MANIFEST index 76afb699a547..a7c00d1abd55 100644 --- a/themes/modern/global/MANIFEST +++ b/themes/modern/global/MANIFEST @@ -46,6 +46,9 @@ menu-arrow.gif menu-check-disabled.gif menu-check-hover.gif menu-check.gif +menu-radio-disabled.gif +menu-radio-hover.gif +menu-radio.gif menu.css menubutton.css menulist.css diff --git a/themes/modern/global/Makefile.in b/themes/modern/global/Makefile.in index 032ab8ecb8e3..9fb24333aa75 100644 --- a/themes/modern/global/Makefile.in +++ b/themes/modern/global/Makefile.in @@ -80,6 +80,9 @@ EXPORT_RESOURCE_SAMPLES_1 = \ menu-check-disabled.gif \ menu-check-hover.gif \ menu-check.gif \ + menu-radio-disabled.gif \ + menu-radio-hover.gif \ + menu-radio.gif \ menu.css \ menubutton.css \ menulist.css \ diff --git a/themes/modern/global/box.css b/themes/modern/global/box.css index 769792bf2d73..a4e73f9b0f8c 100644 --- a/themes/modern/global/box.css +++ b/themes/modern/global/box.css @@ -9,6 +9,7 @@ titledbox title { margin : 0px 6px 2px 6px; + padding : 0px 3px 0px 3px; } .titledbox-body @@ -17,10 +18,6 @@ title padding : inherit; } -title > text { - margin : 0px 3px 0px 3px; -} - /** box formatting **/ box[autostretch="never"] { diff --git a/themes/modern/global/makefile.win b/themes/modern/global/makefile.win index f4ec27c49b9b..74129d77ac25 100644 --- a/themes/modern/global/makefile.win +++ b/themes/modern/global/makefile.win @@ -76,6 +76,9 @@ install:: $(MAKE_INSTALL) menu-check-disabled.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) menu-check-hover.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) menu-check.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin + $(MAKE_INSTALL) menu-radio-disabled.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin + $(MAKE_INSTALL) menu-radio-hover.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin + $(MAKE_INSTALL) menu-radio.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) menu.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) menubutton.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin $(MAKE_INSTALL) menulist.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin diff --git a/themes/modern/global/menu-radio-disabled.gif b/themes/modern/global/menu-radio-disabled.gif new file mode 100644 index 000000000000..13b5162ff960 Binary files /dev/null and b/themes/modern/global/menu-radio-disabled.gif differ diff --git a/themes/modern/global/menu-radio-hover.gif b/themes/modern/global/menu-radio-hover.gif new file mode 100644 index 000000000000..923630ecaf79 Binary files /dev/null and b/themes/modern/global/menu-radio-hover.gif differ diff --git a/themes/modern/global/menu-radio.gif b/themes/modern/global/menu-radio.gif new file mode 100644 index 000000000000..13b5162ff960 Binary files /dev/null and b/themes/modern/global/menu-radio.gif differ diff --git a/themes/modern/global/menu.css b/themes/modern/global/menu.css index 7e5c79079b61..afff4416ece0 100644 --- a/themes/modern/global/menu.css +++ b/themes/modern/global/menu.css @@ -159,6 +159,21 @@ menuitem[checked="true"][menuactive="true"] list-style-image : url("chrome://global/skin/menu-check-hover.gif"); } +menuitem[checked="true"][type="radio"] + { + list-style-image : url("chrome://global/skin/menu-radio.gif"); + } + +menuitem[checked="true"][type="radio"][disabled="true"] + { + list-style-image : url("chrome://global/skin/menu-radio-disabled.gif"); + } + +menuitem[checked="true"][type="radio"][menuactive="true"] + { + list-style-image : url("chrome://global/skin/menu-radio-hover.gif"); + } + .menu-right[disabled="true"] { list-style-image : url("chrome://global/skin/menu-arrow-disabled.gif"); diff --git a/themes/modern/jar.mn b/themes/modern/jar.mn index cd24c806dee7..be579edb354c 100644 --- a/themes/modern/jar.mn +++ b/themes/modern/jar.mn @@ -79,6 +79,9 @@ skins/modern.jar: global/skin/menu-check-disabled.gif (global/menu-check-disabled.gif) global/skin/menu-check-hover.gif (global/menu-check-hover.gif) global/skin/menu-check.gif (global/menu-check.gif) + global/skin/menu-radio-disabled.gif (global/menu-radio-disabled.gif) + global/skin/menu-radio-hover.gif (global/menu-radio-hover.gif) + global/skin/menu-radio.gif (global/menu-radio.gif) global/skin/menu.css (global/menu.css) global/skin/menubutton.css (global/menubutton.css) global/skin/menulist.css (global/menulist.css)