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

# Conflicts:
#	.php-cs-fixer.cache
#	app/Http/helpers.php
#	app/Services/FileManagerService.php
#	composer.lock
#	public/chunks/environment-setup.js
#	public/chunks/files~chunks/shared/file-browser.js
#	public/js/main.js
#	public/mix-manifest.json
This commit is contained in:
Peter Papp
2021-06-29 18:38:53 +02:00
28 changed files with 1407 additions and 1821 deletions
@@ -2,8 +2,8 @@
<div class="mobile-toolbar">
<!-- Go back-->
<div @click="goBack" class="go-back-button">
<chevron-left-icon :class="{'is-visible': browseHistory.length > 1}" size="17" class="icon-back" />
<div @click="goBack" class="go-back-button" :class="{'is-visible': browseHistory.length > 1}">
<chevron-left-icon size="17" class="icon-back" />
</div>
<!--Folder Title-->
@@ -103,23 +103,25 @@
white-space: nowrap;
}
.go-back-button {
text-align: left;
flex: 1;
.go-back-button {
text-align: left;
flex: 1;
opacity: 0;
visibility: hidden;
pointer-events: none;
.icon-back {
vertical-align: middle;
cursor: pointer;
opacity: 0;
visibility: hidden;
margin-top: -2px;
.icon-back {
vertical-align: middle;
cursor: pointer;
margin-top: -2px;
}
&.is-visible {
opacity: 1;
visibility: visible;
}
}
}
&.is-visible {
pointer-events: initial;
visibility: visible;
opacity: 1;
}
}
.directory-name {
line-height: 1;