Blush added

hamen · Mar 5, 2010 · 86b9184 · 86b9184
1 parent 357d04b
commit 86b9184
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 0 deletions.
diff --git a/app/chat-pp.xhtml b/app/chat-pp.xhtml
@@ -83,6 +83,7 @@
         <ul>
 	  <li><img src="emoticons/angry.png"/></li>
 	  <li><img src="emoticons/badsmile.png"/></li>
+	  <li><img src="emoticons/blush.png"/></li>
           <li><img src="emoticons/smile.png"/></li>
           <li><img src="emoticons/angel.png"/></li>
           <li><img src="emoticons/crying.png"/></li>

diff --git a/app/emoticons/blush.png b/app/emoticons/blush.png
diff --git a/app/lib/display_filters.js b/app/lib/display_filters.js
@@ -137,6 +137,7 @@ function processEmoticons(xmlMessageBody) {
         '(angry)':	 'angry',
         '(badsmile)':	 'badsmile',
         ']:)':	 'badsmile',
+        '(blush)':	 'blush',
         '(finger)':	 'finger',
         '(fuck)':	 'finger',
 	'(v)':	 'V',

diff --git a/app/style/chat.css b/app/style/chat.css
@@ -417,6 +417,7 @@ body.icons-on .smiley {
 body.icons-on .smiley-angel      { background: url(../emoticons/angel.png); }
 body.icons-on .smiley-angry      { background: url(../emoticons/angry.png); }
 body.icons-on .smiley-badsmile   { background: url(../emoticons/badsmile.png); }
+body.icons-on .smiley-blush      { background: url(../emoticons/blush.png); }
 body.icons-on .smiley-crying     { background: url(../emoticons/crying.png); }
 body.icons-on .smiley-devil-grin { background: url(../emoticons/devil-grin.png); }
 body.icons-on .smiley-glasses    { background: url(../emoticons/glasses.png); }