Merge remote-tracking branch 'origin/exif_metadata'

# Conflicts:
#	public/mix-manifest.json
#	resources/js/App.vue
#	resources/js/components/FilesView/ImageMetaData.vue
#	resources/js/components/FilesView/InfoSidebar.vue
#	resources/js/components/FilesView/SearchBar.vue
#	resources/js/components/Spotlight/Spotlight.vue
#	resources/js/views/Shared.vue
#	src/Domain/Files/Resources/FileResource.php
This commit is contained in:
Čarodej
2022-02-25 18:23:08 +01:00
16 changed files with 358 additions and 143 deletions

View File

@@ -22,15 +22,15 @@
<script>
import { SearchIcon } from 'vue-feather-icons'
export default {
name: 'SearchBar',
components: {
SearchIcon,
},
computed: {
metaKeyIcon() {
return this.$isApple() ? '⌘' : '⊞'
export default {
name: 'SearchBar',
components: {
SearchIcon,
},
},
}
computed: {
metaKeyIcon() {
return this.$isApple() ? '⌘' : 'Ctrl'
},
},
}
</script>