@@ -24,11 +24,13 @@
-
+
+
+
+
-
- {{ moreOptionsTitle }}
-
+
+
@@ -45,13 +47,15 @@
-
-
diff --git a/resources/js/components/Others/ThumbnailItem.vue b/resources/js/components/Others/ThumbnailItem.vue
index b081498c..3641dd8c 100644
--- a/resources/js/components/Others/ThumbnailItem.vue
+++ b/resources/js/components/Others/ThumbnailItem.vue
@@ -157,13 +157,6 @@
}
}
- @media only screen and (max-width: 690px) {
- .file-item {
- padding: 0 15px;
- margin-bottom: 20px;
- }
- }
-
.dark {
.file-item {
.icon-item .file-icon {
diff --git a/src/Domain/Folders/Actions/UpdateFolderPropertyAction.php b/src/Domain/Folders/Actions/UpdateFolderPropertyAction.php
index fc48d009..c47c8572 100644
--- a/src/Domain/Folders/Actions/UpdateFolderPropertyAction.php
+++ b/src/Domain/Folders/Actions/UpdateFolderPropertyAction.php
@@ -14,28 +14,9 @@ class UpdateFolderPropertyAction
// Get folder
$folder = Folder::find($id);
- // Set default folder icon
- if ($request->input('emoji') === 'default') {
- $folder->update([
- 'emoji' => null,
- 'color' => null,
- ]);
- }
-
- // Set emoji
- if ($request->filled('emoji')) {
- $folder->update([
- 'emoji' => $request->input('emoji'),
- 'color' => null,
- ]);
- }
-
- // Set color
- if ($request->filled('color')) {
- $folder->update([
- 'emoji' => null,
- 'color' => $request->input('color'),
- ]);
- }
+ $folder->update([
+ 'emoji' => $request->input('emoji'),
+ 'color' => $request->input('color'),
+ ]);
}
}
diff --git a/src/Domain/Items/Controllers/RenameFileOrFolderController.php b/src/Domain/Items/Controllers/RenameFileOrFolderController.php
index 534510ab..3f3407f3 100644
--- a/src/Domain/Items/Controllers/RenameFileOrFolderController.php
+++ b/src/Domain/Items/Controllers/RenameFileOrFolderController.php
@@ -30,7 +30,7 @@ class RenameFileOrFolderController extends Controller
}
// If request contain icon or color, then change it
- if ($request->filled('emoji') || $request->filled('color')) {
+ if ($request->has('emoji') || $request->has('color')) {
($this->updateFolderProperty)($request, $id);
}