Merge pull request #1039 from batuhawk/master

Dashboard general style updated
This commit is contained in:
Batuhan Baş 2019-12-26 16:08:45 +03:00 committed by GitHub
commit 55b093b903
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 53 additions and 5 deletions

50
public/css/custom.css vendored
View File

@ -57,6 +57,56 @@
}
/*--------Item Tax Tag Finish--------*/
/*--------Date Style--------*/
.el-date-table td.today span
{
color: #3c3f72 !important;
}
.el-date-table td.end-date span, .el-date-table td.start-date span
{
background-color: #55588b !important;
}
.el-date-table td.available:hover {
color: #6da252 !important;
}
.el-picker-panel__shortcut:hover
{
color: #6da252 !important;
}
.el-picker-panel__icon-btn:hover {
color: #6da252 !important;
}
.el-date-table td.today.end-date span, .el-date-table td.today.start-date span
{
color: #ffffff !important;
}
.el-date-table td.in-range div
{
background-color: #F2F6FC;
}
.el-range-editor.is-active
{
border-color: #3c3f72 !important;
}
.el-range-editor.el-input__inner
{
width: 55% !important;
align-items: baseline !important;
}
.el-date-editor .el-range-separator
{
width: 7% !important;
}
/*--------Date Style Finish--------*/
/*--------Carousel Arrows--------*/
.carousel-description

View File

@ -25,7 +25,7 @@
)) !!}
@if ($dashboards->count() > 1)
{!! Form::deleteLink($dashboard, 'common/dashboards') !!}
{!! Form::deleteLink($dashboard, 'common/dashboards') !!}
@endif
<div class="dropdown-divider"></div>
@ -58,7 +58,7 @@
'width' => trans('general.form.enter', ['field' => 'Width']),
'sort' => trans('general.form.enter', ['field' => 'Sort'])
]);
@endphp
@endphp
<akaunting-dashboard
v-if="dashboard_modal"
@ -92,7 +92,6 @@
@section('new_button')
<!--Dashboard General Filter-->
<div class="pull-right">
<el-date-picker
v-model="value2"
type="daterange"
@ -105,8 +104,7 @@
start-placeholder="Start date"
end-placeholder="End date"
:picker-options="pickerOptions">
</el-date-picker>
</div>
</el-date-picker>
@endsection
@section('content')