Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed images for editmode toolbar, part of bug 47515. r=sfraser

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@75945 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cmanske%netscape.com 2000-08-10 02:11:00 +00:00
parent 4483c01929
commit 838e3690e4
16 changed files with 59 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
mozilla/themes/classic/editor/EditorToolbars.css
View File

@ -39,10 +39,6 @@
margin-right: 3px; margin-right: 3px;
} }
/* From button.css: */
/* margin: 4px 7px 1px 1px; */
/* We have too many buttons - must be closer! */
.toolbar, .key-toolbar { .toolbar, .key-toolbar {
margin-right: 2px; margin-right: 2px;
} }
@ -56,8 +52,6 @@
text-align: center; text-align: center;
} }
/* end of SHOULD GO IN GLOBAL */
#EditModeToolbar { #EditModeToolbar {
padding: 0px; padding: 0px;
/* Same as "standard" toolbar background */ /* Same as "standard" toolbar background */
@ -69,32 +63,32 @@
background-color: #999999; background-color: #999999;
overflow: hidden; overflow: hidden;
} }
/* BORDERS ARE NOT WORKING! global class="plain" is fighting us! */
button.edit-mode:hover, button.edit-mode:hover:active, button.edit-mode:hover, button.edit-mode:hover:active,
button.edit-mode { button.edit-mode {
-moz-border-radius: 0px 0px 7px 7px; /* We need this to suppress Ben's different bindings for classic buttons */
padding: 0px 4px 1px 4px; behavior : url(chrome://global/content/xulBindings.xml#buttonleft);
margin: 0px; -moz-border-radius: 0px 0px 8px 8px;
padding: 1px 5px 1px 4px;
margin: 0px 1px;
color: black; color: black;
background-color: #CCCCCC; background-color: #CCCCCC;
border-top: 1px solid #CCCCCC; /* Must be same as background */ border-top: 0px;
border-bottom: 1px solid #666666; border-bottom: 1px solid #666666;
border-left: 1px solid white; border-left: 1px solid white;
border-right: 1px solid #666666; border-right: 1px solid #666666;
} }
button.edit-mode:hover { button.edit-mode:hover {
border: 1px solid white; border: 1px solid black;
border-top: 0px;
} }
button.edit-mode:hover:active { button.edit-mode:hover:active {
padding: 1px 5px 0px 3px; padding: 2px 4px 0px 5px;
border: 1px solid white;
} }
button.edit-mode[selected="1"] { button.edit-mode[selected="1"] {
padding: 0px 4px 1px 4px;
margin: -1px 0px 0px 0px;
/* Not resizing well! - use color instead /* Not resizing well! - use color instead
font-weight: bold; font-weight: bold;
*/ */
@ -103,33 +97,39 @@ button.edit-mode[selected="1"] {
button.edit-mode[selected="1"]:active, button.edit-mode[selected="1"]:active,
button.edit-mode[selected="1"]:hover: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); 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); 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); 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); 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 { /* Needed to suppress inner box settings - same as button.plain
border: 1px solid white; (we can't use 'plain', else we get no outer borders!)
} */
button.edit-mode:hover:active > .button-internal-box,
#ToggleEditModeType:hover:active { button.edit-mode > .button-internal-box,
border: 1px inset #CCCCCC; 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 */ /* Image URLs for all Editor toolbar buttons */

1
mozilla/themes/classic/editor/images/MANIFEST
View File

@ -139,4 +139,3 @@ editmode-normal.gif
editmode-tags.gif editmode-tags.gif
editmode-html.gif editmode-html.gif
editmode-preview.gif editmode-preview.gif
editmode-toggle.gif

1
mozilla/themes/classic/editor/images/Makefile.in
View File

@ -175,7 +175,6 @@ EXPORT_RESOURCE_SAMPLES_2 = \
editmode-tags.gif \ editmode-tags.gif \
editmode-html.gif \ editmode-html.gif \
editmode-preview.gif \ editmode-preview.gif \
editmode-toggle.gif \
$(NULL) $(NULL)
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

BIN
mozilla/themes/classic/editor/images/editmode-html.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 117 B

After

Width:  |  Height:  |  Size: 131 B

BIN
mozilla/themes/classic/editor/images/editmode-normal.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 103 B

After

Width:  |  Height:  |  Size: 98 B

BIN
mozilla/themes/classic/editor/images/editmode-preview.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 126 B

After

Width:  |  Height:  |  Size: 124 B

BIN
mozilla/themes/classic/editor/images/editmode-tags.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 138 B

After

Width:  |  Height:  |  Size: 153 B

1
mozilla/themes/classic/editor/images/makefile.win
View File

@ -169,4 +169,3 @@ install::
$(MAKE_INSTALL) editmode-tags.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images $(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-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-preview.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
$(MAKE_INSTALL) editmode-toggle.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images

58
mozilla/themes/modern/editor/EditorToolbars.css
View File

@ -39,10 +39,6 @@
margin-right: 3px; margin-right: 3px;
} }
/* From button.css: */
/* margin: 4px 7px 1px 1px; */
/* We have too many buttons - must be closer! */
.toolbar, .key-toolbar { .toolbar, .key-toolbar {
margin-right: 2px; margin-right: 2px;
} }
@ -56,8 +52,6 @@
text-align: center; text-align: center;
} }
/* end of SHOULD GO IN GLOBAL */
#EditModeToolbar { #EditModeToolbar {
padding: 0px; padding: 0px;
/* Same as "standard" toolbar background */ /* Same as "standard" toolbar background */
@ -69,15 +63,15 @@
background-color: #999999; background-color: #999999;
overflow: hidden; overflow: hidden;
} }
/* BORDERS ARE NOT WORKING! global class="plain" is fighting us! */
button.edit-mode:hover, button.edit-mode:hover:active, button.edit-mode:hover, button.edit-mode:hover:active,
button.edit-mode { button.edit-mode {
-moz-border-radius: 0px 0px 7px 7px; -moz-border-radius: 0px 0px 8px 8px;
padding: 0px 4px 1px 4px; padding: 1px 5px 1px 4px;
margin: 0px; margin: 0px 1px;
color: black; color: black;
background-color: #CCCCCC; background-color: #CCCCCC;
border-top: 1px solid #CCCCCC; /* Must be same as background */ border-top: 0px;
border-bottom: 1px solid #666666; border-bottom: 1px solid #666666;
border-left: 1px solid white; border-left: 1px solid white;
border-right: 1px solid #666666; border-right: 1px solid #666666;
@ -85,16 +79,14 @@ button.edit-mode {
button.edit-mode:hover { button.edit-mode:hover {
border: 1px solid white; border: 1px solid white;
border-top: 0px;
} }
button.edit-mode:hover:active { button.edit-mode:hover:active {
padding: 1px 5px 0px 3px; padding: 2px 4px 0px 5px;
border: 1px solid white;
} }
button.edit-mode[selected="1"] { button.edit-mode[selected="1"] {
padding: 0px 4px 1px 4px;
margin: -1px 0px 0px 0px;
/* Not resizing well! - use color instead /* Not resizing well! - use color instead
font-weight: bold; font-weight: bold;
*/ */
@ -103,33 +95,39 @@ button.edit-mode[selected="1"] {
button.edit-mode[selected="1"]:active, button.edit-mode[selected="1"]:active,
button.edit-mode[selected="1"]:hover: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); 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); 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); 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); 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 { /* Needed to suppress inner box settings - same as button.plain
border: 1px solid white; (we can't use 'plain', else we get no outer borders!)
} */
button.edit-mode:hover:active > .button-internal-box,
#ToggleEditModeType:hover:active { button.edit-mode > .button-internal-box,
border: 1px inset #CCCCCC; 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 */ /* Image URLs for all Editor toolbar buttons */

1
mozilla/themes/modern/editor/images/MANIFEST
View File

@ -58,4 +58,3 @@ editmode-normal.gif
editmode-tags.gif editmode-tags.gif
editmode-html.gif editmode-html.gif
editmode-preview.gif editmode-preview.gif
editmode-toggle.gif

1
mozilla/themes/modern/editor/images/Makefile.in
View File

@ -90,7 +90,6 @@ EXPORT_RESOURCE_SAMPLES = \
editmode-tags.gif \ editmode-tags.gif \
editmode-html.gif \ editmode-html.gif \
editmode-preview.gif \ editmode-preview.gif \
editmode-toggle.gif \
$(NULL) $(NULL)
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

BIN
mozilla/themes/modern/editor/images/editmode-html.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 117 B

After

Width:  |  Height:  |  Size: 131 B

BIN
mozilla/themes/modern/editor/images/editmode-normal.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 103 B

After

Width:  |  Height:  |  Size: 98 B

BIN
mozilla/themes/modern/editor/images/editmode-preview.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 126 B

After

Width:  |  Height:  |  Size: 124 B

BIN
mozilla/themes/modern/editor/images/editmode-tags.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 138 B

After

Width:  |  Height:  |  Size: 153 B

1
mozilla/themes/modern/editor/images/makefile.win
View File

@ -88,4 +88,3 @@ install::
$(MAKE_INSTALL) editmode-tags.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images $(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-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-preview.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images
$(MAKE_INSTALL) editmode-toggle.gif $(DIST)\bin\chrome\skins\$(THEME)\editor\skin\images