From 838e3690e44461c7eb47fcf6bf7bcbcdbfaa0669 Mon Sep 17 00:00:00 2001 From: "cmanske%netscape.com" Date: Thu, 10 Aug 2000 02:11:00 +0000 Subject: [PATCH] Changed images for editmode toolbar, part of bug 47515. r=sfraser git-svn-id: svn://10.0.0.236/trunk@75945 18797224-902f-48f8-a5cc-f745e15eee43 --- .../themes/classic/editor/EditorToolbars.css | 62 +++++++++--------- mozilla/themes/classic/editor/images/MANIFEST | 1 - .../themes/classic/editor/images/Makefile.in | 1 - .../classic/editor/images/editmode-html.gif | Bin 117 -> 131 bytes .../classic/editor/images/editmode-normal.gif | Bin 103 -> 98 bytes .../editor/images/editmode-preview.gif | Bin 126 -> 124 bytes .../classic/editor/images/editmode-tags.gif | Bin 138 -> 153 bytes .../themes/classic/editor/images/makefile.win | 1 - .../themes/modern/editor/EditorToolbars.css | 58 ++++++++-------- mozilla/themes/modern/editor/images/MANIFEST | 1 - .../themes/modern/editor/images/Makefile.in | 1 - .../modern/editor/images/editmode-html.gif | Bin 117 -> 131 bytes .../modern/editor/images/editmode-normal.gif | Bin 103 -> 98 bytes .../modern/editor/images/editmode-preview.gif | Bin 126 -> 124 bytes .../modern/editor/images/editmode-tags.gif | Bin 138 -> 153 bytes .../themes/modern/editor/images/makefile.win | 1 - 16 files changed, 59 insertions(+), 67 deletions(-) diff --git a/mozilla/themes/classic/editor/EditorToolbars.css b/mozilla/themes/classic/editor/EditorToolbars.css index 24f8aa43b6e..40754b085ef 100644 --- a/mozilla/themes/classic/editor/EditorToolbars.css +++ b/mozilla/themes/classic/editor/EditorToolbars.css @@ -39,10 +39,6 @@ margin-right: 3px; } -/* From button.css: */ -/* margin: 4px 7px 1px 1px; */ -/* We have too many buttons - must be closer! */ - .toolbar, .key-toolbar { margin-right: 2px; } @@ -56,8 +52,6 @@ text-align: center; } -/* end of SHOULD GO IN GLOBAL */ - #EditModeToolbar { padding: 0px; /* Same as "standard" toolbar background */ @@ -69,32 +63,32 @@ background-color: #999999; overflow: hidden; } -/* BORDERS ARE NOT WORKING! global class="plain" is fighting us! */ + button.edit-mode:hover, button.edit-mode:hover:active, button.edit-mode { - -moz-border-radius: 0px 0px 7px 7px; - padding: 0px 4px 1px 4px; - margin: 0px; + /* We need this to suppress Ben's different bindings for classic buttons */ + behavior : url(chrome://global/content/xulBindings.xml#buttonleft); + -moz-border-radius: 0px 0px 8px 8px; + padding: 1px 5px 1px 4px; + margin: 0px 1px; color: black; background-color: #CCCCCC; - border-top: 1px solid #CCCCCC; /* Must be same as background */ + border-top: 0px; border-bottom: 1px solid #666666; border-left: 1px solid white; border-right: 1px solid #666666; } button.edit-mode:hover { - border: 1px solid white; + border: 1px solid black; + border-top: 0px; } button.edit-mode:hover:active { - padding: 1px 5px 0px 3px; - border: 1px solid white; + padding: 2px 4px 0px 5px; } button.edit-mode[selected="1"] { - padding: 0px 4px 1px 4px; - margin: -1px 0px 0px 0px; /* Not resizing well! - use color instead font-weight: bold; */ @@ -103,33 +97,39 @@ button.edit-mode[selected="1"] { button.edit-mode[selected="1"]:active, button.edit-mode[selected="1"]:hover:active { - padding: 1px 5px 0px 3px; + padding: 2px 4px 0px 5px; } -#NormalModeButton[type="image"] { +#NormalModeButton { list-style-image:url(chrome://editor/skin/images/editmode-normal.gif); } -#TagModeButton[type="image"] { +#TagModeButton { list-style-image:url(chrome://editor/skin/images/editmode-tags.gif); } -#SourceModeButton[type="image"] { +#SourceModeButton { list-style-image:url(chrome://editor/skin/images/editmode-html.gif); } -#PreviewModeButton[type="image"] { +#PreviewModeButton { list-style-image:url(chrome://editor/skin/images/editmode-preview.gif); } -#ToggleEditModeType { - list-style-image:url(chrome://editor/skin/images/editmode-toggle.gif); - border: 1px outset #CCCCCC; -} -#ToggleEditModeType:hover { - border: 1px solid white; -} - -#ToggleEditModeType:hover:active { - border: 1px inset #CCCCCC; +/* Needed to suppress inner box settings - same as button.plain + (we can't use 'plain', else we get no outer borders!) +*/ +button.edit-mode:hover:active > .button-internal-box, +button.edit-mode > .button-internal-box, +button.edit-mode > .button-internal-box:hover:active, +button.edit-mode > .button-internal-box > .button-text-container, +button.edit-mode > .button-internal-box > .button-text-container:hover:active, +button.edit-mode > .button-internal-box > .button-text-container > .button-text, +button.edit-mode > .button-internal-box > .button-text-container > .button.text:hover:active, +button.edit-mode > .button-internal-box > .button-icon, +button.edit-mode > .button-internal-box > .button.icon:hover:active +{ + border : 0px ! important; + margin : 0px; + padding : 0px; } /* Image URLs for all Editor toolbar buttons */ diff --git a/mozilla/themes/classic/editor/images/MANIFEST b/mozilla/themes/classic/editor/images/MANIFEST index e8f08bed743..3a7ab623b85 100644 --- a/mozilla/themes/classic/editor/images/MANIFEST +++ b/mozilla/themes/classic/editor/images/MANIFEST @@ -139,4 +139,3 @@ editmode-normal.gif editmode-tags.gif editmode-html.gif editmode-preview.gif -editmode-toggle.gif diff --git a/mozilla/themes/classic/editor/images/Makefile.in b/mozilla/themes/classic/editor/images/Makefile.in index c1c1160d7e3..c9cb7c8d4f7 100644 --- a/mozilla/themes/classic/editor/images/Makefile.in +++ b/mozilla/themes/classic/editor/images/Makefile.in @@ -175,7 +175,6 @@ EXPORT_RESOURCE_SAMPLES_2 = \ editmode-tags.gif \ editmode-html.gif \ editmode-preview.gif \ - editmode-toggle.gif \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/themes/classic/editor/images/editmode-html.gif b/mozilla/themes/classic/editor/images/editmode-html.gif index bdbc6dcde14090907d820f72243df9c353282c2c..c354a9a2466e109dd4f2cf6b88f7b903f321e499 100644 GIT binary patch literal 131 zcmZ?wbhEHbRA=B}nE0RJ|Ns9C#%UmufkE*ewyN} Sys`YC;mosPC96Cb7_0#cOfPo; diff --git a/mozilla/themes/classic/editor/images/editmode-normal.gif b/mozilla/themes/classic/editor/images/editmode-normal.gif index 2d61e6a5b5a5a5673a99d821572cc09f338ccb26..60ed37e5fba774c8e5116d9e5ad1b381abca0a5b 100644 GIT binary patch delta 62 zcmV-E0KxxfVh2Y_MmRZP5s?QgFcAO@0009gSh_+qrNKp|YlPN^ou-`QOrO#{B_pC~ Uw36xDnuRwj_U*#0q$>#kJD9o{=Kufz delta 67 zcmV-J0KETVX9q_~MmRZPAdv?vH6Q>C0009lSi0Q)Fv>}r7^CVzde53A2n)FoVR3nE Z`+*YY&K{<%bel3G=I_9uaHvTD06Pug8Xy1w diff --git a/mozilla/themes/classic/editor/images/editmode-preview.gif b/mozilla/themes/classic/editor/images/editmode-preview.gif index 8c3d8a00ed3cdc254353ff40a559f69e4bee4596..8538cbf4d70a335486507edeac275f8cb9302b48 100644 GIT binary patch delta 88 zcmV-e0H^JkAOW;Oe*h#F3BwYh*yN@QvIvT>#gN_NLc0027!(H~U+ delta 90 zcmV-g0HyzYeg{WMMmRZPAdv?vOdtRZ0009+Si0OZEy}qDA&_d7>+Kw0uJ7O^d7 wYPR3XzRDF8ueh2wjbAc`>t)LYYnUJL6O)lRpH${4Yc^9*RW*tAWF-jzI|q&H&zwn{Ig`OS?f?J(3^1VhpWD&J-^ta=GssZSfa%^_ z2F0H&j0_Ac3_2hsAl(eiJ|4U7yi-2qnJumG`s{WIo@s%LMRFK-bVO=p9G<;s)gdOm zKTI2^wQZ60zm|QKV|$FIkifq%nMMJHsh6A@*OZ;UTPHQY>ju-hS?4p{m>8@9+AKIa literal 138 zcmZ?wbhEHbRAAs?Sj5Wk|NohpXU@!=IWukMOa|k$|Ns9pfPvyq7DfgJRt6mq52TiX z**{{}oqro9c&^?XD0pD^|9cK8(&;m&iuVMbT)`%zF3Fdm{wI o8PvT0PT+S+u#)9j!MIvf`;>^wbc187b!VSvUSGA=gMq;s040t#2mk;8 diff --git a/mozilla/themes/classic/editor/images/makefile.win b/mozilla/themes/classic/editor/images/makefile.win index 93a969cbcb6..256a392a681 100644 --- a/mozilla/themes/classic/editor/images/makefile.win +++ b/mozilla/themes/classic/editor/images/makefile.win @@ -169,4 +169,3 @@ install:: $(MAKE_INSTALL) editmode-tags.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images $(MAKE_INSTALL) editmode-html.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images $(MAKE_INSTALL) editmode-preview.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images - $(MAKE_INSTALL) editmode-toggle.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images diff --git a/mozilla/themes/modern/editor/EditorToolbars.css b/mozilla/themes/modern/editor/EditorToolbars.css index 8b2771ece91..527332f4c29 100644 --- a/mozilla/themes/modern/editor/EditorToolbars.css +++ b/mozilla/themes/modern/editor/EditorToolbars.css @@ -39,10 +39,6 @@ margin-right: 3px; } -/* From button.css: */ -/* margin: 4px 7px 1px 1px; */ -/* We have too many buttons - must be closer! */ - .toolbar, .key-toolbar { margin-right: 2px; } @@ -56,8 +52,6 @@ text-align: center; } -/* end of SHOULD GO IN GLOBAL */ - #EditModeToolbar { padding: 0px; /* Same as "standard" toolbar background */ @@ -69,15 +63,15 @@ background-color: #999999; overflow: hidden; } -/* BORDERS ARE NOT WORKING! global class="plain" is fighting us! */ + button.edit-mode:hover, button.edit-mode:hover:active, button.edit-mode { - -moz-border-radius: 0px 0px 7px 7px; - padding: 0px 4px 1px 4px; - margin: 0px; + -moz-border-radius: 0px 0px 8px 8px; + padding: 1px 5px 1px 4px; + margin: 0px 1px; color: black; background-color: #CCCCCC; - border-top: 1px solid #CCCCCC; /* Must be same as background */ + border-top: 0px; border-bottom: 1px solid #666666; border-left: 1px solid white; border-right: 1px solid #666666; @@ -85,16 +79,14 @@ button.edit-mode { button.edit-mode:hover { border: 1px solid white; + border-top: 0px; } button.edit-mode:hover:active { - padding: 1px 5px 0px 3px; - border: 1px solid white; + padding: 2px 4px 0px 5px; } button.edit-mode[selected="1"] { - padding: 0px 4px 1px 4px; - margin: -1px 0px 0px 0px; /* Not resizing well! - use color instead font-weight: bold; */ @@ -103,33 +95,39 @@ button.edit-mode[selected="1"] { button.edit-mode[selected="1"]:active, button.edit-mode[selected="1"]:hover:active { - padding: 1px 5px 0px 3px; + padding: 2px 4px 0px 5px; } -#NormalModeButton[type="image"] { +#NormalModeButton { list-style-image:url(chrome://editor/skin/images/editmode-normal.gif); } -#TagModeButton[type="image"] { +#TagModeButton { list-style-image:url(chrome://editor/skin/images/editmode-tags.gif); } -#SourceModeButton[type="image"] { +#SourceModeButton { list-style-image:url(chrome://editor/skin/images/editmode-html.gif); } -#PreviewModeButton[type="image"] { +#PreviewModeButton { list-style-image:url(chrome://editor/skin/images/editmode-preview.gif); } -#ToggleEditModeType { - list-style-image:url(chrome://editor/skin/images/editmode-toggle.gif); - border: 1px outset #CCCCCC; -} -#ToggleEditModeType:hover { - border: 1px solid white; -} - -#ToggleEditModeType:hover:active { - border: 1px inset #CCCCCC; +/* Needed to suppress inner box settings - same as button.plain + (we can't use 'plain', else we get no outer borders!) +*/ +button.edit-mode:hover:active > .button-internal-box, +button.edit-mode > .button-internal-box, +button.edit-mode > .button-internal-box:hover:active, +button.edit-mode > .button-internal-box > .button-text-container, +button.edit-mode > .button-internal-box > .button-text-container:hover:active, +button.edit-mode > .button-internal-box > .button-text-container > .button-text, +button.edit-mode > .button-internal-box > .button-text-container > .button.text:hover:active, +button.edit-mode > .button-internal-box > .button-icon, +button.edit-mode > .button-internal-box > .button.icon:hover:active +{ + border : 0px ! important; + margin : 0px; + padding : 0px; } /* Image URLs for all Editor toolbar buttons */ diff --git a/mozilla/themes/modern/editor/images/MANIFEST b/mozilla/themes/modern/editor/images/MANIFEST index 82d6b14f0d7..40205821a81 100644 --- a/mozilla/themes/modern/editor/images/MANIFEST +++ b/mozilla/themes/modern/editor/images/MANIFEST @@ -58,4 +58,3 @@ editmode-normal.gif editmode-tags.gif editmode-html.gif editmode-preview.gif -editmode-toggle.gif diff --git a/mozilla/themes/modern/editor/images/Makefile.in b/mozilla/themes/modern/editor/images/Makefile.in index 611a51e7ce1..b0cf4995bbe 100644 --- a/mozilla/themes/modern/editor/images/Makefile.in +++ b/mozilla/themes/modern/editor/images/Makefile.in @@ -90,7 +90,6 @@ EXPORT_RESOURCE_SAMPLES = \ editmode-tags.gif \ editmode-html.gif \ editmode-preview.gif \ - editmode-toggle.gif \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/themes/modern/editor/images/editmode-html.gif b/mozilla/themes/modern/editor/images/editmode-html.gif index bdbc6dcde14090907d820f72243df9c353282c2c..c354a9a2466e109dd4f2cf6b88f7b903f321e499 100644 GIT binary patch literal 131 zcmZ?wbhEHbRA=B}nE0RJ|Ns9C#%UmufkE*ewyN} Sys`YC;mosPC96Cb7_0#cOfPo; diff --git a/mozilla/themes/modern/editor/images/editmode-normal.gif b/mozilla/themes/modern/editor/images/editmode-normal.gif index 2d61e6a5b5a5a5673a99d821572cc09f338ccb26..60ed37e5fba774c8e5116d9e5ad1b381abca0a5b 100644 GIT binary patch delta 62 zcmV-E0KxxfVh2Y_MmRZP5s?QgFcAO@0009gSh_+qrNKp|YlPN^ou-`QOrO#{B_pC~ Uw36xDnuRwj_U*#0q$>#kJD9o{=Kufz delta 67 zcmV-J0KETVX9q_~MmRZPAdv?vH6Q>C0009lSi0Q)Fv>}r7^CVzde53A2n)FoVR3nE Z`+*YY&K{<%bel3G=I_9uaHvTD06Pug8Xy1w diff --git a/mozilla/themes/modern/editor/images/editmode-preview.gif b/mozilla/themes/modern/editor/images/editmode-preview.gif index 8c3d8a00ed3cdc254353ff40a559f69e4bee4596..8538cbf4d70a335486507edeac275f8cb9302b48 100644 GIT binary patch delta 88 zcmV-e0H^JkAOW;Oe*h#F3BwYh*yN@QvIvT>#gN_NLc0027!(H~U+ delta 90 zcmV-g0HyzYeg{WMMmRZPAdv?vOdtRZ0009+Si0OZEy}qDA&_d7>+Kw0uJ7O^d7 wYPR3XzRDF8ueh2wjbAc`>t)LYYnUJL6O)lRpH${4Yc^9*RW*tAWF-jzI|q&H&zwn{Ig`OS?f?J(3^1VhpWD&J-^ta=GssZSfa%^_ z2F0H&j0_Ac3_2hsAl(eiJ|4U7yi-2qnJumG`s{WIo@s%LMRFK-bVO=p9G<;s)gdOm zKTI2^wQZ60zm|QKV|$FIkifq%nMMJHsh6A@*OZ;UTPHQY>ju-hS?4p{m>8@9+AKIa literal 138 zcmZ?wbhEHbRAAs?Sj5Wk|NohpXU@!=IWukMOa|k$|Ns9pfPvyq7DfgJRt6mq52TiX z**{{}oqro9c&^?XD0pD^|9cK8(&;m&iuVMbT)`%zF3Fdm{wI o8PvT0PT+S+u#)9j!MIvf`;>^wbc187b!VSvUSGA=gMq;s040t#2mk;8 diff --git a/mozilla/themes/modern/editor/images/makefile.win b/mozilla/themes/modern/editor/images/makefile.win index 386337cbb25..316f417f6ac 100644 --- a/mozilla/themes/modern/editor/images/makefile.win +++ b/mozilla/themes/modern/editor/images/makefile.win @@ -88,4 +88,3 @@ install:: $(MAKE_INSTALL) editmode-tags.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images $(MAKE_INSTALL) editmode-html.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images $(MAKE_INSTALL) editmode-preview.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images - $(MAKE_INSTALL) editmode-toggle.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images