mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-09-02 19:02:39 +02:00
Code Issues Releases Wiki Activity

Merged upstream changes.

Browse Source
This commit is contained in:
Lóna Lore
2017-01-15 23:10:46 +01:00
parent efeeeb94a4 5814011369
commit 8b7631995e
83 changed files with 1606 additions and 796 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
e107_web/css/backcompat.css
View File

@@ -39,4 +39,17 @@ ul.breadcrumb li span.divider { padding-left:5px; }
.thumbnail img { border-radius:8px; }
.img-responsive { max-width:100%; }
.logo.img-responsive { height: auto; }
.media-list {
padding-left: 0;
list-style: none;
}
.media-body, .media-left, .media-right {
display: table-cell;
vertical-align: top;
}
.media-left, .media > .pull-left {
padding-right: 10px;
}

2
e107_web/js/core/admin.jquery.css
View File

@@ -8,7 +8,7 @@ a.media-select-image:hover { border:1px solid red; }
a.media-select-image,
a.media-select-none { margin:5px; text-decoration:none; width:80px; height:80px; box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.1), 0px 1px 7px 0px rgba(0, 0, 0, 0.8) inset; background: none repeat scroll 0% 0% rgba(0, 0, 0, 0.3);}
a.media-select-none { margin:5px; margin-left:0; text-decoration:none; width:80px; height:80px; box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.1), 0px 1px 7px 0px rgba(0, 0, 0, 0.8) inset; background: none repeat scroll 0% 0% rgba(0, 0, 0, 0.3);}
@media (min-height: 500px){
a.media-select-image,

10
e107_web/js/core/mediaManager.js
View File

@@ -485,24 +485,22 @@ $(document).ready(function()
$('#e-modal-loading', window.parent.document).show();
$('iframe', window.parent.document).attr('scrolling', 'no'); // hide the scrollbar.
$(id).hide('slide', { direction: outDir }, 1500, function(){ });
$.get(src, function( data ) {
$(id).hide('slide', { direction: outDir }, 1200, function(){
// alert('done');
// alert('done');
$(id ).html( data );
newVal = $('#admin-ui-media-select-count-hidden').text();
$('#admin-ui-media-select-count').text(newVal).fadeIn();
$(id).show('slide', { direction: inDir },1200,function(){
$(id).show('slide', { direction: inDir },500,function(){
$('#e-modal-loading', window.parent.document).hide();
});
});