mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

New smileys bug-4013 r=andreww sr=hewitt

This commit is contained in:
anatoliya%netscape.com 2001-04-07 05:49:24 +00:00
Родитель ad27a1d796
Коммит 00d4b9b9fe
12 изменённых файлов: 208 добавлений и 179 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
editor/jar.mn
Просмотреть файл

@ -136,6 +136,13 @@ comm.jar:
content/editor/images/sick.gif (ui/composer/content/images/sick.gif)
content/editor/images/s_frown.gif (ui/composer/content/images/s_frown.gif)
content/editor/images/s_wink.gif (ui/composer/content/images/s_wink.gif)
content/editor/images/smile_n.gif (ui/composer/content/images/smile_n.gif)
content/editor/images/frown_n.gif (ui/composer/content/images/frown_n.gif)
content/editor/images/wink_n.gif (ui/composer/content/images/wink_n.gif)
content/editor/images/tongue_n.gif (ui/composer/content/images/tongue_n.gif)
content/editor/images/laughing_n.gif (ui/composer/content/images/laughing_n.gif)
content/editor/images/embarrassed_n.gif (ui/composer/content/images/embarrassed_n.gif)
content/editor/images/undecided_n.gif (ui/composer/content/images/undecided_n.gif)
content/editor/EdDialogCommon.js (ui/dialogs/content/EdDialogCommon.js)
content/editor/EdLinkProps.xul (ui/dialogs/content/EdLinkProps.xul)
content/editor/EdLinkProps.js (ui/dialogs/content/EdLinkProps.js)

8
editor/ui/composer/content/ComposerCommands.js
Просмотреть файл

@ -897,13 +897,13 @@ var nsSetSmiley =
break;
case ";-)": strSml="s3";
break;
case ";-P": strSml="s4";
case ":-P": strSml="s4";
break;
case ":)": strSml="s5";
case ":-D": strSml="s5";
break;
case ":(": strSml="s6";
case ":-[": strSml="s6";
break;
case ";)": strSml="s7";
case ":-\\": strSml="s7";
break;
default: strSml="";
break;

14
editor/ui/composer/content/EditorContent.css
Просмотреть файл

@ -70,34 +70,34 @@ span[-moz-smiley] > span {
span[-moz-smiley="s1"] {
background-image: url(chrome://editor/content/images/smile.gif);
background-image: url(chrome://editor/content/images/smile_n.gif);
}
span[-moz-smiley="s2"] {
background-image: url(chrome://editor/content/images/frown.gif);
background-image: url(chrome://editor/content/images/frown_n.gif);
}
span[-moz-smiley="s3"] {
background-image: url(chrome://editor/content/images/wink.gif);
background-image: url(chrome://editor/content/images/wink_n.gif);
}
span[-moz-smiley="s4"] {
background-image: url(chrome://editor/content/images/sick.gif);
background-image: url(chrome://editor/content/images/tongue_n.gif);
}
span[-moz-smiley="s5"] {
background-image: url(chrome://editor/content/images/s_smile.gif);
background-image: url(chrome://editor/content/images/laughing_n.gif);
}
span[-moz-smiley="s6"] {
background-image: url(chrome://editor/content/images/s_frown.gif);
background-image: url(chrome://editor/content/images/embarrassed_n.gif);
}
span[-moz-smiley="s7"] {
background-image: url(chrome://editor/content/images/s_wink.gif);
background-image: url(chrome://editor/content/images/undecided_n.gif);
}

48
editor/ui/composer/content/editorOverlay.xul
Просмотреть файл

@ -107,7 +107,7 @@
<command id="cmd_objectProperties" oncommand="goDoCommand('cmd_objectProperties')"/>
<command id="cmd_insertChars" oncommand="goDoCommand('cmd_insertChars')" label="&insertCharsCmd.label;"/>
<command id="cmd_insertHTML" oncommand="goDoCommand('cmd_insertHTML')" label="&insertHTMLCmd.label;"/>
<command id="cmd_smiley" state="" oncommand="goDoCommand('cmd_smiley')"/>
<command id="cmd_smiley" state="" />
<command id="cmd_insertBreak" oncommand="goDoCommand('cmd_insertBreak')"/>
<command id="cmd_insertBreakAll" oncommand="goDoCommand('cmd_insertBreakAll')"/>
<command id="cmd_NormalMode" oncommand="goDoCommand('cmd_NormalMode')" label="&NormalMode.label;"/>
@ -553,34 +553,26 @@
<!-- smiley menu -->
<menu id="smileButtonMenu" tooltip="aTooltip" tooltiptext="&SmileButton.tooltip;">
<button class="button-toolbar" id="smileButton">
</button>
<menupopup id="smilyPopup" flex="100%">
<menuitem oncommand="doStatefulCommand('cmd_smiley', ':-)' )">
<button class="plain" id="insert-smile" align="left" label="&smiley1Cmd.label;"/>
</menuitem>
<menuitem oncommand="doStatefulCommand('cmd_smiley', ':-(' )">
<button class="plain" id="insert-frown" align="left" label="&smiley2Cmd.label;"/>
</menuitem>
<menuitem oncommand="doStatefulCommand('cmd_smiley', ';-)' )">
<button class="plain" id="insert-wink" align="left" label="&smiley3Cmd.label;"/>
</menuitem>
<menuitem oncommand="doStatefulCommand('cmd_smiley', ':-P' )">
<button class="plain" id="insert-sick" align="left" label="&smiley4Cmd.label;"/>
</menuitem>
<menuitem oncommand="doStatefulCommand('cmd_smiley', ':)' )">
<button class="plain" id="insert-smile5" align="left" label="&smiley5Cmd.label;"/>
</menuitem>
<menuitem oncommand="doStatefulCommand('cmd_smiley', ':(' )">
<button class="plain" id="insert-smile6" align="left" label="&smiley6Cmd.label;"/>
</menuitem>
<menuitem oncommand="doStatefulCommand('cmd_smiley', ';)' )">
<button class="plain" id="insert-smile7" align="left" label="&smiley7Cmd.label;"/>
</menuitem>
<spring flex="100%" />
<menubutton id="smileButtonMenu" class="button-toolbar" observes="cmd_smiley"
tooltip="aTooltip" tooltiptext="&SmileButton.tooltip;">
<menupopup id="smilyPopup">
<menuitem class="smiley insert-smile menuitem-iconic" label="&smiley1Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-)' )" />
<menuitem class="smiley insert-frown menuitem-iconic" label="&smiley2Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-(' )" />
<menuitem class="smiley insert-wink menuitem-iconic" label="&smiley3Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ';-)' )" />
<menuitem class="smiley insert-tongue menuitem-iconic" label="&smiley4Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-P' )" />
<menuitem class="smiley insert-laughing menuitem-iconic" label="&smiley5Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-D' )" />
<menuitem class="smiley insert-embarrassed menuitem-iconic" label="&smiley6Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-[' )" />
<menuitem class="smiley insert-undecided menuitem-iconic" label="&smiley7Cmd.label;"
oncommand="doStatefulCommand('cmd_smiley', ':-\\' )" />
</menupopup>
</menu>
</menubutton>
<!-- this is only used in mailnews -->
<menubutton id="AlignPopupButton" class="button-toolbar" observes="cmd_align"

15
editor/ui/composer/locale/en-US/editorOverlay.dtd
Просмотреть файл

@ -613,13 +613,14 @@
<!ENTITY PreviewMode.tooltip "Display as WYSIWYG (as in Navigator)">
<!-- Smiley Menu items -->
<!ENTITY smiley1Cmd.label " Smile ">
<!ENTITY smiley2Cmd.label " Frown ">
<!ENTITY smiley3Cmd.label " Wink ">
<!ENTITY smiley4Cmd.label " Sick ">
<!ENTITY smiley5Cmd.label " Short smile">
<!ENTITY smiley6Cmd.label " Short frown">
<!ENTITY smiley7Cmd.label " Short wink ">
<!ENTITY smiley1Cmd.label "Smile">
<!ENTITY smiley2Cmd.label "Frown">
<!ENTITY smiley3Cmd.label "Wink">
<!ENTITY smiley4Cmd.label "Tongue-out">
<!ENTITY smiley5Cmd.label "Laughing">
<!ENTITY smiley6Cmd.label "Embarrassed">
<!ENTITY smiley7Cmd.label "Undecided">
<!ENTITY SmileButton.tooltip "Choose smiley face">

30
netwerk/streamconv/converters/mozTXTToHTMLConv.cpp
Просмотреть файл

@ -681,13 +681,14 @@ mozTXTToHTMLConv::GlyphHit(const PRUnichar * aInString, PRInt32 aInLength, PRBoo
)
&&
(
SmilyHit(aInString, aInLength, col0, ":-)", 3, "<img src=\"chrome://editor/content/images/smile.gif\" alt=\":-)\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
SmilyHit(aInString, aInLength, col0, ":)", 2, "<img src=\"chrome://editor/content/images/s_smile.gif\" alt=\":)\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
SmilyHit(aInString, aInLength, col0, ":-(", 3, "<img src=\"chrome://editor/content/images/frown.gif\" alt=\":-(\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
SmilyHit(aInString, aInLength, col0, ":(", 2, "<img src=\"chrome://editor/content/images/s_frown.gif\" alt=\":(\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
SmilyHit(aInString, aInLength, col0, ";-)", 3, "<img src=\"chrome://editor/content/images/wink.gif\" alt=\";-)\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
SmilyHit(aInString, aInLength, col0, ";)", 2, "<img src=\"chrome://editor/content/images/s_wink.gif\" alt=\";)\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
SmilyHit(aInString, aInLength, col0, ":-P", 3, "<img src=\"chrome://editor/content/images/sick.gif\" alt=\":-P\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen)
SmilyHit(aInString, aInLength, col0, ":-)", 3, "<img src=\"chrome://editor/content/images/smile_n.gif\" alt=\":-)\" class=\"moz-txt-smily\" height=19 width=19 align=ABSCENTER>", outputHTML, glyphTextLen) ||
SmilyHit(aInString, aInLength, col0, ":-D", 3, "<img src=\"chrome://editor/content/images/laughing_n.gif\" alt=\":-D\" class=\"moz-txt-smily\" height=19 width=19 align=ABSCENTER>", outputHTML, glyphTextLen) ||
SmilyHit(aInString, aInLength, col0, ":-(", 3, "<img src=\"chrome://editor/content/images/frown_n.gif\" alt=\":-(\" class=\"moz-txt-smily\" height=19 width=19 align=ABSCENTER>", outputHTML, glyphTextLen) ||
SmilyHit(aInString, aInLength, col0, ":-[", 3, "<img src=\"chrome://editor/content/images/embarrassed_n.gif\" alt=\":-[\" class=\"moz-txt-smily\" height=19 width=19 align=ABSCENTER>", outputHTML, glyphTextLen) ||
SmilyHit(aInString, aInLength, col0, ";-)", 3, "<img src=\"chrome://editor/content/images/wink_n.gif\" alt=\";-)\" class=\"moz-txt-smily\" height=19 width=19 align=ABSCENTER>", outputHTML, glyphTextLen) ||
SmilyHit(aInString, aInLength, col0, ":-\\", 3, "<img src=\"chrome://editor/content/images/undecided_n.gif\" alt=\":-\\\" class=\"moz-txt-smily\" height=19 width=19 align=ABSCENTER>", outputHTML, glyphTextLen) ||
SmilyHit(aInString, aInLength, col0, ":-P", 3, "<img src=\"chrome://editor/content/images/tongue_n.gif\" alt=\":-P\" class=\"moz-txt-smily\" height=19 width=19 align=ABSCENTER>", outputHTML, glyphTextLen)
)
)
{
@ -707,13 +708,14 @@ mozTXTToHTMLConv::GlyphHit(const PRUnichar * aInString, PRInt32 aInLength, PRBoo
)
&&
(
SmilyHit(aInString, aInLength, PR_FALSE, ":-)", 3, "<img src=\"chrome://editor/content/images/smile.gif\" alt=\":-)\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
SmilyHit(aInString, aInLength, PR_FALSE, ":)", 2, "<img src=\"chrome://editor/content/images/s_smile.gif\" alt=\":)\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
SmilyHit(aInString, aInLength, PR_FALSE, ":-(", 3, "<img src=\"chrome://editor/content/images/frown.gif\" alt=\":-(\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
SmilyHit(aInString, aInLength, PR_FALSE, ":(", 2, "<img src=\"chrome://editor/content/images/s_frown.gif\" alt=\":(\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
SmilyHit(aInString, aInLength, PR_FALSE, ";-)", 3, "<img src=\"chrome://editor/content/images/wink.gif\" alt=\";-)\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
SmilyHit(aInString, aInLength, PR_FALSE, ";)", 2, "<img src=\"chrome://editor/content/images/s_wink.gif\" alt=\";)\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
SmilyHit(aInString, aInLength, PR_FALSE, ":-P", 3, "<img src=\"chrome://editor/content/images/sick.gif\" alt=\":-P\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen)
SmilyHit(aInString, aInLength, PR_FALSE, ":-)", 3, "<img src=\"chrome://editor/content/images/smile_n.gif\" alt=\":-)\" class=\"moz-txt-smily\" height=19 width=19 align=ABSCENTER>", outputHTML, glyphTextLen) ||
SmilyHit(aInString, aInLength, PR_FALSE, ":-D", 3, "<img src=\"chrome://editor/content/images/laughing_n.gif\" alt=\":-D\" class=\"moz-txt-smily\" height=19 width=19 align=ABSCENTER>", outputHTML, glyphTextLen) ||
SmilyHit(aInString, aInLength, PR_FALSE, ":-(", 3, "<img src=\"chrome://editor/content/images/frown_n.gif\" alt=\":-(\" class=\"moz-txt-smily\" height=19 width=19 align=ABSCENTER>", outputHTML, glyphTextLen) ||
SmilyHit(aInString, aInLength, PR_FALSE, ":-[", 3, "<img src=\"chrome://editor/content/images/embarrassed_n.gif\" alt=\":-[\" class=\"moz-txt-smily\" height=19 width=19 align=ABSCENTER>", outputHTML, glyphTextLen) ||
SmilyHit(aInString, aInLength, PR_FALSE, ";-)", 3, "<img src=\"chrome://editor/content/images/wink_n.gif\" alt=\";-)\" class=\"moz-txt-smily\" height=19 width=19 align=ABSCENTER>", outputHTML, glyphTextLen) ||
SmilyHit(aInString, aInLength, PR_FALSE, ":-\\", 3, "<img src=\"chrome://editor/content/images/undecided_n.gif\" alt=\":-\\\" class=\"moz-txt-smily\" height=19 width=19 align=ABSCENTER>", outputHTML, glyphTextLen) ||
SmilyHit(aInString, aInLength, PR_FALSE, ":-P", 3, "<img src=\"chrome://editor/content/images/tongue_n.gif\" alt=\":-P\" class=\"moz-txt-smily\" height=19 width=19 align=ABSCENTER>", outputHTML, glyphTextLen)
)
)
{

62
themes/classic/editor/EditorToolbars.css
Просмотреть файл

@ -139,57 +139,59 @@ button.edit-mode[selected="1"]:hover:active
list-style-image : url("chrome://editor/skin/images/bold-hover-active.gif");
}
#smilyPopup{
width : 130px;
}
#smileButton {
#smileButtonMenu {
list-style-image:url("chrome://editor/skin/images/smile.gif");
}
menu:hover > #smileButton,
menu:hover:active > #smileButton[toggled="true"] {
#smileButtonMenu:hover {
list-style-image:url("chrome://editor/skin/images/smile_hover.gif");
}
menu:hover:active > #smileButton,
menu:hover > #smileButton[toggled="true"] {
#smileButtonMenu:hover:active,
#smileButtonMenu[open="true"] {
list-style-image:url("chrome://editor/skin/images/smile_active.gif");
}
#smileButton[disabled="true"],
menu:hover > #smileButton[disabled="true"],
menu:hover:active > #smileButton[disabled="true"] {
#smileButtonMenu[disabled="true"],
#smileButtonMenu[disabled="true"]:hover,
#smileButtonMenu[disabled="true"]:hover:active {
list-style-image:url("chrome://editor/skin/images/smile_disabled.gif");
}
#insert-smile {
list-style-image:url(chrome://editor/skin/images/smile.gif);
.insert-smile > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/smile_n.gif);
}
#insert-sick {
list-style-image:url(chrome://editor/skin/images/sick.gif);
.insert-tongue > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/tongue_n.gif);
}
#insert-frown {
list-style-image:url(chrome://editor/skin/images/frown.gif);
.insert-frown > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/frown_n.gif);
}
.insert-wink > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/wink_n.gif);
}
.insert-laughing > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/laughing_n.gif);
}
.insert-embarrassed > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/embarrassed_n.gif);
}
.insert-undecided > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/undecided_n.gif);
}
#insert-wink {
list-style-image:url(chrome://editor/skin/images/wink.gif);
}
.smiley > .menu-iconic-left {
#insert-smile5 {
list-style-image:url(chrome://editor/skin/images/s_smile.gif);
}
#insert-smile6 {
list-style-image:url(chrome://editor/skin/images/s_frown.gif);
}
#insert-smile7 {
list-style-image:url(chrome://editor/skin/images/s_wink.gif);
margin-right: 15px;
}

65
themes/classic/editor/mac/EditorToolbars.css
Просмотреть файл

@ -141,58 +141,59 @@ button.edit-mode[selected="1"]:hover:active
list-style-image : url("chrome://editor/skin/images/bold-hover-active.gif");
}
#smilyPopup{
width : 130px;
}
#smileButton {
#smileButtonMenu {
list-style-image:url("chrome://editor/skin/images/smile.gif");
}
menu:hover > #smileButton,
menu:hover:active > #smileButton[toggled="true"] {
#smileButtonMenu:hover {
list-style-image:url("chrome://editor/skin/images/smile_hover.gif");
}
menu:hover:active > #smileButton,
menu:hover > #smileButton[toggled="true"] {
#smileButtonMenu:hover:active,
#smileButtonMenu[open="true"] {
list-style-image:url("chrome://editor/skin/images/smile_active.gif");
}
#smileButton[disabled="true"],
menu:hover > #smileButton[disabled="true"],
menu:hover:active > #smileButton[disabled="true"] {
#smileButtonMenu[disabled="true"],
#smileButtonMenu[disabled="true"]:hover,
#smileButtonMenu[disabled="true"]:hover:active {
list-style-image:url("chrome://editor/skin/images/smile_disabled.gif");
}
#insert-smile {
list-style-image:url(chrome://editor/skin/images/smile.gif);
.insert-smile > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/smile_n.gif);
}
#insert-sick {
list-style-image:url(chrome://editor/skin/images/sick.gif);
.insert-tongue > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/tongue_n.gif);
}
#insert-frown {
list-style-image:url(chrome://editor/skin/images/frown.gif);
.insert-frown > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/frown_n.gif);
}
.insert-wink > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/wink_n.gif);
}
.insert-laughing > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/laughing_n.gif);
}
.insert-embarrassed > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/embarrassed_n.gif);
}
.insert-undecided > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/undecided_n.gif);
}
#insert-wink {
list-style-image:url(chrome://editor/skin/images/wink.gif);
.smiley > .menu-iconic-left {
margin-right: 15px;
}
#insert-smile5 {
list-style-image:url(chrome://editor/skin/images/s_smile.gif);
}
#insert-smile6 {
list-style-image:url(chrome://editor/skin/images/s_frown.gif);
}
#insert-smile7 {
list-style-image:url(chrome://editor/skin/images/s_wink.gif);
}
#italicButton

65
themes/classic/editor/win/EditorToolbars.css
Просмотреть файл

@ -139,58 +139,59 @@ button.edit-mode[selected="1"]:hover:active
list-style-image : url("chrome://editor/skin/images/bold-hover-active.gif");
}
#smilyPopup{
width : 130px;
}
#smileButton {
#smileButtonMenu {
list-style-image:url("chrome://editor/skin/images/smile.gif");
}
menu:hover > #smileButton,
menu:hover:active > #smileButton[toggled="true"] {
#smileButtonMenu:hover {
list-style-image:url("chrome://editor/skin/images/smile_hover.gif");
}
menu:hover:active > #smileButton,
menu:hover > #smileButton[toggled="true"] {
#smileButtonMenu:hover:active,
#smileButtonMenu[open="true"] {
list-style-image:url("chrome://editor/skin/images/smile_active.gif");
}
#smileButton[disabled="true"],
menu:hover > #smileButton[disabled="true"],
menu:hover:active > #smileButton[disabled="true"] {
#smileButtonMenu[disabled="true"],
#smileButtonMenu[disabled="true"]:hover,
#smileButtonMenu[disabled="true"]:hover:active {
list-style-image:url("chrome://editor/skin/images/smile_disabled.gif");
}
#insert-smile {
list-style-image:url(chrome://editor/skin/images/smile.gif);
.insert-smile > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/smile_n.gif);
}
#insert-sick {
list-style-image:url(chrome://editor/skin/images/sick.gif);
.insert-tongue > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/tongue_n.gif);
}
#insert-frown {
list-style-image:url(chrome://editor/skin/images/frown.gif);
.insert-frown > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/frown_n.gif);
}
.insert-wink > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/wink_n.gif);
}
.insert-laughing > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/laughing_n.gif);
}
.insert-embarrassed > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/embarrassed_n.gif);
}
.insert-undecided > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/undecided_n.gif);
}
#insert-wink {
list-style-image:url(chrome://editor/skin/images/wink.gif);
.smiley > .menu-iconic-left {
margin-right: 15px;
}
#insert-smile5 {
list-style-image:url(chrome://editor/skin/images/s_smile.gif);
}
#insert-smile6 {
list-style-image:url(chrome://editor/skin/images/s_frown.gif);
}
#insert-smile7 {
list-style-image:url(chrome://editor/skin/images/s_wink.gif);
}
#italicButton

7
themes/classic/jar.mn
Просмотреть файл

@ -214,6 +214,13 @@ classic.jar:
skin/classic/editor/images/wink.gif (editor/images/wink.gif)
skin/classic/editor/images/s_wink.gif (editor/images/s_wink.gif)
skin/classic/editor/images/sick.gif (editor/images/sick.gif)
skin/classic/editor/images/smile_n.gif (editor/images/smile_n.gif)
skin/classic/editor/images/frown_n.gif (editor/images/frown_n.gif)
skin/classic/editor/images/wink_n.gif (editor/images/wink_n.gif)
skin/classic/editor/images/tongue_n.gif (editor/images/tongue_n.gif)
skin/classic/editor/images/laughing_n.gif (editor/images/laughing_n.gif)
skin/classic/editor/images/embarrassed_n.gif (editor/images/embarrassed_n.gif)
skin/classic/editor/images/undecided_n.gif (editor/images/undecided_n.gif)
skin/classic/editor/images/smile_active.gif (editor/images/smile_active.gif)
skin/classic/editor/images/smile_disabled.gif (editor/images/smile_disabled.gif)
skin/classic/editor/images/smile_hover.gif (editor/images/smile_hover.gif)

59
themes/modern/editor/EditorToolbars.css
Просмотреть файл

@ -625,52 +625,61 @@
list-style-image: url("chrome://editor/skin/btn2/justify-dis.gif");
}
#smileButtonMenu {
list-style-image: url("chrome://editor/skin/btn2/smiley.gif");
}
#smileButtonMenu:hover > #smileButton {
#smileButtonMenu:hover {
list-style-image: url("chrome://editor/skin/btn2/smiley-hov.gif");
}
#smileButtonMenu:hover:active > #smileButton {
#smileButtonMenu:hover:active,
#smileButtonMenu[open="true"] {
list-style-image: url("chrome://editor/skin/btn2/smiley-act.gif");
}
#smileButton[disabled="true"],
#smileButtonMenu:hover:active > #smileButton[disabled="true"] {
#smileButtonMenu[disabled="true"],
#smileButtonMenu[disabled="true"]:hover,
#smileButtonMenu[disabled="true"]:hover:active {
list-style-image: url("chrome://editor/skin/btn2/smiley-dis.gif");
}
/* ::::: smiley icons ::::: */
#insert-smile {
list-style-image: url("chrome://editor/skin/icons/smiley/smile.gif");
.insert-smile > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/smile_n.gif);
}
#insert-sick {
list-style-image: url("chrome://editor/skin/icons/smiley/sick.gif");
.insert-tongue > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/tongue_n.gif);
}
#insert-frown {
list-style-image: url("chrome://editor/skin/icons/smiley/frown.gif");
.insert-frown > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/frown_n.gif);
}
.insert-wink > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/wink_n.gif);
}
.insert-laughing > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/laughing_n.gif);
}
.insert-embarrassed > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/embarrassed_n.gif);
}
.insert-undecided > .menu-iconic-left {
list-style-image:url(chrome://editor/skin/images/undecided_n.gif);
}
#insert-wink {
list-style-image: url("chrome://editor/skin/icons/smiley/wink.gif");
.smiley > .menu-iconic-left {
margin-right: 15px;
}
#insert-smile5 {
list-style-image: url("chrome://editor/skin/icons/smiley/smile.gif");
}
#insert-smile6 {
list-style-image: url("chrome://editor/skin/icons/smiley/frown.gif");
}
#insert-smile7 {
list-style-image: url("chrome://editor/skin/icons/smiley/wink.gif");
}
/* ::::: fg/bg color picker ::::: */

7
themes/modern/jar.mn
Просмотреть файл

@ -274,6 +274,13 @@ modern.jar:
skin/modern/editor/icons/smiley/sick.gif (editor/icons/smiley/sick.gif)
skin/modern/editor/icons/smiley/smile.gif (editor/icons/smiley/smile.gif)
skin/modern/editor/icons/smiley/wink.gif (editor/icons/smiley/wink.gif)
skin/modern/editor/icons/smiley/smile_n.gif (editor/icons/smiley/smile_n.gif)
skin/modern/editor/icons/smiley/frown_n.gif (editor/icons/smiley/frown_n.gif)
skin/modern/editor/icons/smiley/wink_n.gif (editor/icons/smiley/wink_n.gif)
skin/modern/editor/icons/smiley/tongue_n.gif (editor/icons/smiley/tongue_n.gif)
skin/modern/editor/icons/smiley/laughing_n.gif (editor/icons/smiley/laughing_n.gif)
skin/modern/editor/icons/smiley/embarrassed_n.gif (editor/icons/smiley/embarrassed_n.gif)
skin/modern/editor/icons/smiley/undecided_n.gif (editor/icons/smiley/undecided_n.gif)
skin/modern/global/box.css (global/box.css)
skin/modern/global/button.css (global/button.css)
skin/modern/global/checkbox.css (global/checkbox.css)