diff --git a/src/FileManager.vue b/src/FileManager.vue index ee67ac4..d96c0c8 100644 --- a/src/FileManager.vue +++ b/src/FileManager.vue @@ -248,8 +248,8 @@ export default { position: relative; padding-top: 1rem; padding-bottom: 1rem; - border-top: 1px solid #6d757d; - border-bottom: 1px solid #6d757d; + border-top: 1px solid #DCDFE6; + border-bottom: 1px solid #DCDFE6; } .unselectable { diff --git a/src/components/blocks/InfoBlock.vue b/src/components/blocks/InfoBlock.vue index a16d744..8285ea0 100644 --- a/src/components/blocks/InfoBlock.vue +++ b/src/components/blocks/InfoBlock.vue @@ -151,7 +151,6 @@ export default { margin-left: -15px; padding-top: 0.2rem; padding-bottom: 0.4rem; - border-bottom: 1px solid #6d757d; .progress { margin-top: 0.3rem; diff --git a/src/components/blocks/Navbar.vue b/src/components/blocks/Navbar.vue index eba00fe..241f33e 100644 --- a/src/components/blocks/Navbar.vue +++ b/src/components/blocks/Navbar.vue @@ -3,48 +3,48 @@
- - -
- - - - -
- - -
-
- -
-
- -
-
- -
diff --git a/src/components/blocks/mixins/contextMenuActions.js b/src/components/blocks/mixins/contextMenuActions.js index 3de8f69..917091a 100644 --- a/src/components/blocks/mixins/contextMenuActions.js +++ b/src/components/blocks/mixins/contextMenuActions.js @@ -65,6 +65,9 @@ export default { * Select file */ selectAction() { + if (this.multiSelect) { + this.$store.state.fm.fileCallback(this.selectedItems.map(item => item.path)) + } // file callback this.$store.dispatch('fm/url', { disk: this.selectedDisk, diff --git a/src/components/blocks/mixins/contextMenuRules.js b/src/components/blocks/mixins/contextMenuRules.js index 51291aa..d5c9866 100644 --- a/src/components/blocks/mixins/contextMenuRules.js +++ b/src/components/blocks/mixins/contextMenuRules.js @@ -54,7 +54,7 @@ export default { * @returns {boolean|null} */ selectRule() { - return !this.multiSelect && this.firstItemType === 'file' && + return this.firstItemType === 'file' && this.$store.state.fm.fileCallback; }, diff --git a/src/components/manager/mixins/manager.js b/src/components/manager/mixins/manager.js index 26cafa6..0959585 100644 --- a/src/components/manager/mixins/manager.js +++ b/src/components/manager/mixins/manager.js @@ -101,7 +101,7 @@ export default { const alreadySelected = this.selected[type].includes(path); // if pressed Ctrl -> multi select - if (event.ctrlKey) { + if (event.shiftKey) { if (!alreadySelected) { // add new selected item this.$store.commit(`fm/${this.manager}/setSelected`, { type, path }); @@ -112,7 +112,7 @@ export default { } // single select - if (!event.ctrlKey && !alreadySelected) this.$store.commit(`fm/${this.manager}/changeSelected`, { type, path }); + if (!event.shiftKey && !alreadySelected) this.$store.commit(`fm/${this.manager}/changeSelected`, { type, path }); }, /** diff --git a/src/components/modals/additions/Cropper.vue b/src/components/modals/additions/Cropper.vue index f429c67..c5aabfc 100644 --- a/src/components/modals/additions/Cropper.vue +++ b/src/components/modals/additions/Cropper.vue @@ -272,7 +272,7 @@ export default {