diff --git a/client/assets/img/volume_low.svg b/client/assets/img/volume_low.svg index f9531c6c..49ceb441 100644 --- a/client/assets/img/volume_low.svg +++ b/client/assets/img/volume_low.svg @@ -1,4 +1,4 @@ - + diff --git a/client/assets/img/volume_mute.svg b/client/assets/img/volume_mute.svg index 606b0079..afe59474 100644 --- a/client/assets/img/volume_mute.svg +++ b/client/assets/img/volume_mute.svg @@ -1,4 +1,4 @@ - + diff --git a/client/pages/filespage.js b/client/pages/filespage.js index ba2c22d1..bde63702 100644 --- a/client/pages/filespage.js +++ b/client/pages/filespage.js @@ -120,7 +120,7 @@ export class FilesPageComponent extends React.Component { } }); this.onRefresh(); - } else if(e.code === "KeyA" && e.ctrlKey === true) { + } else if (e.code === "KeyA" && e.ctrlKey === true && document.activeElement.tagName !== "INPUT") { if (this.state.selected.length === this.state.files.length) { this.handleMultiSelect([], e); } else { diff --git a/client/pages/filespage/thing.scss b/client/pages/filespage/thing.scss index 2502385b..5e0cb21f 100644 --- a/client/pages/filespage/thing.scss +++ b/client/pages/filespage/thing.scss @@ -76,6 +76,7 @@ margin: 0 -10px; padding: 0 10px; position: relative; + .component_icon{ padding: 1px 0; box-sizing: border-box; @@ -224,7 +225,6 @@ } .component_filesize, .component_datetime{ display: none; } .component_action{ - opacity: 0; transform: translateX(5px); transition: 0.15s ease-out all; z-index: 2; @@ -242,7 +242,6 @@ &:hover{ .component_action{ transition-delay: 0.1s; - opacity: 1; transform: translateX(0); } img.thumbnail{ @@ -306,6 +305,14 @@ } } } + + .not-selected .box { + &:hover .component_action { opacity: 1; } + .component_action { opacity: 0; } + } + .selected .box { + .component_action { opacity: 0; } + } } .dark-mode .component_thing {