mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
Merge remote-tracking branch 'Marc/ticket/11914' into develop
* 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
commit
e3eb82cf7d
7 changed files with 208 additions and 184 deletions
|
|
@ -1,177 +1,177 @@
|
||||||
/*
|
/*
|
||||||
Plupload
|
Plupload
|
||||||
------------------------------------------------------------------- */
|
------------------------------------------------------------------- */
|
||||||
|
|
||||||
.plupload_button {
|
.plupload_button {
|
||||||
display: -moz-inline-box; /* FF < 3*/
|
display: -moz-inline-box; /* FF < 3*/
|
||||||
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 {
|
||||||
color: #000;
|
color: #000;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.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;
|
||||||
}
|
}
|
||||||
|
|
||||||
.plupload_add {
|
.plupload_add {
|
||||||
background-position: -181px center;
|
background-position: -181px center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.plupload_wrapper {
|
.plupload_wrapper {
|
||||||
font: normal 11px Verdana,sans-serif;
|
font: normal 11px Verdana, sans-serif;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.plupload_container {
|
.plupload_container {
|
||||||
padding: 8px;
|
padding: 8px;
|
||||||
background: url('../img/transp50.png');
|
background: url('../img/transp50.png');
|
||||||
/*-moz-border-radius: 5px;*/
|
/*-moz-border-radius: 5px;*/
|
||||||
}
|
}
|
||||||
|
|
||||||
.plupload_container input {
|
.plupload_container input {
|
||||||
border: 1px solid #DDD;
|
border: 1px solid #DDD;
|
||||||
font: normal 11px Verdana,sans-serif;
|
font: normal 11px Verdana,sans-serif;
|
||||||
width: 98%;
|
width: 98%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.plupload_header {background: #2A2C2E url('../img/backgrounds.gif') repeat-x;}
|
.plupload_header {background: #2A2C2E url('../img/backgrounds.gif') repeat-x;}
|
||||||
.plupload_header_content {
|
.plupload_header_content {
|
||||||
background: url('../img/backgrounds.gif') no-repeat 0 -317px;
|
background: url('../img/backgrounds.gif') no-repeat 0 -317px;
|
||||||
min-height: 56px;
|
min-height: 56px;
|
||||||
padding-left: 60px;
|
padding-left: 60px;
|
||||||
color: #FFF;
|
color: #FFF;
|
||||||
}
|
}
|
||||||
.plupload_header_title {
|
.plupload_header_title {
|
||||||
font: normal 18px sans-serif;
|
font: normal 18px sans-serif;
|
||||||
padding: 6px 0 3px;
|
padding: 6px 0 3px;
|
||||||
}
|
}
|
||||||
.plupload_header_text {
|
.plupload_header_text {
|
||||||
font: normal 12px sans-serif;
|
font: normal 12px sans-serif;
|
||||||
}
|
}
|
||||||
|
|
||||||
.plupload_filelist {
|
.plupload_filelist {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
list-style: none;
|
list-style: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.plupload_scroll .plupload_filelist {
|
.plupload_scroll .plupload_filelist {
|
||||||
height: 185px;
|
height: 185px;
|
||||||
background: #F5F5F5;
|
background: #F5F5F5;
|
||||||
overflow-y: scroll;
|
overflow-y: scroll;
|
||||||
}
|
}
|
||||||
|
|
||||||
.plupload_filelist li {
|
.plupload_filelist li {
|
||||||
padding: 10px 8px;
|
padding: 10px 8px;
|
||||||
background: #F5F5F5 url('../img/backgrounds.gif') repeat-x 0 -156px;
|
background: #F5F5F5 url('../img/backgrounds.gif') repeat-x 0 -156px;
|
||||||
border-bottom: 1px solid #DDD;
|
border-bottom: 1px solid #DDD;
|
||||||
}
|
}
|
||||||
|
|
||||||
.plupload_filelist_header, .plupload_filelist_footer {
|
.plupload_filelist_header, .plupload_filelist_footer {
|
||||||
background: #DFDFDF;
|
background: #DFDFDF;
|
||||||
padding: 8px 8px;
|
padding: 8px 8px;
|
||||||
color: #42454A;
|
color: #42454A;
|
||||||
}
|
}
|
||||||
.plupload_filelist_header {
|
.plupload_filelist_header {
|
||||||
border-top: 1px solid #EEE;
|
border-top: 1px solid #EEE;
|
||||||
border-bottom: 1px solid #CDCDCD;
|
border-bottom: 1px solid #CDCDCD;
|
||||||
}
|
}
|
||||||
|
|
||||||
.plupload_filelist_footer {border-top: 1px solid #FFF; height: 22px; line-height: 20px; vertical-align: middle;}
|
.plupload_filelist_footer {border-top: 1px solid #FFF; height: 22px; line-height: 20px; vertical-align: middle;}
|
||||||
.plupload_file_name {float: left; overflow: hidden}
|
.plupload_file_name {float: left; overflow: hidden}
|
||||||
.plupload_file_status {color: #777;}
|
.plupload_file_status {color: #777;}
|
||||||
.plupload_file_status span {color: #42454A;}
|
.plupload_file_status span {color: #42454A;}
|
||||||
.plupload_file_size, .plupload_file_status, .plupload_progress {
|
.plupload_file_size, .plupload_file_status, .plupload_progress {
|
||||||
float: right;
|
float: right;
|
||||||
width: 80px;
|
width: 80px;
|
||||||
}
|
}
|
||||||
.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}
|
||||||
|
|
||||||
.plupload_file_action {
|
.plupload_file_action {
|
||||||
float: right;
|
float: right;
|
||||||
width: 16px;
|
width: 16px;
|
||||||
height: 16px;
|
height: 16px;
|
||||||
margin-left: 15px;
|
margin-left: 15px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.plupload_file_action * {
|
.plupload_file_action * {
|
||||||
display: none;
|
display: none;
|
||||||
width: 16px;
|
width: 16px;
|
||||||
height: 16px;
|
height: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
li.plupload_uploading {background: #ECF3DC url('../img/backgrounds.gif') repeat-x 0 -238px;}
|
li.plupload_uploading {background: #ECF3DC url('../img/backgrounds.gif') repeat-x 0 -238px;}
|
||||||
li.plupload_done {color:#AAA}
|
li.plupload_done {color:#AAA}
|
||||||
|
|
||||||
li.plupload_delete a {
|
li.plupload_delete a {
|
||||||
background: url('../img/delete.gif');
|
background: url('../img/delete.gif');
|
||||||
}
|
}
|
||||||
|
|
||||||
li.plupload_failed a {
|
li.plupload_failed a {
|
||||||
background: url('../img/error.gif');
|
background: url('../img/error.gif');
|
||||||
cursor: default;
|
cursor: default;
|
||||||
}
|
}
|
||||||
|
|
||||||
li.plupload_done a {
|
li.plupload_done a {
|
||||||
background: url('../img/done.gif');
|
background: url('../img/done.gif');
|
||||||
cursor: default;
|
cursor: default;
|
||||||
}
|
}
|
||||||
|
|
||||||
.plupload_progress, .plupload_upload_status {
|
.plupload_progress, .plupload_upload_status {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.plupload_progress_container {
|
.plupload_progress_container {
|
||||||
margin-top: 3px;
|
margin-top: 3px;
|
||||||
border: 1px solid #CCC;
|
border: 1px solid #CCC;
|
||||||
background: #FFF;
|
background: #FFF;
|
||||||
padding: 1px;
|
padding: 1px;
|
||||||
}
|
}
|
||||||
.plupload_progress_bar {
|
.plupload_progress_bar {
|
||||||
width: 0px;
|
width: 0px;
|
||||||
height: 7px;
|
height: 7px;
|
||||||
background: #CDEB8B;
|
background: #CDEB8B;
|
||||||
}
|
}
|
||||||
|
|
||||||
.plupload_scroll .plupload_filelist_header .plupload_file_action, .plupload_scroll .plupload_filelist_footer .plupload_file_action {
|
.plupload_scroll .plupload_filelist_header .plupload_file_action, .plupload_scroll .plupload_filelist_footer .plupload_file_action {
|
||||||
margin-right: 17px;
|
margin-right: 17px;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Floats */
|
/* Floats */
|
||||||
|
|
||||||
.plupload_clear,.plupload_clearer {clear: both;}
|
.plupload_clear,.plupload_clearer {clear: both;}
|
||||||
.plupload_clearer, .plupload_progress_bar {
|
.plupload_clearer, .plupload_progress_bar {
|
||||||
display: block;
|
display: block;
|
||||||
font-size: 0;
|
font-size: 0;
|
||||||
line-height: 0;
|
line-height: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
li.plupload_droptext {
|
li.plupload_droptext {
|
||||||
background: transparent;
|
background: transparent;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
border: 0;
|
border: 0;
|
||||||
line-height: 165px;
|
line-height: 165px;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
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
1
phpBB/assets/plupload/jquery.plupload.queue/jquery.plupload.queue.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
28
phpBB/assets/plupload/plupload.full.min.js
vendored
Normal file
28
phpBB/assets/plupload/plupload.full.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -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 = {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue