diff --git a/app/View/Components/EmptyPage.php b/app/View/Components/EmptyPage.php index fa109c02d..f73a07a9c 100644 --- a/app/View/Components/EmptyPage.php +++ b/app/View/Components/EmptyPage.php @@ -53,6 +53,9 @@ class EmptyPage extends Component /** @var bool */ public $hideButtonImport; + /** @var bool */ + public $hideDocsDescription; + /** @var string */ public $importRoute; @@ -76,7 +79,7 @@ class EmptyPage extends Component string $image = '', string $imageEmptyPage = '', bool $checkPermissionCreate = true, string $permissionCreate = '', array $buttons = [], bool $hideButtonCreate = false, bool $hideButtonImport = false, - string $importRoute = '', array $importRouteParameters = [] + bool $hideDocsDescription = false, string $importRoute = '', array $importRouteParameters = [] ) { if (empty($alias) && ! empty($group)) { $alias = $group; @@ -98,6 +101,7 @@ class EmptyPage extends Component $this->hideButtonCreate = $hideButtonCreate; $this->hideButtonImport = $hideButtonImport; + $this->hideDocsDescription = $hideDocsDescription; $this->buttons = $this->getButtons($page, $group, $buttons); @@ -162,10 +166,12 @@ class EmptyPage extends Component $description = trans($text2); } - $docs_url = $this->getDocsUrl(); + if ($this->hideDocsDescription) { + $docs_url = $this->getDocsUrl(); - if (! empty($docs_url)) { - $description .= ' ' . trans('general.empty.documentation', ['url' => $docs_url]); + if (! empty($docs_url)) { + $description .= ' ' . trans('general.empty.documentation', ['url' => $docs_url]); + } } return $description; diff --git a/public/css/app.css b/public/css/app.css index c3ca14a8f..b6fcc4f3e 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -411,8 +411,10 @@ width: 45px; } - - +.form-file [data-dz-remove] { + bottom: 7px; + z-index: 99; +} /* ! tailwindcss v3.0.24 | MIT License | https://tailwindcss.com */ diff --git a/public/css/third_party/dropzone_custom.css b/public/css/third_party/dropzone_custom.css index 4a1d89fbc..313976b4c 100644 --- a/public/css/third_party/dropzone_custom.css +++ b/public/css/third_party/dropzone_custom.css @@ -96,4 +96,7 @@ width: 45px; } - +.form-file [data-dz-remove] { + bottom: 7px; + z-index: 99; +} \ No newline at end of file diff --git a/resources/views/components/title.blade.php b/resources/views/components/title.blade.php index 05dd5cd06..63e9532c7 100644 --- a/resources/views/components/title.blade.php +++ b/resources/views/components/title.blade.php @@ -1,4 +1,8 @@ -@if (strlen($slot) >= 25 ) +@php + $slot_isHtml = strlen(strip_tags($slot)) < strlen($slot); +@endphp + +@if (strlen($slot) >= 25 && ! $slot_isHtml)
{!! $slot !!}