Merge branch 'svg-fix' into dev

* svg-fix:
  fix with svg and scrolling
  v1.6.2 released
  v1.6.1
This commit is contained in:
carodej
2020-06-05 17:39:00 +02:00
6 changed files with 9 additions and 4 deletions
+5 -1
View File
@@ -221,7 +221,7 @@ class Editor
Storage::putFileAs($directory, $file, $filename, 'private');
// Create image thumbnail
if ($filetype == 'image') {
if (in_array($file->getMimeType(), ['image/gif', 'image/jpeg', 'image/jpg', 'image/png', 'image/webp'])) {
// Get thumbnail name
$thumbnail = 'thumbnail-' . $filename;
@@ -236,6 +236,10 @@ class Editor
// Store thumbnail to disk
Storage::put($directory . '/' . $thumbnail, $image);
} elseif ($file->getMimeType() == 'image/svg+xml') {
$thumbnail = $filename;
}
// Store file
+1 -1
View File
@@ -2,7 +2,7 @@
return [
'version' => '1.6',
'version' => '1.6.3',
// Your app name
'app_name' => 'VueFileManager',
@@ -226,8 +226,6 @@
.file-content {
display: flex;
flex-wrap: nowrap;
height: 100%;
&.is-dragging {
@include transform(scale(0.99));
@@ -289,6 +287,7 @@
right: 15px;
bottom: 0;
@include transition;
overflow-y: auto;
&.is-offset {
margin-top: 50px;
@@ -50,6 +50,7 @@
overflow-x: hidden;
padding-left: 15px;
padding-right: 15px;
overflow-y: hidden;
}
@media only screen and (max-width: 690px) {
+1
View File
@@ -5,6 +5,7 @@
#viewport {
display: flex;
width: 100%;
height: 100%;
@include transition(200ms);
}