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

Merge remote-tracking branch 'Marc/ticket/11914' into develop

Browse source 
* Marc/ticket/11914:
  [ticket/11914] Add assets version to included plupload scripts
  [ticket/11914] Update plupload to 2.0.0
  [ticket/11914] Use unix line endings in plupload queue css file
This commit is contained in:
Joas Schilling 2013-11-27 15:18:39 +01:00
commit e3eb82cf7d
7 changed files with 208 additions and 184 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
phpBB/assets/plupload/jquery.plupload.queue/css/jquery.plupload.queue.css
View file

@ -7,18 +7,18 @@
display: inline-block; display: inline-block;
font: normal 12px sans-serif; font: normal 12px sans-serif;
text-decoration: none; text-decoration: none;
color: #42454a; color: #42454a;
border: 1px solid #bababa; border: 1px solid #bababa;
padding: 2px 8px 3px 20px; padding: 2px 8px 3px 20px;
margin-right: 4px; margin-right: 4px;
background: #f3f3f3 url('../img/buttons.png') no-repeat 0 center; background: #f3f3f3 url('../img/buttons.png') no-repeat 0 center;
outline: 0; outline: 0;
/* Optional rounded corners for browsers that support it */ /* Optional rounded corners for browsers that support it */
-moz-border-radius: 3px; -moz-border-radius: 3px;
-khtml-border-radius: 3px; -khtml-border-radius: 3px;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
} }
.plupload_button:hover { .plupload_button:hover {
@ -27,9 +27,9 @@
} }
.plupload_disabled, a.plupload_disabled:hover { .plupload_disabled, a.plupload_disabled:hover {
color: #737373; color: #737373;
border-color: #c5c5c5; border-color: #c5c5c5;
background: #ededed url('../img/buttons-disabled.png') no-repeat 0 center; background: #ededed url('../img/buttons-disabled.png') no-repeat 0 center;
cursor: default; cursor: default;
} }
@ -38,7 +38,7 @@
} }
.plupload_wrapper { .plupload_wrapper {
font: normal 11px Verdana,sans-serif; font: normal 11px Verdana, sans-serif;
width: 100%; width: 100%;
} }

1
phpBB/assets/plupload/jquery.plupload.queue/jquery.plupload.queue.js
View file

File diff suppressed because one or more lines are too long

1
phpBB/assets/plupload/jquery.plupload.queue/jquery.plupload.queue.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

28
phpBB/assets/plupload/plupload.full.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

1
phpBB/assets/plupload/plupload.html5.js
View file

File diff suppressed because one or more lines are too long

2
phpBB/assets/plupload/plupload.js
View file

File diff suppressed because one or more lines are too long

5
phpBB/styles/prosilver/template/plupload.html
View file

@ -1,6 +1,5 @@
<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/plupload.js"></script> <script type="text/javascript" src="{T_ASSETS_PATH}/plupload/plupload.full.min.js?assets_version={T_ASSETS_VERSION}"></script>
<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/plupload.html5.js"></script> <script type="text/javascript" src="{T_ASSETS_PATH}/plupload/jquery.plupload.queue/jquery.plupload.queue.min.js?assets_version={T_ASSETS_VERSION}"></script>
<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/jquery.plupload.queue/jquery.plupload.queue.js"></script>
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
phpbb.plupload = { phpbb.plupload = {