diff --git a/public/css/app.css b/public/css/app.css index 9d5d2828f..1126fa496 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -47162,6 +47162,18 @@ html[dir='rtl'] .el-scrollbar__wrap { .el-range-editor.el-input__inner { width: 100%; } + /* apex-chart cash-flow */ + .apex-chart-cash-flow .apexcharts-legend { + width: 24rem !important; + -ms-flex-pack: distribute !important; + justify-content: space-around !important; + padding: 0; + } + + .apex-chart-cash-flow .apexcharts-toolbar { + top: 45px !important; + } + /* apex-chart cash-flow */ } /* element-ui */ @@ -47241,13 +47253,25 @@ html[dir="rtl"] .lines-radius-border thead td:last-child { @media only screen and (max-width: 480px) { .small-table-width { - width: 450px; + width: 550px; } .small-col { width: auto !important; } + .description-col { + width: 180px !important + } + + .amount-col { + width: 70px !important; + } + + .name-col { + width: 6rem !important + } + .information-content { -webkit-transform: unset !important; transform: unset !important; @@ -49918,6 +49942,14 @@ body{ position: absolute; } + .lg\:relative{ + position: relative; + } + + .lg\:right-0{ + right: 0px; + } + .lg\:right-24{ right: 6rem; } @@ -49948,6 +49980,10 @@ body{ margin-top: 1rem; } + .lg\:mt-11{ + margin-top: 2.75rem; + } + .lg\:mt-60{ margin-top: 15rem; } @@ -50074,6 +50110,10 @@ body{ width: 66.666667%; } + .lg\:w-auto{ + width: auto; + } + .lg\:w-1\/4{ width: 25%; } @@ -50094,10 +50134,6 @@ body{ width: 24rem; } - .lg\:w-auto{ - width: auto; - } - .lg\:w-2\/4{ width: 50%; } @@ -50158,6 +50194,11 @@ body{ justify-content: center; } + .lg\:justify-around{ + -ms-flex-pack: distribute; + justify-content: space-around; + } + .lg\:gap-16{ gap: 4rem; } diff --git a/resources/assets/sass/app.css b/resources/assets/sass/app.css index 97c9b1402..6b307fe98 100644 --- a/resources/assets/sass/app.css +++ b/resources/assets/sass/app.css @@ -459,6 +459,17 @@ html[dir='rtl'] .el-scrollbar__wrap { .el-range-editor.el-input__inner { width: 100%; } + /* apex-chart cash-flow */ + .apex-chart-cash-flow .apexcharts-legend { + width: 24rem !important; + justify-content: space-around !important; + padding: 0; + } + + .apex-chart-cash-flow .apexcharts-toolbar { + top: 45px !important; + } + /* apex-chart cash-flow */ } /* element-ui */ @@ -529,13 +540,25 @@ html[dir="rtl"] .lines-radius-border thead td:last-child { @media only screen and (max-width: 480px) { .small-table-width { - width: 450px; + width: 550px; } .small-col { width: auto !important; } + .description-col { + width: 180px !important + } + + .amount-col { + width: 70px !important; + } + + .name-col { + width: 6rem !important + } + .information-content { transform: unset !important; margin-top: 70px !important; diff --git a/resources/views/components/documents/form/items.blade.php b/resources/views/components/documents/form/items.blade.php index f6d2d01dd..dad64e7e2 100644 --- a/resources/views/components/documents/form/items.blade.php +++ b/resources/views/components/documents/form/items.blade.php @@ -4,11 +4,11 @@ - - + + - + diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php index 99cea16db..a4f169718 100644 --- a/resources/views/components/documents/form/line-item.blade.php +++ b/resources/views/components/documents/form/line-item.blade.php @@ -8,10 +8,10 @@ - + - + @@ -30,7 +30,9 @@
@if (! $hideItemName) - + +
+
@stack('name_input_start') diff --git a/resources/views/widgets/cash_flow.blade.php b/resources/views/widgets/cash_flow.blade.php index aea334ad5..80c4e0791 100644 --- a/resources/views/widgets/cash_flow.blade.php +++ b/resources/views/widgets/cash_flow.blade.php @@ -1,48 +1,48 @@
@include($class->views['header'], ['header_class' => '']) -
-
+
+
{!! $chart->container() !!}
-
-
+
+
{{ $totals['incoming_for_humans'] }}
- + - remove + remove
-
+
{{ $totals['outgoing_for_humans'] }}
- + - drag_handle + drag_handle
-
+
{{ $totals['profit_for_humans'] }}
- {{ trans_choice('general.profits', 1) }} +
diff --git a/safelist.txt b/safelist.txt index d667e08b7..ff45c7678 100644 --- a/safelist.txt +++ b/safelist.txt @@ -5,5 +5,9 @@ lg:my-12 lg:mt-4 lg:pl-6 lg:w-9 +lg:mt-11 +lg:relative +lg:right-0 +lg:justify-around ltr:-right-1.5 rtl:-left-1.5 \ No newline at end of file