diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-04-01 21:39:37 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-04-01 21:39:37 +0200 |
| commit | 2c68dc2e6dd4491744224c91c52f6da1e6c6b81d (patch) | |
| tree | 5fe53237d39f3c6119c98d9c1e2adbf41b050050 | |
| parent | ff7a6fb20485120ca26e5d20ec0fe141d6f8b6e0 (diff) | |
| parent | 06d26ef46e914c823889dab37627e7fa39d883ce (diff) | |
| download | forums-2c68dc2e6dd4491744224c91c52f6da1e6c6b81d.tar forums-2c68dc2e6dd4491744224c91c52f6da1e6c6b81d.tar.gz forums-2c68dc2e6dd4491744224c91c52f6da1e6c6b81d.tar.bz2 forums-2c68dc2e6dd4491744224c91c52f6da1e6c6b81d.tar.xz forums-2c68dc2e6dd4491744224c91c52f6da1e6c6b81d.zip | |
Merge remote-tracking branch 'sadu/ticket/10438' into develop
* sadu/ticket/10438:
[ticket/10438] Alligning the Smileys on the same line as the text.
| -rw-r--r-- | phpBB/includes/functions_content.php | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 4 |
2 files changed, 5 insertions, 1 deletions
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 14bbdc79a9..e95acf52b8 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; +} |