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

Merge pull request #2440 from brkcvn/master

Browse Source 
Ui feedbacks
This commit is contained in:
Burak Civan 2022-06-10 12:04:29 +03:00 committed by GitHub
commit 3ee70a7d8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Abstracts/Report.php
View File

@ -237,6 +237,9 @@ abstract class Report
->setColors(array_values($colors)) ->setColors(array_values($colors))
->setDataset($this->tables[$table_key], 'donut', array_values($values)); ->setDataset($this->tables[$table_key], 'donut', array_values($values));
$chart->options['legend']['width'] = 150;
$chart->options['legend']['position'] = 'right';
return $chart; return $chart;
} }

3
app/Widgets/ExpensesByCategory.php
View File

@ -27,6 +27,9 @@ class ExpensesByCategory extends Widget
$chart = $this->getDonutChart(trans_choice('general.expenses', 2), '100%', 300, 6); $chart = $this->getDonutChart(trans_choice('general.expenses', 2), '100%', 300, 6);
$chart->options['legend']['width'] = 210;
$chart->options['legend']['position'] = 'right';
return $this->view('widgets.donut_chart', [ return $this->view('widgets.donut_chart', [
'chart' => $chart, 'chart' => $chart,
]); ]);

12
public/css/app.css vendored
View File

@ -46881,7 +46881,7 @@ input[type="date"]::-webkit-inner-spin-button,
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
cursor: pointer !important; cursor: pointer !important;
margin-top: 8px; margin-top: 8px;
margin-bottom: 0 !important; margin-bottom: -8px !important;
} }
.el-select__footer:hover { .el-select__footer:hover {
@ -46902,11 +46902,7 @@ input[type="date"]::-webkit-inner-spin-button,
} }
.el-select-dropdown__list { .el-select-dropdown__list {
padding: 8px 0 0 0; padding: 8px 0 8px 0;
}
.el-select-dropdown__item:last-child {
margin-bottom: 8px;
} }
.el-select .el-select__tags { .el-select .el-select__tags {
@ -48223,6 +48219,10 @@ body{
grid-template-columns: repeat(4, minmax(0, 1fr)); grid-template-columns: repeat(4, minmax(0, 1fr));
} }
.sm\:grid-cols-2{
grid-template-columns: repeat(2, minmax(0, 1fr));
}
.sm\:grid-cols-3{ .sm\:grid-cols-3{
grid-template-columns: repeat(3, minmax(0, 1fr)); grid-template-columns: repeat(3, minmax(0, 1fr));
} }

2
resources/assets/js/components/AkauntingWidget.vue
View File

@ -157,7 +157,7 @@ export default {
description: "Widget Dashboard Id" description: "Widget Dashboard Id"
}, },
widget_id: { widget_id: {
type: Number, type: [Number, String],
default: 0, default: 0,
description: "Edit Widget ID" description: "Edit Widget ID"
}, },

8
resources/assets/sass/app.css vendored
View File

@ -309,7 +309,7 @@
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
cursor: pointer !important; cursor: pointer !important;
margin-top: 8px; margin-top: 8px;
margin-bottom: 0 !important; margin-bottom: -8px !important;
} }
.el-select__footer:hover { .el-select__footer:hover {
@ -330,11 +330,7 @@
} }
.el-select-dropdown__list { .el-select-dropdown__list {
padding: 8px 0 0 0; padding: 8px 0 8px 0;
}
.el-select-dropdown__item:last-child {
margin-bottom: 8px;
} }
.el-select .el-select__tags { .el-select .el-select__tags {