Merge branch 'master' of https://github.com/brkcvn/akaunting into code-clean
This commit is contained in:
commit
d238817e8d
@ -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;
|
||||
|
6
public/css/app.css
vendored
6
public/css/app.css
vendored
@ -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
|
||||
*/
|
||||
|
5
public/css/third_party/dropzone_custom.css
vendored
5
public/css/third_party/dropzone_custom.css
vendored
@ -96,4 +96,7 @@
|
||||
width: 45px;
|
||||
}
|
||||
|
||||
|
||||
.form-file [data-dz-remove] {
|
||||
bottom: 7px;
|
||||
z-index: 99;
|
||||
}
|
@ -1,4 +1,8 @@
|
||||
@if (strlen($slot) >= 25 )
|
||||
@php
|
||||
$slot_isHtml = strlen(strip_tags($slot)) < strlen($slot);
|
||||
@endphp
|
||||
|
||||
@if (strlen($slot) >= 25 && ! $slot_isHtml)
|
||||
<x-tooltip id="page-title" placement="bottom" message="{!! $slot !!}">
|
||||
<div class="truncate" style="width: 22rem;">
|
||||
{!! $slot !!}
|
||||
|
Loading…
x
Reference in New Issue
Block a user