aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-08-14 14:47:50 +0200
committerMarc Alexander <admin@m-a-styles.de>2014-08-14 14:47:50 +0200
commitbebcd59694989f21e94c305805b5e9d9a49eb465 (patch)
treee5ddac9f5860a8d01e2095b4970b197c18b63aba
parentbaa9f17f7c719d9491dcfbc70916b324ba3b4d25 (diff)
parentad625c1e6d5e3aff39a3cd95a7d20ac84a19dbca (diff)
downloadforums-bebcd59694989f21e94c305805b5e9d9a49eb465.tar
forums-bebcd59694989f21e94c305805b5e9d9a49eb465.tar.gz
forums-bebcd59694989f21e94c305805b5e9d9a49eb465.tar.bz2
forums-bebcd59694989f21e94c305805b5e9d9a49eb465.tar.xz
forums-bebcd59694989f21e94c305805b5e9d9a49eb465.zip
Merge branch 'develop-ascraeus' into develop
-rw-r--r--phpBB/styles/prosilver/template/memberlist_view.html2
-rw-r--r--phpBB/styles/prosilver/theme/common.css2
-rw-r--r--phpBB/styles/prosilver/theme/content.css5
3 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index ffa57f9cc8..55fcbe23ba 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -10,7 +10,7 @@
<!-- 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
index 45cb88890d..a9d9b5b01f 100644
--- 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
index 8b84545a2c..d00c544050 100644
--- 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;