From e82f936571f8f296fcc35b8aeb39a3f2644d79ff Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Wed, 24 Aug 2022 10:32:19 +0300 Subject: [PATCH 1/4] slot is html control --- resources/views/components/title.blade.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/views/components/title.blade.php b/resources/views/components/title.blade.php index 05dd5cd06..5a7faec4d 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 != true)
{!! $slot !!} From 7f2bc7826695f1692b7bf50e4b02744992ce6e50 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Wed, 24 Aug 2022 10:54:35 +0300 Subject: [PATCH 2/4] code refactoring for title component --- resources/views/components/title.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/components/title.blade.php b/resources/views/components/title.blade.php index 5a7faec4d..63e9532c7 100644 --- a/resources/views/components/title.blade.php +++ b/resources/views/components/title.blade.php @@ -2,7 +2,7 @@ $slot_isHtml = strlen(strip_tags($slot)) < strlen($slot); @endphp -@if (strlen($slot) >= 25 && $slot_isHtml != true) +@if (strlen($slot) >= 25 && ! $slot_isHtml)
{!! $slot !!} From 9dfd611ba4acaf62c1e0ee971284803931e29ecc Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Thu, 25 Aug 2022 10:02:09 +0300 Subject: [PATCH 3/4] delete icon styling for dropzone component --- public/css/app.css | 6 ++++-- public/css/third_party/dropzone_custom.css | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index 5bf4ab8ba..5025842c9 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 From ea646137a4cf9288da329092b6f6988b13ce6af3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cihan=20=C5=9Eent=C3=BCrk?= <53110792+CihanSenturk@users.noreply.github.com> Date: Thu, 25 Aug 2022 16:33:42 +0300 Subject: [PATCH 4/4] Empty pages doc description hide --- app/View/Components/EmptyPage.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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;