From a61eb734ac74785880f588eb4b044c0f708a91ad Mon Sep 17 00:00:00 2001 From: Darin Wilton Date: Sat, 16 Jan 2016 07:35:53 -0500 Subject: [PATCH] changed avatar height setting --- composer.json | 4 ++-- controller/chat.php | 14 +++++++------- event/listener.php | 6 +++--- styles/Bluespace/template/chat_body.html | 8 ++++---- styles/Deepspace/template/chat_body.html | 8 ++++---- styles/GhostSpace/template/chat_body.html | 8 ++++---- styles/Prospace/template/chat_body.html | 8 ++++---- styles/all/template/chat_body.html | 8 ++++---- styles/all/theme/ajax_chat.css | 2 +- styles/black/template/chat_body.html | 8 ++++---- styles/bootlike/template/chat_body.html | 8 ++++---- styles/subsilver2/template/chat_body.html | 8 ++++---- styles/we_universal/template/chat_body.html | 8 ++++---- 13 files changed, 49 insertions(+), 49 deletions(-) diff --git a/composer.json b/composer.json index 2ae607a..967ed11 100644 --- a/composer.json +++ b/composer.json @@ -3,8 +3,8 @@ "type": "phpbb-extension", "description": "Chat for phpBB 3.1", "homepage": "http://www.livemembersonly.com", - "version": "3.0.11-BETA", - "time": "2016-01-09", + "version": "3.0.12-BETA", + "time": "2016-01-16", "license": "GPL-2.0", "authors": [{ "name": "spaceace", diff --git a/controller/chat.php b/controller/chat.php index e8c0bdf..bfc21d7 100644 --- a/controller/chat.php +++ b/controller/chat.php @@ -278,7 +278,7 @@ public function index() 'LAST_ID' => $this->last_id, 'LAST_POST' => $last_post, 'TIME' => time(), - 'L_VERSION' => '3.0.11-BETA', + 'L_VERSION' => '3.0.12-BETA', 'STYLE_PATH' => generate_board_url() . '/styles/' . $this->user->style['style_path'], 'EXT_STYLE_PATH' => '' . $this->ext_path_web . 'styles/', 'FILENAME' => $this->helper->route('spaceace_ajaxchat_chat'), @@ -332,8 +332,8 @@ private function defaultAction() $avatar_thumb = [ 'avatar' => $row['user_avatar'], 'avatar_type' => $row['user_avatar_type'], - 'avatar_height' => '', - 'avatar_width' => 35, + 'avatar_height' => 20, + 'avatar_width' => '', ]; $row['avatar'] = ($this->user->optionget('viewavatars')) ? phpbb_get_avatar($avatar, '') : ''; $row['avatar_thumb'] = ($this->user->optionget('viewavatars')) ? phpbb_get_avatar($avatar_thumb, '') : ''; @@ -552,8 +552,8 @@ private function readAction() $avatar_thumb = [ 'avatar' => $row['user_avatar'], 'avatar_type' => $row['user_avatar_type'], - 'avatar_height' => '', - 'avatar_width' => 35, + 'avatar_height' => 20, + 'avatar_width' => '', ]; $row['avatar'] = ($this->user->optionget('viewavatars')) ? phpbb_get_avatar($avatar, '') : ''; $row['avatar_thumb'] = ($this->user->optionget('viewavatars')) ? phpbb_get_avatar($avatar_thumb, '') : ''; @@ -695,8 +695,8 @@ private function addAction() $avatar_thumb = [ 'avatar' => $row['user_avatar'], 'avatar_type' => $row['user_avatar_type'], - 'avatar_height' => '', - 'avatar_width' => 35, + 'avatar_height' => 20, + 'avatar_width' => '', ]; $row['avatar'] = ($this->user->optionget('viewavatars')) ? phpbb_get_avatar($avatar, '') : ''; $row['avatar_thumb'] = ($this->user->optionget('viewavatars')) ? phpbb_get_avatar($avatar_thumb, '') : ''; diff --git a/event/listener.php b/event/listener.php index 5c00099..8ea1e8c 100644 --- a/event/listener.php +++ b/event/listener.php @@ -331,8 +331,8 @@ public function index() $avatar_thumb = [ 'avatar' => $row['user_avatar'], 'avatar_type' => $row['user_avatar_type'], - 'avatar_height' => '', - 'avatar_width' => 35, + 'avatar_height' => 20, + 'avatar_width' => '', ]; $row['avatar'] = ($this->user->optionget('viewavatars')) ? phpbb_get_avatar($avatar, '') : ''; $row['avatar_thumb'] = ($this->user->optionget('viewavatars')) ? phpbb_get_avatar($avatar_thumb, '') : ''; @@ -465,7 +465,7 @@ public function index() 'LAST_ID' => $this->last_id, 'LAST_POST' => $last_post, 'TIME' => time(), - 'L_VERSION' => '3.0.11-BETA', + 'L_VERSION' => '3.0.12-BETA', 'STYLE_PATH' => generate_board_url() . '/styles/' . $this->user->style['style_path'], 'EXT_STYLE_PATH' => '' . $this->ext_path_web . 'styles/', 'FILENAME' => $this->helper->route('spaceace_ajaxchat_chat'), diff --git a/styles/Bluespace/template/chat_body.html b/styles/Bluespace/template/chat_body.html index 8cf8de2..85c9604 100644 --- a/styles/Bluespace/template/chat_body.html +++ b/styles/Bluespace/template/chat_body.html @@ -18,10 +18,10 @@ - + - + @@ -182,10 +182,10 @@ - + - + diff --git a/styles/Deepspace/template/chat_body.html b/styles/Deepspace/template/chat_body.html index 8cf8de2..85c9604 100644 --- a/styles/Deepspace/template/chat_body.html +++ b/styles/Deepspace/template/chat_body.html @@ -18,10 +18,10 @@ - + - + @@ -182,10 +182,10 @@ - + - + diff --git a/styles/GhostSpace/template/chat_body.html b/styles/GhostSpace/template/chat_body.html index 14119b3..ec9a894 100644 --- a/styles/GhostSpace/template/chat_body.html +++ b/styles/GhostSpace/template/chat_body.html @@ -19,10 +19,10 @@ - + - + @@ -159,10 +159,10 @@ - + - + diff --git a/styles/Prospace/template/chat_body.html b/styles/Prospace/template/chat_body.html index 8cf8de2..85c9604 100644 --- a/styles/Prospace/template/chat_body.html +++ b/styles/Prospace/template/chat_body.html @@ -18,10 +18,10 @@ - + - + @@ -182,10 +182,10 @@ - + - + diff --git a/styles/all/template/chat_body.html b/styles/all/template/chat_body.html index 7b8d731..0f97af9 100644 --- a/styles/all/template/chat_body.html +++ b/styles/all/template/chat_body.html @@ -18,10 +18,10 @@ - + - + @@ -182,10 +182,10 @@ - + - + diff --git a/styles/all/theme/ajax_chat.css b/styles/all/theme/ajax_chat.css index 835fc17..59bd795 100644 --- a/styles/all/theme/ajax_chat.css +++ b/styles/all/theme/ajax_chat.css @@ -118,7 +118,7 @@ line-height: 1.48em; width: 100%; clear: both; - min-height: 40px; + min-height: 30px; } .chat dd { diff --git a/styles/black/template/chat_body.html b/styles/black/template/chat_body.html index 8981289..c4bfc0b 100644 --- a/styles/black/template/chat_body.html +++ b/styles/black/template/chat_body.html @@ -18,10 +18,10 @@ - + - + @@ -182,10 +182,10 @@ - + - + diff --git a/styles/bootlike/template/chat_body.html b/styles/bootlike/template/chat_body.html index 051f598..5284601 100644 --- a/styles/bootlike/template/chat_body.html +++ b/styles/bootlike/template/chat_body.html @@ -16,10 +16,10 @@ - + - + @@ -162,10 +162,10 @@

- + - + diff --git a/styles/subsilver2/template/chat_body.html b/styles/subsilver2/template/chat_body.html index c71e99c..462e5b1 100644 --- a/styles/subsilver2/template/chat_body.html +++ b/styles/subsilver2/template/chat_body.html @@ -20,10 +20,10 @@ - + - + @@ -160,10 +160,10 @@ - + - + diff --git a/styles/we_universal/template/chat_body.html b/styles/we_universal/template/chat_body.html index 0af0e74..b60f092 100644 --- a/styles/we_universal/template/chat_body.html +++ b/styles/we_universal/template/chat_body.html @@ -18,10 +18,10 @@ - + - + @@ -182,10 +182,10 @@ - + - +