Merged MDL-7375 from stable

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 816cda3f900196ebe4b4622aeac0ef959461199c..c7eb7e574498513f6d8b3c0eee642c65f28a503a 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -261,6 +261,12 @@ table.formtable tbody .htmlarea th
   height: 17px;
 }
 
+img.emoticon {
+  vertical-align: middle;
+  width: 15px;
+  height: 15px;
+}
+
 form.popupform {
   display: inline;
 }