shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'akaunting:master' into sentry

Browse Source
This commit is contained in:
Burak Civan
2022-11-21 16:57:16 +03:00
committed by GitHub
parent d45ad10641 8581e5d3e8
commit 3a7410f0fe
19 changed files with 273 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/components/form/group/recurring.blade.php
View File

@ -1,7 +1,7 @@
<akaunting-recurring
start-text="{!! trans('recurring.limit_date', ['type' => Str::replace('-recurring', '', $type)]) !!}"
:date-range-text="{{ json_encode(trans('general.date_range')) }}"
middleText="{!! trans('recurring.limit_middle') !!}"
middle-text="{!! trans('recurring.limit_middle') !!}"
end-text="{{ Str::plural(Str::replace('-recurring', '', $type)) }}"
:frequencies="{{ json_encode($frequencies) }}"
@ -64,4 +64,4 @@
{{ $attributes }}
>
</akaunting-recurring>
</akaunting-recurring>

2
resources/views/components/layouts/admin/header.blade.php
View File

@ -13,7 +13,7 @@
</h1>
@if (! empty($status))
<div class="ltr:ml-4 rtl:mr-4">
<div class="ltr:ml-4 rtl:mr-4 mt-2">
{!! $status !!}
</div>
@endif

4
resources/views/components/layouts/portal/header.blade.php
View File

@ -1,7 +1,7 @@
@stack('header_start')
<div id="header" class="xl:pt-6 -mt-2">
<div class="flex flex-col sm:flex-row items-start justify-between space-x-4 hide-empty-page">
<div class="flex flex-col sm:flex-row items-start justify-between sm:space-x-4 hide-empty-page">
<div data-page-title-first class="w-full sm:w-6/12 items-center mb-3 sm:mb-0">
<div class="flex items-center">
<h1 class="flex items-center text-2xl xl:text-5xl text-black font-light -ml-0.5 mt-2 whitespace-nowrap">
@ -13,7 +13,7 @@
</h1>
@if (! empty($status))
<div class="ltr:ml-4 rtl:mr-4">
<div class="ltr:ml-4 rtl:mr-4 mt-2">
{!! $status !!}
</div>
@endif

4
resources/views/components/layouts/preview/header.blade.php
View File

@ -1,7 +1,7 @@
@stack('header_start')
<div id="header" class="xl:pt-6 -mt-2">
<div class="flex flex-col sm:flex-row items-start justify-between space-x-4 hide-empty-page">
<div class="flex flex-col sm:flex-row items-start justify-between sm:space-x-4 hide-empty-page">
<div data-page-title-first class="w-full sm:w-6/12 items-center mb-3 sm:mb-0">
<div class="flex items-center">
<h1 class="flex items-center text-2xl xl:text-5xl text-black font-light -ml-0.5 mt-2 whitespace-nowrap">
@ -13,7 +13,7 @@
</h1>
@if (! empty($status))
<div class="ltr:ml-4 rtl:mr-4">
<div class="ltr:ml-4 rtl:mr-4 mt-2">
{!! $status !!}
</div>
@endif

4
resources/views/components/layouts/signed/header.blade.php
View File

@ -1,7 +1,7 @@
@stack('header_start')
<div id="header" class="xl:pt-6 -mt-2">
<div lass="flex flex-col sm:flex-row items-start justify-between space-x-4 hide-empty-page">
<div lass="flex flex-col sm:flex-row items-start justify-between sm:space-x-4 hide-empty-page">
<div data-page-title-first class="w-full sm:w-6/12 items-center mb-3 sm:mb-0">
<div class="flex items-center">
<h1 class="flex items-center text-2xl xl:text-5xl text-black font-light -ml-0.5 mt-2 whitespace-nowrap">
@ -13,7 +13,7 @@
</h1>
@if (! empty($status))
<div class="ltr:ml-4 rtl:mr-4">
<div class="ltr:ml-4 rtl:mr-4 mt-2">
{!! $status !!}
</div>
@endif