From 5839a84b73db0009e8349c35cdbc01e83d42d8fc Mon Sep 17 00:00:00 2001
From: TheCOBAN <mehmetcoban8489@gmail.com>
Date: Sun, 19 Apr 2020 17:49:47 +0300
Subject: [PATCH] Fix: nav link active

---
 composer.lock         |  12 +-
 public/css/custom.css | 517 ++++++++++++++++--------------------------
 2 files changed, 196 insertions(+), 333 deletions(-)

diff --git a/composer.lock b/composer.lock
index ecaf8999d..0bf1a75b3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3327,16 +3327,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "1.3.4",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "dd3261eb9a322e009fa5d96d19b9ae19708ce04b"
+                "reference": "517cbe1c6faf90afeb38a0e917c73acc6d3051ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/dd3261eb9a322e009fa5d96d19b9ae19708ce04b",
-                "reference": "dd3261eb9a322e009fa5d96d19b9ae19708ce04b",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/517cbe1c6faf90afeb38a0e917c73acc6d3051ce",
+                "reference": "517cbe1c6faf90afeb38a0e917c73acc6d3051ce",
                 "shasum": ""
             },
             "require": {
@@ -3354,7 +3354,7 @@
                 "github/gfm": "0.29.0",
                 "michelf/php-markdown": "~1.4",
                 "mikehaertl/php-shellcommand": "^1.4",
-                "phpstan/phpstan-shim": "^0.11.5",
+                "phpstan/phpstan": "^0.12",
                 "phpunit/phpunit": "^7.5",
                 "scrutinizer/ocular": "^1.5",
                 "symfony/finder": "^4.2"
@@ -3397,7 +3397,7 @@
                 "md",
                 "parser"
             ],
-            "time": "2020-04-13T20:52:18+00:00"
+            "time": "2020-04-18T20:46:13+00:00"
         },
         {
             "name": "league/flysystem",
diff --git a/public/css/custom.css b/public/css/custom.css
index 1c5523a0f..c4b1dd2c2 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -1,89 +1,78 @@
 @font-face {
     font-family: element-icons;
-    src:url("./../fonts/vendor/element-ui/lib/theme-chalk/element-icons.woff") format("woff"),
-        url("./../fonts/vendor/element-ui/lib/theme-chalk/element-icons.ttf") format("truetype");
+    src: url("./../fonts/vendor/element-ui/lib/theme-chalk/element-icons.woff")
+            format("woff"),
+        url("./../fonts/vendor/element-ui/lib/theme-chalk/element-icons.ttf")
+            format("truetype");
     font-weight: 400;
     font-display: "auto";
     font-style: normal;
 }
 
 /*--Layout Content--*/
-.content-layout
-{
+.content-layout {
     max-width: 1300px !important;
 }
 /*--Layout Content Finish--*/
 
 /*--------Cursor Styles--------*/
 /*--Cursor Pointer--*/
-.cursor-pointer
-{
+.cursor-pointer {
     cursor: pointer !important;
 }
 /*--Cursor Pointer Finish--*/
 
 /*--Cursor Default--*/
-.cursor-default
-{
+.cursor-default {
     cursor: default !important;
 }
 /*--Cursor Pointer Finish--*/
 /*--------Cursor Styles Finish--------*/
 
-
 /*--------Border Radius Styles--------*/
 /*--Border Radius None--*/
-.border-radius-none
-{
+.border-radius-none {
     border-radius: 0 !important;
 }
 /*--Border Radius None Finish--*/
 
 /*--Border Radius Default--*/
-.border-radius-default
-{
-    border-radius: 0.25rem !important
+.border-radius-default {
+    border-radius: 0.25rem !important;
 }
 /*--Border Radius Default Finish--*/
 /*--------Border Radius Styles Finish--------*/
 
-
 /*--------Overflow Styles--------*/
 /*--Overflow Y Hidden--*/
-.overflow-y-hidden
-{
+.overflow-y-hidden {
     overflow-y: hidden !important;
 }
 /*--Overflow Y Hidden Finish--*/
 
 /*--Overflow Y Scroll--*/
-.overflow-y-scroll
-{
+.overflow-y-scroll {
     overflow-y: scroll !important;
 }
 /*--Overflow Y Scroll Finish--*/
 
 /*--Overflow X Hidden--*/
-.overflow-x-hidden
-{
+.overflow-x-hidden {
     overflow-x: hidden !important;
 }
 /*--Overflow X Hidden Finish--*/
 
 /*--Overflow X Scroll--*/
-.overflow-x-scroll
-{
+.overflow-x-scroll {
     overflow-x: scroll !important;
 }
 /*--Overflow X Scroll Finish--*/
 /*--------Overflow Styles Finish--------*/
 
-
 /*--------Akaunting Backgrounds--------*/
 /*--Login Page Background--*/
-.login-page
-{
-    background: url('../img/login.png') no-repeat center center fixed;
+.login-page {
+    background: url("../img/login.png") no-repeat center center fixed;
     height: 100%;
     width: 100%;
     padding: 5% 0;
@@ -95,9 +84,8 @@
 /*--Login Page Background Finish--*/
 
 /*--Wizard Page Background--*/
-.wizard-page
-{
-    background: url('../img/login.png') no-repeat center center fixed;
+.wizard-page {
+    background: url("../img/login.png") no-repeat center center fixed;
     height: 100%;
     width: 100%;
     padding: 5% 0;
@@ -109,9 +97,8 @@
 /*--Wizard Page Background Finish--*/
 
 /*--Installation Page Background--*/
-.installation-page
-{
-    background: url('../img/login.png') no-repeat center center fixed;
+.installation-page {
+    background: url("../img/login.png") no-repeat center center fixed;
     height: 100%;
     width: 100%;
     padding: 5% 0;
@@ -123,97 +110,77 @@
 /*--Installation Page Background Finish--*/
 /*--------Akaunting Backgrounds Finish--------*/
 
-
 /*--------Credit Card--------*/
-.card-input__input:hover, .card-input__input:focus
-{
+.card-input__input:hover,
+.card-input__input:focus {
     border-color: #55588b !important;
 }
 /*--------Credit Card Finish--------*/
 
-
 /*--------Custom Toggle--------*/
-.custom-toggle
-{
+.custom-toggle {
     width: 60px;
 }
 
-.custom-toggle input:checked + .status-green:before
-{
+.custom-toggle input:checked + .status-green:before {
     left: 10px;
 }
 
-.custom-toggle-slider:after
-{
+.custom-toggle-slider:after {
     top: -1px;
 }
 /*--------Custom Toggle Finish--------*/
 
-
 /*--Button Element Focus--*/
-button:focus
-{
+button:focus {
     outline: none !important;
 }
 /*--Button Element Focus Finish--*/
 
-
 /*--Button Hover--*/
-.btn:hover
-{
-    Transform: translateY(0px);
+.btn:hover {
+    transform: translateY(0px);
 }
 /*--Button Hover Finish--*/
 
-
 /*--------Chart Donut Height--------*/
-.chart-donut
-{
-    position:relative !important;
-    height:23vh !important;
+.chart-donut {
+    position: relative !important;
+    height: 23vh !important;
 }
 /*--------Chart Donut Height Finish--------*/
 
-
 /*--------Wizard Steps--------*/
-.wizard-header
-{
+.wizard-header {
     border-radius: calc(0.375rem - 1px) calc(0.375rem - 1px) 0 0;
 }
 /*--------Wizard Steps Finish--------*/
 
-.dropup .dropdown-toggle::after
-{
+.dropup .dropdown-toggle::after {
     display: none !important;
 }
 
-.role-list
-{
+.role-list {
     text-overflow: ellipsis;
     overflow: hidden;
 }
 
 /*--------Customer/Vendor Show--------*/
-.show-transaction-card-header
-{
+.show-transaction-card-header {
     padding: 1.14rem;
 }
 
-.show-transaction-card-footer
-{
+.show-transaction-card-footer {
     padding: 1.15rem;
 }
 
-.edit-sv
-{
+.edit-sv {
     margin-bottom: 30px;
 }
 /*--------Customer/Vendor Show Finish--------*/
 
-
 /*--------Navbar Notification--------*/
-.nav-link .badge-update
-{
+.nav-link .badge-update {
     position: absolute;
     top: 15%;
     margin-left: -0.2rem;
@@ -223,8 +190,7 @@ button:focus
     font-size: 0.5rem;
 }
 
-.nav-link .badge-reminder
-{
+.nav-link .badge-reminder {
     position: absolute;
     top: -59%;
     margin-left: -0.35rem;
@@ -235,205 +201,162 @@ button:focus
 }
 /*--------Navbar Notification Finish--------*/
 
-
 /*--------Index Page Tables--------*/
-.table-responsive
-{
+.table-responsive {
     overflow-x: visible !important;
 }
 /*--------Index Page Tables Finish--------*/
 
-
 /*--------Left Menu--------*/
-.menu-dropdown
-{
+.menu-dropdown {
     position: absolute !important;
     left: 1.2rem;
 }
 
-.menu-dropdown-width
-{
+.menu-dropdown-width {
     min-width: 13rem !important;
 }
 
-.g-sidenav-hidden .navbar-vertical.navbar-expand-xs
-{
+.g-sidenav-hidden .navbar-vertical.navbar-expand-xs {
     overflow: hidden !important;
 }
 /*--------Left Menu Finish--------*/
 
-
 /*--------Max Width 100 Pixel--------*/
-.mwpx-100
-{
-  max-width: 100px !important;
+.mwpx-100 {
+    max-width: 100px !important;
 }
 /*--------Max Width 100 Pixel Finish--------*/
 
-
 /*--------Form Group--------*/
-.form-group.visible-field .form-control
-{
+.form-group.visible-field .form-control {
     background-color: #fff;
 }
 /*--------Form Group Finish--------*/
 
-
 /*--Long Texts--*/
-.long-texts
-{
+.long-texts {
     text-overflow: ellipsis;
     overflow: hidden;
     white-space: nowrap;
 }
 /*--Long Texts Finish--*/
 
-
 /*--Akaunting Column Style--*/
-.col-aka
-{
+.col-aka {
     margin-left: -51px;
 }
 /*--Akaunting Column Styl Finish--*/
 
-
 /*--------Table Head Row Margin--------*/
-.thead-light .row
-{
+.thead-light .row {
     margin: 0;
 }
 /*--------Table Head Row Margin Finish--------*/
 
-
 /*--------Table Head Column Letter Spacing--------*/
-.table thead th
-{
+.table thead th {
     letter-spacing: 0;
 }
 /*--------Table Head Column Letter Spacing Finish--------*/
 
-
 /*--------Table Body Row Margin--------*/
-.table, tbody .row
-{
+.table,
+tbody .row {
     margin-right: 0;
     margin-left: 0;
 }
 /*--------Table Body Row Margin Finish--------*/
 
-
 /*--------Item Column Image--------*/
-.item-img
-{
+.item-img {
     width: 38px;
     height: 38px;
 }
 /*--------Item Column Image Finish--------*/
 
-
 /*--------Border--------*/
-.border-1
-{
+.border-1 {
     border: 1px solid #e5e5e5 !important;
 }
 /*--------Border Finish--------*/
 
 /*--------Border Top--------*/
-.border-top-1
-{
+.border-top-1 {
     border-top: 1px solid #e9ecef !important;
 }
 /*--------Border Top Finish--------*/
 
 /*--------Border Bottom--------*/
-.border-bottom-1
-{
+.border-bottom-1 {
     border-bottom: 1px solid #e9ecef !important;
 }
 /*--------Border Bottom Finish--------*/
 
 /*--------Border Top Style--------*/
-.border-top-style
-{
+.border-top-style {
     border-top-style: hidden !important;
 }
 /*--------Border Top Style Finish--------*/
 
 /*--------Border Bottom Style--------*/
-.border-bottom-style
-{
+.border-bottom-style {
     border-bottom-style: hidden !important;
 }
 /*--------Border Bottom Style Finish--------*/
 
-
 /*--------Invoice Bill Show Table Position--------*/
-.show-table
-{
+.show-table {
     margin-right: -2.5rem !important;
-    margin-left:  -2.5rem !important;
+    margin-left: -2.5rem !important;
 }
 /*--------Invoice Bill Show Table Position Finished--------*/
 
-
 /*--------Table Head Line--------*/
-.table-head-line
-{
+.table-head-line {
     line-height: 26px;
 }
 
-.table tbody + tbody
-{
+.table tbody + tbody {
     border-top: 1px solid #e9ecef;
 }
 /*--------Table Head Line Finish--------*/
 
-
 /*--Display Grid--*/
-.d-grid
-{
+.d-grid {
     display: grid !important;
 }
 /*--Display Grid Finish--*/
 
-
 /*--------Card Header Bulk Action--------*/
-.d-none.show
-{
-    display : flex !important;
+.d-none.show {
+    display: flex !important;
 }
 
-.form-group.d-none.show
-{
-    display : unset !important;
+.form-group.d-none.show {
+    display: unset !important;
 }
 
-.btn .d-none.show
-{
-    display : inherit !important;
+.btn .d-none.show {
+    display: inherit !important;
 }
 /*--------Card Header Bulk Action Finish--------*/
 
-
 /*--------Card Action Button--------*/
-.card-action-button
-{
+.card-action-button {
     position: absolute;
     right: 0;
     z-index: 1;
 }
 /*--------Card Action Button Finish--------*/
 
-
 /*--Akaunting Button Animation--*/
-.aka-loader-frame
-{
+.aka-loader-frame {
     width: 59.88px;
     height: 31px;
 }
 
-.aka-loader
-{
+.aka-loader {
     width: 10px;
     height: 10px;
     border-radius: 50%;
@@ -444,9 +367,9 @@ button:focus
     margin: -10px auto 0;
 }
 
-.aka-loader::after, .aka-loader::before
-{
-    content: '';
+.aka-loader::after,
+.aka-loader::before {
+    content: "";
     position: absolute;
     width: 10px;
     height: 10px;
@@ -454,57 +377,46 @@ button:focus
     animation: aka-loader 0.8s ease alternate infinite;
 }
 
-.aka-loader::before
-{
+.aka-loader::before {
     left: -15px;
     animation-delay: 0.14s;
 }
 
-.aka-loader::after
-{
+.aka-loader::after {
     right: -15px;
     animation-delay: 0.42s;
 }
 
-@keyframes aka-loader
-{
-    0%
-    {
+@keyframes aka-loader {
+    0% {
         box-shadow: 0 28px 0 -28px #ffffff;
     }
 
-    100%
-    {
+    100% {
         box-shadow: 0 28px 0 #ffffff;
     }
 }
 
-.btn-outline-confirm:disabled span
-{
+.btn-outline-confirm:disabled span {
     opacity: 1 !important;
 }
 
-.btn .aka-loader
-{
+.btn .aka-loader {
     display: none !important;
 }
 
-.btn:disabled span
-{
+.btn:disabled span {
     opacity: 0;
 }
 
-.btn:disabled .aka-loader
-{
+.btn:disabled .aka-loader {
     display: block !important;
 }
 /*--Akaunting Button Animation Finish--*/
 
-
 /*--------Settings Index Page--------*/
 /*--------Settings Icons--------*/
-.settings-icons
-{
+.settings-icons {
     position: relative;
     top: -0.4rem;
     height: 45px;
@@ -514,128 +426,105 @@ button:focus
 /*--------Settings Icons Finish--------*/
 
 /*--------Settings Button Focus--------*/
-.btn-icon-clipboard:focus
-{
+.btn-icon-clipboard:focus {
     outline: none;
 }
 /*--------Settings Button Focus Finish--------*/
 
 /*--------Shadow None Focus--------*/
-.shadow-none--hover:focus
-{
+.shadow-none--hover:focus {
     box-shadow: none !important;
 }
 /*--------Shadow None Focus Finish--------*/
 /*--------Settings Index Page Finish--------*/
 
-
 /*--------Pagination Alignment--------*/
-.page-item .page-link, .page-item span
-{
+.page-item .page-link,
+.page-item span {
     align-items: unset;
     padding-top: 7px;
 }
 /*--------Pagination Alignment Finish--------*/
 
-
 /*--------Avatar Size--------*/
-.avatar-size
-{
+.avatar-size {
     width: 128px;
     height: 128px;
     font-size: 4.5rem;
 }
 /*--------Avatar Size--------*/
 
-
 /*--------Button Disabled Hover--------*/
-.btn:disabled:hover
-{
+.btn:disabled:hover {
     box-shadow: none !important;
 }
 /*--------Button Disabled Hover Finish--------*/
 
 /*--------Recurring Inputs--------*/
-.recurring-single
-{
+.recurring-single {
     margin-top: 29px !important;
 }
 /*--------Recurring Inputs--------*/
 
 /*--------Invoice and Bill Total Column--------*/
-.total-column
-{
+.total-column {
     padding-top: 1.75rem !important;
 }
 
-.item-total
-{
+.item-total {
     width: 15%;
 }
 /*--------Invoice and Bill Total Column Finish--------*/
 
 /*--------Custom Table--------*/
-.table thead th
-{
+.table thead th {
     border-bottom: 0;
 }
 
-.table-flush tbody tr td
-{
+.table-flush tbody tr td {
     border: 0 !important;
 }
 /*--------Custom Table Finish--------*/
 
-
 /*--------Height 0--------*/
-.h-0
-{
+.h-0 {
     height: 0 !important;
 }
 /*--------Height 0 Finish--------*/
 
-
 /*--------Editor Text--------*/
-.ql-editor p
-{
+.ql-editor p {
     font-size: 0.775rem !important;
     margin-bottom: 0 !important;
 }
 /*--------Editor text Finish--------*/
 
-table .align-items-center td span.badge
-{
+table .align-items-center td span.badge {
     height: 24px;
     padding-top: 8px;
     font-size: 9px;
 }
 
 /*--------Print Template--------*/
-.choose
-{
+.choose {
     cursor: pointer;
 }
 
-.choose:hover > img
-{
-    opacity: 0.50 !important;
+.choose:hover > img {
+    opacity: 0.5 !important;
 }
 
-.bg-print
-{
-    background-color: rgba(229, 229, 229, 0.4)!important;;
+.bg-print {
+    background-color: rgba(229, 229, 229, 0.4) !important;
 }
 
-.print-edge
-{
+.print-edge {
     width: 140px;
 }
 /*--------Print Template Finish--------*/
 
-
 /*--------Report Column--------*/
-.report-column-name
-{
+.report-column-name {
     -webkit-box-flex: 0;
     -ms-flex: 0 0 10%;
     flex: 0 0 10%;
@@ -643,8 +532,7 @@ table .align-items-center td span.badge
     max-width: 10%;
 }
 
-.report-column-value
-{
+.report-column-value {
     -webkit-box-flex: 0;
     -ms-flex: 0 0 6.66%;
     flex: 0 0 6.66%;
@@ -652,240 +540,215 @@ table .align-items-center td span.badge
 }
 /*--------Report Column Finish--------*/
 
-
 /*--------App Comment--------*/
-.media-comment-text
-{
+.media-comment-text {
     border-top-left-radius: 0.4375rem;
     background-color: #ebebf0;
     padding: 1rem;
 }
 /*--------App Comment Finish--------*/
 
-
 /*--------Blank Page Image--------*/
-.blank-image
-{
+.blank-image {
     height: 300px;
 }
 /*--------Blank Page Image Finish--------*/
 
-
 /*--------Text Pre Nowrap--------*/
-.text-pre-nowrap
-{
+.text-pre-nowrap {
     white-space: pre-wrap !important;
 }
 /*--------Text Pre Nowrap Finish--------*/
 
-
 /*--------Table Without toggle button--------*/
-.tr-py
-{
+.tr-py {
     padding-top: 5px;
     padding-bottom: 5px;
 }
 /*--------Table Without toggle button Finish--------*/
 
-
 /*--------Table No Records--------*/
-.nr-py
-{
+.nr-py {
     padding-top: 5px;
     padding-bottom: 5px;
 }
 /*--------Table No Records Finish--------*/
 
-
 /*--------From Group Disabled--------*/
-.form-group.disabled .input-group-text, .form-group.readonly .input-group-text
-{
+.form-group.disabled .input-group-text,
+.form-group.readonly .input-group-text {
     background-color: #e9ecef;
 }
 /*--------From Group Disabled Finish--------*/
 
-
 /*--------Modal Dialog Resizing--------*/
-@media (min-width: 576px)
-{
-    .modal-payment .modal-dialog
-    {
-      max-width: 559px !important;
+@media (min-width: 576px) {
+    .modal-payment .modal-dialog {
+        max-width: 559px !important;
     }
 }
 /*--------Modal Dialog Resizing Finish--------*/
 
-
 /*--Save Buttons Responsive--*/
-.save-buttons
-{
+.save-buttons {
     float: right !important;
 }
 /*--Save Buttons Responsive Finish--*/
 
-
 /*--Index Pages Badge Min Width--*/
-.mw-60
-{
+.mw-60 {
     min-width: 60px;
 }
 /*--Index Pages Badge Min Width Finish--*/
 
-
 /*--Quantity Width--*/
-.w-10
-{
+.w-10 {
     width: 10%;
 }
 /*--Quantity Width Finish--*/
 
-
 /*--Discount Width--*/
-.w-12
-{
+.w-12 {
     width: 12%;
 }
 /*--Discount Width Finish--*/
 
-
 /*--------Responsive--------*/
 /*--Xs Breakpoint--*/
-@media (max-width: 575.98px)
-{
-    .col-xs-1 {width: 8.33%;}
-    .col-xs-2 {width: 16.66%;}
-    .col-xs-3 {width: 25%;}
-    .col-xs-4 {width: 33.33%;}
-    .col-xs-5 {width: 41.66%;}
-    .col-xs-6 {width: 50%;}
-    .col-xs-7 {width: 58.33%;}
-    .col-xs-8 {width: 66.66%;}
-    .col-xs-9 {width: 75%;}
-    .col-xs-10 {width: 83.33%;}
-    .col-xs-11 {width: 91.66%;}
-    .col-xs-12 {width: 100%;}
+@media (max-width: 575.98px) {
+    .col-xs-1 {
+        width: 8.33%;
+    }
+    .col-xs-2 {
+        width: 16.66%;
+    }
+    .col-xs-3 {
+        width: 25%;
+    }
+    .col-xs-4 {
+        width: 33.33%;
+    }
+    .col-xs-5 {
+        width: 41.66%;
+    }
+    .col-xs-6 {
+        width: 50%;
+    }
+    .col-xs-7 {
+        width: 58.33%;
+    }
+    .col-xs-8 {
+        width: 66.66%;
+    }
+    .col-xs-9 {
+        width: 75%;
+    }
+    .col-xs-10 {
+        width: 83.33%;
+    }
+    .col-xs-11 {
+        width: 91.66%;
+    }
+    .col-xs-12 {
+        width: 100%;
+    }
 
-    .btn-alone
-    {
+    .btn-alone {
         width: 100%;
         height: 40px;
-        font-size: .875rem;
-        padding: .425rem 1.25rem;
+        font-size: 0.875rem;
+        padding: 0.425rem 1.25rem;
         margin-top: 0.4rem;
         margin-bottom: -1rem;
     }
 
-    .header-button-top
-    {
+    .header-button-top {
         width: 100%;
         height: 40px;
-        font-size: .875rem;
-        padding: .425rem 1.25rem;
+        font-size: 0.875rem;
+        padding: 0.425rem 1.25rem;
         margin-top: 16px;
     }
 
-    .header-drop-top
-    {
+    .header-drop-top {
         display: block !important;
     }
 
-    .header-button-bottom
-    {
+    .header-button-bottom {
         width: 100%;
         height: 40px;
-        font-size: .875rem;
-        padding: .425rem 1.25rem;
+        font-size: 0.875rem;
+        padding: 0.425rem 1.25rem;
         margin-top: 0.5rem;
         margin-bottom: -1rem;
     }
 
-    .footer-texts
-    {
+    .footer-texts {
         width: 100%;
         text-align: center;
         white-space: nowrap;
         font-size: 0.75rem !important;
     }
 
-    .blank-image
-    {
+    .blank-image {
         height: 200px;
     }
 
-    .col-aka
-    {
+    .col-aka {
         margin-left: 0;
     }
 
-    .left-menu-toggle
-    {
+    .left-menu-toggle {
         display: block !important;
         padding-top: 0.4rem !important;
     }
 
-    .left-menu-toggle-position
-    {
-        margin-left: 2rem !important;
-    }
-
-    .dashboard-action
-    {
+    .dashboard-action {
         float: right;
     }
 
-    .dropdown-menu-xs-left
-    {
+    .dropdown-menu-xs-left {
         right: auto;
         left: 0 !important;
     }
 
-    .dropdown-menu-xs-right
-    {
+    .dropdown-menu-xs-right {
         right: 0 !important;
         left: auto;
     }
 
-    .pagination-xs
-    {
+    .pagination-xs {
         padding-right: 0;
         padding-top: 1.5rem;
     }
 
-    .el-range-editor.el-input__inner
-    {
+    .el-range-editor.el-input__inner {
         width: 100% !important;
         margin-top: 1rem;
     }
 
-    .save-buttons
-    {
+    .save-buttons {
         float: none !important;
     }
 }
 /*--Xs Breakpoint Finish--*/
 
 /*--Sm Breakpoint--*/
-@media (min-width: 576px) and (max-width: 767.98px)
-{
-
+@media (min-width: 576px) and (max-width: 767.98px) {
 }
 /*--Sm Breakpoint Finish--*/
 
 /*--Md Breakpoint--*/
-@media (min-width: 768px) and (max-width: 991.98px)
-{
-    .sidenav .navbar-nav .dropdown-menu
-    {
+@media (min-width: 768px) and (max-width: 991.98px) {
+    .sidenav .navbar-nav .dropdown-menu {
         left: 1rem !important;
     }
 }
 /*--Md Breakpoint Finish--*/
 
 /*--Lg Breakpoint--*/
-@media (min-width: 992px) and (max-width: 1199.98px)
-{
-    .sidenav .navbar-nav .dropdown-menu
-    {
+@media (min-width: 992px) and (max-width: 1199.98px) {
+    .sidenav .navbar-nav .dropdown-menu {
         left: 1rem;
     }
 }
@@ -904,15 +767,16 @@ table .align-items-center td span.badge
 .navbar-vertical .navbar-nav .nav-link.active i {
     color: #161842 !important;
 }
+
 @media (min-width: 1200px) {
     .g-sidenav-show #panel {
-      margin-left: 250px;
+        margin-left: 250px;
     }
 }
 
 @media (max-width: 991.98px) {
     .g-sidenav-show.g-sidenav-hidden .sidenav {
-      max-width: 62px !important;
+        max-width: 62px !important;
     }
 }
 
@@ -937,13 +801,13 @@ table .align-items-center td span.badge
 
 @media (min-width: 1200px) {
     .g-sidenav-pinned .navbar-vertical.navbar-expand-xs {
-      max-width: 250px !important;
+        max-width: 250px !important;
     }
 }
 
-@media (min-width: 768px){
+@media (min-width: 768px) {
     .navbar-vertical .navbar-collapse:before {
-        content: '';
+        content: "";
         display: block;
         margin: 0;
     }
@@ -961,7 +825,6 @@ table .align-items-center td span.badge
     padding-left: 0;
 }
 
-.nav-item .nav-link {
+.navbar-vertical .navbar-nav .nav-link:not(.active) {
     color: #fff !important;
 }
-