8 files changed, 29 insertions, 4 deletions
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..0e7d70f2a7
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,18 @@
+# This file is for standardising the coding style between different editors
+# http://editorconfig.org/
+
+root = true
+
+[*]
+end_of_line = lf
+indent_size = 4
+indent_style = tab
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.yml]
+indent_size = 4
+indent_style = space
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;
diff --git a/phpBB/assets/plupload/img/done.gif b/phpBB/styles/prosilver/theme/images/plupload/done.gif
index 29f3ed7c97..29f3ed7c97 100644
--- a/phpBB/assets/plupload/img/done.gif
+++ b/phpBB/styles/prosilver/theme/images/plupload/done.gif
diff --git a/phpBB/assets/plupload/img/error.gif b/phpBB/styles/prosilver/theme/images/plupload/error.gif
index 4682b63007..4682b63007 100644
--- a/phpBB/assets/plupload/img/error.gif
+++ b/phpBB/styles/prosilver/theme/images/plupload/error.gif
diff --git a/phpBB/assets/plupload/img/throbber.gif b/phpBB/styles/prosilver/theme/images/plupload/throbber.gif
index 4ae8b16a5a..4ae8b16a5a 100644
--- a/phpBB/assets/plupload/img/throbber.gif
+++ b/phpBB/styles/prosilver/theme/images/plupload/throbber.gif
diff --git a/phpBB/styles/prosilver/theme/plupload.css b/phpBB/styles/prosilver/theme/plupload.css
index f81064dbe6..7d4092c3fe 100644
--- a/phpBB/styles/prosilver/theme/plupload.css
+++ b/phpBB/styles/prosilver/theme/plupload.css
@@ -58,15 +58,15 @@
 }
 
 .file-status.file-working {
-	background: url('../../../assets/plupload/img/throbber.gif');
+	background: url('./images/plupload/throbber.gif');
 }
 
 .file-status.file-uploaded {
-	background: url('../../../assets/plupload/img/done.gif');
+	background: url('./images/plupload/done.gif');
 }
 
 .file-status.file-error {
-	background: url('../../../assets/plupload/img/error.gif');
+	background: url('./images/plupload/error.gif');
 }
 
 .file-status {