From 2856ccf9ffb87f186530e55184d642c9bb423615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Wed, 1 Jan 2020 12:45:02 +0300
Subject: [PATCH] refs #1065

---
 resources/views/partials/auth/head.blade.php               | 7 ++++---
 resources/views/partials/widgets/standard_header.blade.php | 2 +-
 resources/views/widgets/cash_flow.blade.php                | 2 +-
 resources/views/widgets/expenses_by_category.blade.php     | 2 +-
 resources/views/widgets/income_by_category.blade.php       | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/resources/views/partials/auth/head.blade.php b/resources/views/partials/auth/head.blade.php
index 0607ed6f7..9742b22b9 100644
--- a/resources/views/partials/auth/head.blade.php
+++ b/resources/views/partials/auth/head.blade.php
@@ -18,15 +18,16 @@
 
     <!-- Css -->
     <link rel="stylesheet" href="{{ asset('public/css/argon.css?v=' . version('short')) }}" type="text/css">
-    <link rel="stylesheet" href="{{ asset('public/css/akaunting-color.css?v=' . version('short')) }}">
-    <link rel="stylesheet" href="{{ asset('public/css/custom.css?v=' . version('short')) }}">
-    <link rel="stylesheet" href="{{ asset('public/css/element.css?v=' . version('short')) }}">
+    <link rel="stylesheet" href="{{ asset('public/css/akaunting-color.css?v=' . version('short')) }}" type="text/css">
+    <link rel="stylesheet" href="{{ asset('public/css/custom.css?v=' . version('short')) }}" type="text/css">
+    <link rel="stylesheet" href="{{ asset('public/css/element.css?v=' . version('short')) }}" type="text/css">
 
     @stack('css')
 
     @stack('stylesheet')
 
     <script type="text/javascript"><!--
+        var url = '{{ url("/") }}';
         var app_url = '{{ env("APP_URL") }}';
     //--></script>
 
diff --git a/resources/views/partials/widgets/standard_header.blade.php b/resources/views/partials/widgets/standard_header.blade.php
index 0c941483b..107c8709e 100644
--- a/resources/views/partials/widgets/standard_header.blade.php
+++ b/resources/views/partials/widgets/standard_header.blade.php
@@ -1,4 +1,4 @@
-<div class="card-header {{ $header_class }}">
+<div class="card-header{{ !empty($header_class) ? ' ' . $header_class : '' }}">
     <div class="row align-items-center">
 
         <div class="col-6 text-nowrap">
diff --git a/resources/views/widgets/cash_flow.blade.php b/resources/views/widgets/cash_flow.blade.php
index 012be703a..fd5fc45fd 100644
--- a/resources/views/widgets/cash_flow.blade.php
+++ b/resources/views/widgets/cash_flow.blade.php
@@ -1,6 +1,6 @@
 <div id="widgets-cash-flow" class="{{ $model->settings->width }}">
     <div class="card">
-        @include('partials.widgets.standard_header', ['header_class' => 'border-bottom-1'])
+        @include('partials.widgets.standard_header')
 
         <div class="card-body pt-0" id="cashflow">
             <div class="chart">
diff --git a/resources/views/widgets/expenses_by_category.blade.php b/resources/views/widgets/expenses_by_category.blade.php
index ab945791d..83747bab2 100644
--- a/resources/views/widgets/expenses_by_category.blade.php
+++ b/resources/views/widgets/expenses_by_category.blade.php
@@ -1,6 +1,6 @@
 <div id="widgets-expenses-by-category" class="{{ $model->settings->width }}">
     <div class="card">
-        @include('partials.widgets.standard_header', ['header_class' => 'border-bottom-1'])
+        @include('partials.widgets.standard_header')
 
         <div class="card-body" id="expenses-category-doughnut">
             <div class="dashboard-categories">
diff --git a/resources/views/widgets/income_by_category.blade.php b/resources/views/widgets/income_by_category.blade.php
index 0c385da51..a84e6c5f0 100644
--- a/resources/views/widgets/income_by_category.blade.php
+++ b/resources/views/widgets/income_by_category.blade.php
@@ -1,6 +1,6 @@
 <div id="widgets-income-by-category" class="{{ $model->settings->width }}">
     <div class="card">
-        @include('partials.widgets.standard_header', ['header_class' => 'border-bottom-1'])
+        @include('partials.widgets.standard_header')
 
         <div class="card-body" id="income-category-doughnut">
             <div class="dashboard-categories">