Merge pull request #2876 from PayBas/ticket/12900

[ticket/12900] Fix potential avatar size box overflow
phpbb · Aug 14, 2014 · ad625c1 · ad625c1
2 parents 26b8c6c + 030d1a6
commit ad625c1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -10,7 +10,7 @@ <h2 class="memberlist-title">{PAGE_TITLE}</h2>
 
 	<!-- IF AVATAR_IMG -->
 		<dl class="left-box">
-			<dt>{AVATAR_IMG}</dt>
+			<dt class="profile-avatar">{AVATAR_IMG}</dt>
 			<!-- IF RANK_TITLE --><dd style="text-align: center;">{RANK_TITLE}</dd><!-- ENDIF -->
 			<!-- IF RANK_IMG --><dd style="text-align: center;">{RANK_IMG}</dd><!-- ENDIF -->
 		</dl>

diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
@@ -768,6 +768,7 @@ table.info tbody th {
 	float: left;
 	width: auto;
 	text-align: left;
+	max-width: 100%;
 }
 
 .left-box.profile-details {
@@ -778,6 +779,7 @@ table.info tbody th {
 	float: right;
 	width: auto;
 	text-align: right;
+	max-width: 100%;
 }
 
 dl.details {

diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
@@ -759,6 +759,11 @@ dd.profile-contact {
 	width: 30%;
 }
 
+/* Profile used on view-profile */
+.profile-avatar img {
+	max-width: 100%;
+}
+
 /* pm list in compose message if mass pm is enabled */
 dl.pmlist dt {
 	width: 60% !important;