Merge remote-tracking branch 'origin/master' into oasis

# Conflicts:
#	public/mix-manifest.json
#	resources/js/components/FilesView/Option.vue
#	resources/js/components/Others/MobileNavigation.vue
This commit is contained in:
Peter Papp
2021-05-11 10:37:31 +02:00
13 changed files with 169 additions and 206 deletions
@@ -364,6 +364,16 @@ export default {
.media-full-preview {
top: 53px;
}
#pdf-wrapper {
border-radius: 0;
padding: 0;
.pdf-file {
box-shadow: none;
border-radius: 0;
}
}
}