mirror of
https://github.com/VueFileManager/vuefilemanager.git
synced 2026-05-17 18:55:02 +00:00
Merge remote-tracking branch 'origin/master' into light
# Conflicts: # .env.testing # README.md # composer.json # composer.lock # config/language-translations.php # config/vuefilemanager.php # public/chunks/admin.js # public/chunks/database.js # public/chunks/demo.js # public/chunks/files.js # public/chunks/my-shared-items.js # public/chunks/platform.js # public/chunks/recent-uploads.js # public/chunks/settings-storage.js # public/chunks/settings.js # public/chunks/shared.js # public/chunks/shared/browser.js # public/chunks/shared/single-file.js # public/chunks/sign-in.js # public/chunks/status-check.js # public/chunks/trash.js # public/chunks/user-storage.js # public/css/tailwind.css # public/js/main.js # public/mix-manifest.json # resources/js/components/Subscription/UserFixedSubscriptionDetail.vue # resources/js/store/modules/userAuth.js # resources/js/views/Admin.vue # resources/js/views/Admin/PaymentSettings/PaymentSettingsTab/Payments.vue # resources/js/views/Admin/Plans.vue # resources/js/views/Admin/Plans/Create/CreateFixedPlan.vue # resources/js/views/Admin/Settings/AppSettingsTabs/SignInUp.vue # resources/js/views/Demo.vue # resources/js/views/Frontpage/Homepage.vue # resources/js/views/Platform.vue # resources/views/index.blade.php # src/App/Console/Commands/SetupWebsocketEnvironment.php # src/App/Users/Models/UserLimitation.php # src/Domain/RemoteUpload/Controllers/RemoteUploadFileController.php # src/Domain/RemoteUpload/Controllers/UploadFilesRemotelyForUploadRequestController.php # src/Domain/RemoteUpload/Controllers/VisitorRemoteUploadFileController.php # src/Domain/RemoteUpload/Requests/RemoteUploadRequest.php # src/Domain/Settings/Controllers/StoreBroadcastServiceCredentialsController.php # src/Domain/Settings/Controllers/StorePaymentServiceCredentialsController.php # src/Domain/SetupWizard/Controllers/StoreEnvironmentSettingsController.php # src/Domain/UploadRequest/Controllers/UploadFilesForUploadRequestController.php # src/Support/Upgrading/Controllers/UpgradingVersionsController.php
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
'bg-light-background dark:bg-dark-foreground': isClicked && canHover,
|
||||
'dark:hover:bg-dark-foreground lg:hover:bg-light-background': canHover,
|
||||
}"
|
||||
class="relative z-0 flex h-48 select-none flex-wrap items-center justify-center rounded-lg border-2 border-dashed border-transparent px-1 pt-2 text-center sm:h-56 lg:h-60"
|
||||
class="relative z-0 flex h-48 select-none flex-wrap items-center justify-center rounded-lg border-2 border-dashed border-transparent px-1 pt-2 text-center sm:h-56 lg:h-60 cursor-pointer"
|
||||
:draggable="canDrag"
|
||||
spellcheck="false"
|
||||
>
|
||||
@@ -68,7 +68,7 @@
|
||||
<!--Item Title-->
|
||||
<span
|
||||
class="inline-block w-full overflow-hidden text-ellipsis whitespace-nowrap text-sm font-bold leading-3 tracking-tight md:px-6"
|
||||
:class="{ 'hover:underline': canEditName }"
|
||||
:class="{ 'hover:underline cursor-text': canEditName }"
|
||||
ref="name"
|
||||
@input="renameItem"
|
||||
@keydown.delete.stop
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
'bg-light-background dark:bg-dark-foreground': isClicked && highlight,
|
||||
'hover:bg-light-background dark:hover:bg-dark-foreground': highlight,
|
||||
}"
|
||||
class="flex select-none items-center rounded-xl border-2 border-dashed border-transparent px-2.5 py-2"
|
||||
class="flex select-none items-center rounded-xl border-2 border-dashed border-transparent px-2.5 py-2 cursor-pointer"
|
||||
:draggable="canDrag"
|
||||
spellcheck="false"
|
||||
>
|
||||
@@ -46,7 +46,7 @@
|
||||
<!--Item Title-->
|
||||
<span
|
||||
class="mb-0.5 block overflow-hidden text-ellipsis whitespace-nowrap text-sm font-bold"
|
||||
:class="{ 'hover:underline': canEditName }"
|
||||
:class="{ 'hover:underline cursor-text': canEditName }"
|
||||
style="max-width: 240px"
|
||||
ref="name"
|
||||
@input="renameItem"
|
||||
|
||||
@@ -9,8 +9,6 @@
|
||||
}"
|
||||
class="chart-wrapper"
|
||||
>
|
||||
<!--<DotLabel class="label" :class="{'offset-top': chart.progress < 5}" :color="chart.color" :title="chart.value" />-->
|
||||
|
||||
<!--Only singe line-->
|
||||
<span
|
||||
v-if="data.length === 1"
|
||||
|
||||
Reference in New Issue
Block a user