diff options
| author | Cesar G <prototech91@gmail.com> | 2014-08-13 15:00:48 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-08-13 15:00:48 -0700 |
| commit | 26b8c6cc13ad39b6e03509fa869a74346c29fd03 (patch) | |
| tree | 38c051d27ac0d81d543b582c111a28d21bca32df | |
| parent | 1dc2d0e759a622b04c94b089ec980857595fa7bf (diff) | |
| parent | 5cf9ab8a97250460dd406c149e9a3c56cd527912 (diff) | |
| download | forums-26b8c6cc13ad39b6e03509fa869a74346c29fd03.tar forums-26b8c6cc13ad39b6e03509fa869a74346c29fd03.tar.gz forums-26b8c6cc13ad39b6e03509fa869a74346c29fd03.tar.bz2 forums-26b8c6cc13ad39b6e03509fa869a74346c29fd03.tar.xz forums-26b8c6cc13ad39b6e03509fa869a74346c29fd03.zip | |
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
| -rw-r--r-- | phpBB/styles/prosilver/theme/images/plupload/done.gif (renamed from phpBB/assets/plupload/img/done.gif) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | phpBB/styles/prosilver/theme/images/plupload/error.gif (renamed from phpBB/assets/plupload/img/error.gif) | bin | 994 -> 994 bytes | |||
| -rw-r--r-- | phpBB/styles/prosilver/theme/images/plupload/throbber.gif (renamed from phpBB/assets/plupload/img/throbber.gif) | bin | 1922 -> 1922 bytes | |||
| -rw-r--r-- | phpBB/styles/prosilver/theme/plupload.css | 6 |
4 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/assets/plupload/img/done.gif b/phpBB/styles/prosilver/theme/images/plupload/done.gif Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 { |
