Bug #84950 --> Emoticons should be themeable. Move them out of editor\content and into a shared (communicator) theme package.

r=benB
sr=bienvenu
moa=glazman

a=asa
This commit is contained in:
scott%scott-macgregor.org 2004-03-10 19:10:58 +00:00
Родитель 76e5668256
Коммит 8b05ff4f01
22 изменённых файлов: 198 добавлений и 262 удалений

Просмотреть файл

@ -28,6 +28,8 @@
* place in EditorOverride.css, instead of here.
*/
@import url(chrome://communicator/skin/smileys.css);
a[name] {
min-height: 17px; margin-left: 2px; margin-top: 2px;
padding-left: 20px;
@ -74,124 +76,6 @@ label
border: 1px dotted green;
}
/* smileys */
span.moz-smiley-s1,
span.moz-smiley-s2,
span.moz-smiley-s3,
span.moz-smiley-s4,
span.moz-smiley-s5,
span.moz-smiley-s6,
span.moz-smiley-s7,
span.moz-smiley-s8,
span.moz-smiley-s9,
span.moz-smiley-s10,
span.moz-smiley-s11,
span.moz-smiley-s12,
span.moz-smiley-s13,
span.moz-smiley-s14,
span.moz-smiley-s15,
span.moz-smiley-s16
{
min-height: 17px; margin-left: 2px; margin-top: 2px;
padding-left: 20px;
background-repeat: no-repeat;
background-position: center center;
-moz-user-select: all;
}
span.moz-smiley-s1 > span,
span.moz-smiley-s2 > span,
span.moz-smiley-s3 > span,
span.moz-smiley-s4 > span,
span.moz-smiley-s5 > span,
span.moz-smiley-s6 > span,
span.moz-smiley-s7 > span,
span.moz-smiley-s8 > span,
span.moz-smiley-s9 > span,
span.moz-smiley-s10 > span,
span.moz-smiley-s11 > span,
span.moz-smiley-s12 > span,
span.moz-smiley-s13 > span,
span.moz-smiley-s14 > span,
span.moz-smiley-s15 > span,
span.moz-smiley-s16 > span
{
display: none;
}
span.moz-smiley-s1 {
background-image: url(chrome://editor/content/images/smile_n.gif);
}
span.moz-smiley-s2 {
background-image: url(chrome://editor/content/images/frown_n.gif);
}
span.moz-smiley-s3 {
background-image: url(chrome://editor/content/images/wink_n.gif);
}
span.moz-smiley-s4 {
background-image: url(chrome://editor/content/images/tongue_n.gif);
}
span.moz-smiley-s5 {
background-image: url(chrome://editor/content/images/laughing_n.gif);
}
span.moz-smiley-s6 {
background-image: url(chrome://editor/content/images/embarrassed_n.gif);
}
span.moz-smiley-s7 {
background-image: url(chrome://editor/content/images/undecided_n.gif);
}
span.moz-smiley-s8 {
background-image: url(chrome://editor/content/images/surprise_n.gif);
}
span.moz-smiley-s9 {
background-image: url(chrome://editor/content/images/kiss_n.gif);
}
span.moz-smiley-s10 {
background-image: url(chrome://editor/content/images/yell_n.gif);
}
span.moz-smiley-s11 {
background-image: url(chrome://editor/content/images/cool_n.gif);
}
span.moz-smiley-s12 {
background-image: url(chrome://editor/content/images/money_n.gif);
}
span.moz-smiley-s13 {
background-image: url(chrome://editor/content/images/foot_n.gif);
}
span.moz-smiley-s14 {
background-image: url(chrome://editor/content/images/innocent_n.gif);
}
span.moz-smiley-s15 {
background-image: url(chrome://editor/content/images/cry_n.gif);
}
span.moz-smiley-s16 {
background-image: url(chrome://editor/content/images/sealed_n.gif);
}
img {
-moz-force-broken-image-icon: 1;
}

Просмотреть файл

@ -142,22 +142,6 @@ comm.jar:
content/editor/images/sick.gif (composer/content/images/sick.gif)
content/editor/images/s_frown.gif (composer/content/images/s_frown.gif)
content/editor/images/s_wink.gif (composer/content/images/s_wink.gif)
content/editor/images/smile_n.gif (composer/content/images/smile_n.gif)
content/editor/images/frown_n.gif (composer/content/images/frown_n.gif)
content/editor/images/wink_n.gif (composer/content/images/wink_n.gif)
content/editor/images/tongue_n.gif (composer/content/images/tongue_n.gif)
content/editor/images/laughing_n.gif (composer/content/images/laughing_n.gif)
content/editor/images/embarrassed_n.gif (composer/content/images/embarrassed_n.gif)
content/editor/images/undecided_n.gif (composer/content/images/undecided_n.gif)
content/editor/images/surprise_n.gif (composer/content/images/surprise_n.gif)
content/editor/images/kiss_n.gif (composer/content/images/kiss_n.gif)
content/editor/images/yell_n.gif (composer/content/images/yell_n.gif)
content/editor/images/cool_n.gif (composer/content/images/cool_n.gif)
content/editor/images/money_n.gif (composer/content/images/money_n.gif)
content/editor/images/foot_n.gif (composer/content/images/foot_n.gif)
content/editor/images/innocent_n.gif (composer/content/images/innocent_n.gif)
content/editor/images/cry_n.gif (composer/content/images/cry_n.gif)
content/editor/images/sealed_n.gif (composer/content/images/sealed_n.gif)
content/editor/EdDialogCommon.js (dialogs/content/EdDialogCommon.js)
content/editor/EdLinkProps.xul (dialogs/content/EdLinkProps.xul)
content/editor/EdLinkProps.js (dialogs/content/EdLinkProps.js)

Просмотреть файл

@ -0,0 +1,156 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is smiley style rules.
*
* The Initial Developer of the Original Code is
* Mozilla.
* Portions created by the Initial Developer are Copyright (C) 2004
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* ***** END LICENSE BLOCK ***** */
/* ==== smileys.css ====================================================
== Style rules to bind smiley image types generated by editor and the mozTxtToHTMLConv
== into skinnable images.
========================================================================== */
/* ::::: we also represent smilies inside of spans ::::: */
span.moz-smiley-s1,
span.moz-smiley-s2,
span.moz-smiley-s3,
span.moz-smiley-s4,
span.moz-smiley-s5,
span.moz-smiley-s6,
span.moz-smiley-s7,
span.moz-smiley-s8,
span.moz-smiley-s9,
span.moz-smiley-s10,
span.moz-smiley-s11,
span.moz-smiley-s12,
span.moz-smiley-s13,
span.moz-smiley-s14,
span.moz-smiley-s15,
span.moz-smiley-s16
{
font-size: 17px;
padding-left: 20px;
margin-left: 2px;
margin-top: 2px;
background-repeat: no-repeat;
-moz-user-select: all;
background-position: center center;
}
span.moz-smiley-s1 > span,
span.moz-smiley-s2 > span,
span.moz-smiley-s3 > span,
span.moz-smiley-s4 > span,
span.moz-smiley-s5 > span,
span.moz-smiley-s6 > span,
span.moz-smiley-s7 > span,
span.moz-smiley-s8 > span,
span.moz-smiley-s9 > span,
span.moz-smiley-s10 > span,
span.moz-smiley-s11 > span,
span.moz-smiley-s12 > span,
span.moz-smiley-s13 > span,
span.moz-smiley-s14 > span,
span.moz-smiley-s15 > span,
span.moz-smiley-s16 > span
{
display: none;
}
/* smile */
span.moz-smiley-s1{
background-image: url("chrome://communicator/skin/icons/smileys/smile_n.gif");
}
/* frown */
span.moz-smiley-s2 {
background-image: url("chrome://communicator/skin/icons/smileys/frown_n.gif");
}
/* wink */
span.moz-smiley-s3 {
background-image: url("chrome://communicator/skin/icons/smileys/wink_n.gif");
}
/* tongue */
span.moz-smiley-s4 {
background-image: url("chrome://communicator/skin/icons/smileys/tongue_n.gif");
}
/* laughing */
span.moz-smiley-s5 {
background-image: url("chrome://communicator/skin/icons/smileys/laughing_n.gif");
}
/* embarassed */
span.moz-smiley-s6 {
background-image: url("chrome://communicator/skin/icons/smileys/embarrassed_n.gif");
}
/* undecided */
span.moz-smiley-s7 {
background-image: url("chrome://communicator/skin/icons/smileys/undecided_n.gif");
}
/* suprise */
span.moz-smiley-s8 {
background-image: url("chrome://communicator/skin/icons/smileys/surprise_n.gif");
}
/* kiss */
span.moz-smiley-s9 {
background-image: url("chrome://communicator/skin/icons/smileys/kiss_n.gif");
}
/* yell */
span.moz-smiley-s10 {
background-image: url("chrome://communicator/skin/icons/smileys/yell_n.gif");
}
/* cool */
span.moz-smiley-s11 {
background-image: url("chrome://communicator/skin/icons/smileys/cool_n.gif");
}
/* money */
span.moz-smiley-s12 {
background-image: url("chrome://communicator/skin/icons/smileys/money_n.gif");
}
/* foot */
span.moz-smiley-s13 {
background-image: url("chrome://communicator/skin/icons/smileys/foot_n.gif");
}
/* innocent */
span.moz-smiley-s14 {
background-image: url("chrome://communicator/skin/icons/smileys/innocent_n.gif");
}
/* cry */
span.moz-smiley-s15 {
background-image: url("chrome://communicator/skin/icons/smileys/cry_n.gif");
}
/* sealed */
span.moz-smiley-s16 {
background-image: url("chrome://communicator/skin/icons/smileys/sealed_n.gif");
}

Просмотреть файл

@ -445,86 +445,90 @@
/* ..... smiley menu ..... */
.insert-smile > .menu-iconic-left {
list-style-image: url("chrome://editor/content/images/smile_n.gif");
list-style-image: url("chrome://communicator/skin/icons/smileys/smile_n.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.insert-tongue > .menu-iconic-left {
list-style-image: url("chrome://editor/content/images/tongue_n.gif");
list-style-image: url("chrome://communicator/skin/icons/smileys/tongue_n.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.insert-frown > .menu-iconic-left {
list-style-image: url("chrome://editor/content/images/frown_n.gif");
list-style-image: url("chrome://communicator/skin/icons/smileys/frown_n.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.insert-wink > .menu-iconic-left {
list-style-image: url("chrome://editor/content/images/wink_n.gif");
list-style-image: url("chrome://communicator/skin/icons/smileys/wink_n.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.insert-laughing > .menu-iconic-left {
list-style-image: url("chrome://editor/content/images/laughing_n.gif");
list-style-image: url("chrome://communicator/skin/icons/smileys/laughing_n.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.insert-embarrassed > .menu-iconic-left {
list-style-image: url("chrome://editor/content/images/embarrassed_n.gif");
list-style-image: url("chrome://communicator/skin/icons/smileys/embarrassed_n.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.insert-undecided > .menu-iconic-left {
list-style-image: url("chrome://editor/content/images/undecided_n.gif");
list-style-image: url("chrome://communicator/skin/icons/smileys/undecided_n.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.insert-surprise > .menu-iconic-left {
list-style-image: url("chrome://editor/content/images/surprise_n.gif");
list-style-image: url("chrome://communicator/skin/icons/smileys/surprise_n.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.insert-kiss > .menu-iconic-left {
list-style-image: url("chrome://editor/content/images/kiss_n.gif");
list-style-image: url("chrome://communicator/skin/icons/smileys/kiss_n.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.insert-yell > .menu-iconic-left {
list-style-image: url("chrome://editor/content/images/yell_n.gif");
list-style-image: url("chrome://communicator/skin/icons/smileys/yell_n.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.insert-cool > .menu-iconic-left {
list-style-image: url("chrome://editor/content/images/cool_n.gif");
list-style-image: url("chrome://communicator/skin/icons/smileys/cool_n.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.insert-undecided > .menu-iconic-left {
list-style-image: url("chrome://communicator/skin/icons/smileys/undecided_n.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.insert-money > .menu-iconic-left {
list-style-image: url("chrome://editor/content/images/money_n.gif");
list-style-image: url("chrome://communicator/skin/icons/smileys/money_n.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.insert-foot > .menu-iconic-left {
list-style-image: url("chrome://editor/content/images/foot_n.gif");
list-style-image: url("chrome://communicator/skin/icons/smileys/foot_n.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.insert-innocent > .menu-iconic-left {
list-style-image: url("chrome://editor/content/images/innocent_n.gif");
list-style-image: url("chrome://communicator/skin/icons/smileys/innocent_n.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.insert-cry > .menu-iconic-left {
list-style-image: url("chrome://editor/content/images/cry_n.gif");
list-style-image: url("chrome://communicator/skin/icons/smileys/cry_n.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.insert-sealed > .menu-iconic-left {
list-style-image: url("chrome://editor/content/images/sealed_n.gif");
list-style-image: url("chrome://communicator/skin/icons/smileys/sealed_n.gif");
-moz-image-region: auto; /* cut off inheritance */
}
/* ::::: fg/bg color picker ::::: */
.color-button {

Просмотреть файл

@ -8,6 +8,7 @@ modern.jar:
skin/modern/communicator/toolbar.css (communicator/toolbar.css)
skin/modern/communicator/dialogs.css (communicator/dialogs.css)
skin/modern/communicator/plugins.css (communicator/plugins.css)
skin/modern/communicator/smileys.css (communicator/smileys.css)
skin/modern/communicator/communicator.css (communicator/communicator.css)
skin/modern/communicator/bookmarks/bookmark-folder-closed.gif (communicator/bookmarks/bookmark-folder-closed.gif)
skin/modern/communicator/bookmarks/bookmark-folder-dis.gif (communicator/bookmarks/bookmark-folder-dis.gif)
@ -37,6 +38,22 @@ modern.jar:
skin/modern/communicator/icons/turbo-systray.gif (communicator/icons/turbo-systray.gif)
skin/modern/communicator/icons/btn1.gif (communicator/icons/btn1.gif)
skin/modern/communicator/icons/search.gif (communicator/icons/search.gif)
skin/modern/communicator/icons/smileys/smile_n.gif (communicator/icons/smileys/smile_n.gif)
skin/modern/communicator/icons/smileys/frown_n.gif (communicator/icons/smileys/frown_n.gif)
skin/modern/communicator/icons/smileys/wink_n.gif (communicator/icons/smileys/wink_n.gif)
skin/modern/communicator/icons/smileys/tongue_n.gif (communicator/icons/smileys/tongue_n.gif)
skin/modern/communicator/icons/smileys/laughing_n.gif (communicator/icons/smileys/laughing_n.gif)
skin/modern/communicator/icons/smileys/embarrassed_n.gif (communicator/icons/smileys/embarrassed_n.gif)
skin/modern/communicator/icons/smileys/undecided_n.gif (communicator/icons/smileys/undecided_n.gif)
skin/modern/communicator/icons/smileys/surprise_n.gif (communicator/icons/smileys/surprise_n.gif)
skin/modern/communicator/icons/smileys/kiss_n.gif (communicator/icons/smileys/kiss_n.gif)
skin/modern/communicator/icons/smileys/yell_n.gif (communicator/icons/smileys/yell_n.gif)
skin/modern/communicator/icons/smileys/cool_n.gif (communicator/icons/smileys/cool_n.gif)
skin/modern/communicator/icons/smileys/money_n.gif (communicator/icons/smileys/money_n.gif)
skin/modern/communicator/icons/smileys/foot_n.gif (communicator/icons/smileys/foot_n.gif)
skin/modern/communicator/icons/smileys/innocent_n.gif (communicator/icons/smileys/innocent_n.gif)
skin/modern/communicator/icons/smileys/cry_n.gif (communicator/icons/smileys/cry_n.gif)
skin/modern/communicator/icons/smileys/sealed_n.gif (communicator/icons/smileys/sealed_n.gif)
skin/modern/communicator/profile/migrate.gif (communicator/profile/migrate.gif)
skin/modern/communicator/profile/profile.gif (communicator/profile/profile.gif)
skin/modern/communicator/profile/profile.css (communicator/profile/profile.css)

Просмотреть файл

@ -39,6 +39,8 @@
== Styles for the body of a mail message.
======================================================================= */
@import url(chrome://communicator/skin/smileys.css);
/* XXX Breaks the HTML rules below (.moz-class stuff), at least on Linux.
"html|.class" doesn't work.
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@ -146,114 +148,3 @@ span.moz-txt-formfeed {
.moz-signature > a {
color: #7777FF; /* light blue */
}
/* ::::: smilies ::::: */
span.moz-smiley-s1,
span.moz-smiley-s2,
span.moz-smiley-s3,
span.moz-smiley-s4,
span.moz-smiley-s5,
span.moz-smiley-s6,
span.moz-smiley-s7,
span.moz-smiley-s8,
span.moz-smiley-s9,
span.moz-smiley-s10,
span.moz-smiley-s11,
span.moz-smiley-s12,
span.moz-smiley-s13,
span.moz-smiley-s14,
span.moz-smiley-s15,
span.moz-smiley-s16
{
min-height: 17px; margin-left: 2px; margin-top: 2px;
padding-left: 20px;
background-repeat: no-repeat;
background-position: center center;
-moz-user-select: all;
}
span.moz-smiley-s1 > span,
span.moz-smiley-s2 > span,
span.moz-smiley-s3 > span,
span.moz-smiley-s4 > span,
span.moz-smiley-s5 > span,
span.moz-smiley-s6 > span,
span.moz-smiley-s7 > span,
span.moz-smiley-s8 > span,
span.moz-smiley-s9 > span,
span.moz-smiley-s10 > span,
span.moz-smiley-s11 > span,
span.moz-smiley-s12 > span,
span.moz-smiley-s13 > span,
span.moz-smiley-s14 > span,
span.moz-smiley-s15 > span,
span.moz-smiley-s16 > span
{
display: none;
}
span.moz-smiley-s1 {
background-image: url("chrome://editor/content/images/smile_n.gif");
}
span.moz-smiley-s2 {
background-image: url("chrome://editor/content/images/frown_n.gif");
}
span.moz-smiley-s3 {
background-image: url("chrome://editor/content/images/wink_n.gif");
}
span.moz-smiley-s4 {
background-image: url("chrome://editor/content/images/tongue_n.gif");
}
span.moz-smiley-s5 {
background-image: url("chrome://editor/content/images/laughing_n.gif");
}
span.moz-smiley-s6 {
background-image: url("chrome://editor/content/images/embarrassed_n.gif");
}
span.moz-smiley-s7 {
background-image: url("chrome://editor/content/images/undecided_n.gif");
}
span.moz-smiley-s8 {
background-image: url("chrome://editor/content/images/surprise_n.gif");
}
span.moz-smiley-s9 {
background-image: url("chrome://editor/content/images/kiss_n.gif");
}
span.moz-smiley-s10 {
background-image: url("chrome://editor/content/images/yell_n.gif");
}
span.moz-smiley-s11 {
background-image: url("chrome://editor/content/images/cool_n.gif");
}
span.moz-smiley-s12 {
background-image: url("chrome://editor/content/images/money_n.gif");
}
span.moz-smiley-s13 {
background-image: url("chrome://editor/content/images/foot_n.gif");
}
span.moz-smiley-s14 {
background-image: url("chrome://editor/content/images/innocent_n.gif");
}
span.moz-smiley-s15 {
background-image: url("chrome://editor/content/images/cry_n.gif");
}
span.moz-smiley-s16 {
background-image: url("chrome://editor/content/images/sealed_n.gif");
}