From 06d26ef46e914c823889dab37627e7fa39d883ce Mon Sep 17 00:00:00 2001
From: Hari Sankar R <hsr@theinglorio.us>
Date: Mon, 2 Apr 2012 00:35:39 +0530
Subject: [PATCH] [ticket/10438] Alligning the Smileys on the same line as the
 text.

Changed the styling of smilies to appear at the same level as
text, by adding vertical-align: text-bottom css property to all
smilies. Edited functions_content.php to add class="smilies"
to all parsed smilies.

PHPBB3-10438
---
 phpBB/includes/functions_content.php    | 2 +-
 phpBB/styles/prosilver/theme/common.css | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index f2faf20f43..6b2ee98d7a 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -739,7 +739,7 @@ function smiley_text($text, $force_option = false)
 	else
 	{
 		$root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_root_path;
-		return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/(.*?) \/><!\-\- s\1 \-\->#', '<img src="' . $root_path . $config['smilies_path'] . '/\2 />', $text);
+		return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/(.*?) \/><!\-\- s\1 \-\->#', '<img class="smilies" src="' . $root_path . $config['smilies_path'] . '/\2 />', $text);
 	}
 }
 
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 31015b28f9..1d645ed177 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -713,3 +713,7 @@ p.rules a {
 .hidden {
 	display: none;
 }
+
+.smilies {
+	vertical-align: text-bottom;
+}