Merge remote-tracking branch 'PayBas/ticket/12856' into develop-ascraeus

* PayBas/ticket/12856: [ticket/12856] Remove images from assets/plupload/img/ [ticket/12856] Copy plupload images to prosilver dir
phpbb · Aug 13, 2014 · 26b8c6c · 26b8c6c
2 parents 1dc2d0e + 5cf9ab8
commit 26b8c6c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/phpBB/assets/plupload/img/done.gif → .../prosilver/theme/images/plupload/done.gif b/phpBB/assets/plupload/img/done.gif → .../prosilver/theme/images/plupload/done.gif
diff --git a/phpBB/assets/plupload/img/error.gif → ...prosilver/theme/images/plupload/error.gif b/phpBB/assets/plupload/img/error.gif → ...prosilver/theme/images/plupload/error.gif
diff --git a/phpBB/assets/plupload/img/throbber.gif → ...silver/theme/images/plupload/throbber.gif b/phpBB/assets/plupload/img/throbber.gif → ...silver/theme/images/plupload/throbber.gif
diff --git 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 {