makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12856] Remove images from assets/plupload/img/
  [ticket/12856] Copy plupload images to prosilver dir
This commit is contained in:
Cesar G 2014-08-13 15:01:06 -07:00
commit baa9f17f7c
4 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
phpBB/assets/plupload/img/done.gif → phpBB/styles/prosilver/theme/images/plupload/done.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

0
phpBB/assets/plupload/img/error.gif → phpBB/styles/prosilver/theme/images/plupload/error.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 994 B

After

Width:  |  Height:  |  Size: 994 B

0
phpBB/assets/plupload/img/throbber.gif → phpBB/styles/prosilver/theme/images/plupload/throbber.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

6
phpBB/styles/prosilver/theme/plupload.css
View file

@ -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 {