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 pull request #1949 from prototech/ticket/12110

Browse source 
[ticket/12110] Update Plupload to 2.1.1.
This commit is contained in:
Nathan Guse 2014-01-17 17:56:19 -08:00
commit 6c8f217832
3 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
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%;
} }
@ -107,7 +107,11 @@
} }
.plupload_file_size, .plupload_file_status, .plupload_file_action {text-align: right;} .plupload_file_size, .plupload_file_status, .plupload_file_action {text-align: right;}
.plupload_filelist .plupload_file_name {width: 205px} .plupload_filelist .plupload_file_name {
width: 205px;
white-space: nowrap;
text-overflow: ellipsis;
}
.plupload_file_action { .plupload_file_action {
float: right; float: right;

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

File diff suppressed because one or more lines are too long

16
phpBB/assets/plupload/plupload.full.min.js vendored
View file

File diff suppressed because one or more lines are too long