mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into interface

This commit is contained in:
Robin Appelman 2011-07-22 00:28:17 +02:00
parent d9a79c0f7e 828a26c69e
commit 9950f06c59
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_imageviewer/js/lightbox.js
View File

@ -36,7 +36,7 @@ function showLightbox(container,img){
img.width = maxHeight * ratio;
} else {
img.width = maxWidth;
img.height = maxWidth * ratio;
img.height = maxWidth / ratio;
}
}
container.empty();
@ -55,4 +55,4 @@ function hideLightbox(){
$('#lightbox').hide();
lightBoxShown=false;
}
}
}

1
core/templates/layout.admin.php
View File

@ -23,7 +23,6 @@
echo $header['text'];
echo '</'.$header['tag'].'>';
?>
<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
<?php endforeach; ?>
</head>

1
core/templates/layout.user.php
View File

@ -23,7 +23,6 @@
echo $header['text'];
echo '</'.$header['tag'].'>';
?>
<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
<?php endforeach; ?>
</head>