nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-05-26 06:34:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14 from MakingCG/svg-fix

Browse Source 
fix with svg and scrolling
This commit is contained in:
Peter Papp
2020-06-05 17:29:06 +02:00
committed by GitHub
parent 6392ce1727 321bac6c9f
commit bc7950b245
7 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Tools/Editor.php
+5 -1
View File
@@ -221,7 +221,7 @@ class Editor
Storage::putFileAs($directory, $file, $filename, 'private'); Storage::putFileAs($directory, $file, $filename, 'private');
// Create image thumbnail // Create image thumbnail
if ($filetype == 'image') { if (in_array($file->getMimeType(), ['image/gif', 'image/jpeg', 'image/jpg', 'image/png', 'image/webp'])) {
// Get thumbnail name // Get thumbnail name
$thumbnail = 'thumbnail-' . $filename; $thumbnail = 'thumbnail-' . $filename;
@@ -236,6 +236,10 @@ class Editor
// Store thumbnail to disk // Store thumbnail to disk
Storage::put($directory . '/' . $thumbnail, $image); Storage::put($directory . '/' . $thumbnail, $image);
} elseif ($file->getMimeType() == 'image/svg+xml') {
$thumbnail = $filename;
} }
// Store file // Store file
config/vuefilemanager.php
+1 -1
View File
@@ -2,7 +2,7 @@
return [ return [
'version' => '1.6.2', 'version' => '1.6.3',
// Your app name // Your app name
'app_name' => 'VueFileManager', 'app_name' => 'VueFileManager',
public/css/app.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/js/main.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
resources/js/components/FilesView/FileBrowser.vue
+1 -2
View File
@@ -226,8 +226,6 @@
.file-content { .file-content {
display: flex; display: flex;
flex-wrap: nowrap;
height: 100%;
&.is-dragging { &.is-dragging {
@include transform(scale(0.99)); @include transform(scale(0.99));
@@ -289,6 +287,7 @@
right: 15px; right: 15px;
bottom: 0; bottom: 0;
@include transition; @include transition;
overflow-y: auto;
&.is-offset { &.is-offset {
margin-top: 50px; margin-top: 50px;
resources/js/components/Others/ContentFileView.vue
+1
View File
@@ -50,6 +50,7 @@
overflow-x: hidden; overflow-x: hidden;
padding-left: 15px; padding-left: 15px;
padding-right: 15px; padding-right: 15px;
overflow-y: hidden;
} }
@media only screen and (max-width: 690px) { @media only screen and (max-width: 690px) {
resources/sass/app.scss
Vendored
+1
View File
@@ -5,6 +5,7 @@
#viewport { #viewport {
display: flex; display: flex;
width: 100%; width: 100%;
height: 100%;
@include transition(200ms); @include transition(200ms);
} }