From 1f4d3bf784bcc881f92b3ec49605b4c00f48b2f1 Mon Sep 17 00:00:00 2001
From: satyaprakash10 <satyaprakashvarma10@gmail.com>
Date: Mon, 9 Dec 2019 18:58:53 +0530
Subject: [PATCH 1/5] sidebar-view modified

---
 resources/assets/js/views/invoices/View.vue   | 24 ++++++++++---------
 .../assets/sass/pages/estimates/view.scss     | 10 +++++++-
 .../assets/sass/pages/invoices/view.scss      | 10 +++++++-
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/resources/assets/js/views/invoices/View.vue b/resources/assets/js/views/invoices/View.vue
index 0bb594de..87cc4f55 100644
--- a/resources/assets/js/views/invoices/View.vue
+++ b/resources/assets/js/views/invoices/View.vue
@@ -123,17 +123,19 @@
           v-for="(invoice,index) in invoices"
           :to="`/admin/invoices/${invoice.id}/view`"
           :key="index"
-          class="side-invoice"
+          class="side-invoice"     
         >
-          <div class="left">
-            <div class="inv-name">{{ invoice.user.name }}</div>
-            <div class="inv-number">{{ invoice.invoice_number }}</div>
-            <div :class="'inv-status-'+invoice.status.toLowerCase()" class="inv-status">{{ invoice.status }}</div>
-          </div>
-          <div class="right">
-            <div class="inv-amount" v-html="$utils.formatMoney(invoice.due_amount, invoice.user.currency)" />
-            <div class="inv-date">{{ invoice.formattedInvoiceDate }}</div>
-          </div>
+        
+        <div class="left">
+          <div class="inv-name">{{ invoice.user.name }}</div>
+          <div class="inv-number">{{ invoice.invoice_number }}</div>
+          <div :class="'inv-status-'+invoice.status.toLowerCase()" class="inv-status">{{ invoice.status }}</div>
+        </div>
+        <div class="right">
+          <div class="inv-amount" v-html="$utils.formatMoney(invoice.due_amount, invoice.user.currency)" />
+          <div class="inv-date">{{ invoice.formattedInvoiceDate }}</div>
+        </div>
+        
         </router-link>
         <p v-if="!invoices.length" class="no-result">
           {{ $t('invoices.no_matching_invoices') }}
@@ -178,7 +180,7 @@ export default {
     shareableLink () {
       return `/invoices/pdf/${this.invoice.unique_hash}`
     }
-  },
+  },  
   watch: {
     $route (to, from) {
       this.loadInvoice()
diff --git a/resources/assets/sass/pages/estimates/view.scss b/resources/assets/sass/pages/estimates/view.scss
index 8bb8f676..6b7aad04 100644
--- a/resources/assets/sass/pages/estimates/view.scss
+++ b/resources/assets/sass/pages/estimates/view.scss
@@ -31,9 +31,17 @@
         &:last-child {
             margin-bottom: 98px;
         }
+        
+        &.router-link-exact-active {
+            border-left: 3px solid #645ddb;
+        }
+        
+        &.router-link-exact-active {
+            background-color: #F9FBFF;
+        }
 
         &:hover {
-            background-color: $ls-color-gray--very-light;
+            background-color: #F9FBFF;
         }
 
         .left {
diff --git a/resources/assets/sass/pages/invoices/view.scss b/resources/assets/sass/pages/invoices/view.scss
index 04a8bcc7..0ca23a26 100644
--- a/resources/assets/sass/pages/invoices/view.scss
+++ b/resources/assets/sass/pages/invoices/view.scss
@@ -32,8 +32,16 @@
             margin-bottom: 98px;
         }
 
+        &.router-link-exact-active {
+           border-left: 3px solid #645ddb;
+       }
+       
+       &.router-link-exact-active {
+           background-color: #F9FBFF;
+       }
+
         &:hover {
-            background-color: $ls-color-gray--very-light;
+            background-color: #F9FBFF;
         }
 
         .left {

From fa15502ce7b2b917357578cf6cf69ae899142bd5 Mon Sep 17 00:00:00 2001
From: satyaprakash10 <satyaprakashvarma10@gmail.com>
Date: Mon, 9 Dec 2019 19:20:11 +0530
Subject: [PATCH 2/5] refactor primary color-var

---
 resources/assets/sass/pages/estimates/view.scss | 10 +++++-----
 resources/assets/sass/pages/invoices/view.scss  |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/resources/assets/sass/pages/estimates/view.scss b/resources/assets/sass/pages/estimates/view.scss
index 6b7aad04..15e1df92 100644
--- a/resources/assets/sass/pages/estimates/view.scss
+++ b/resources/assets/sass/pages/estimates/view.scss
@@ -33,17 +33,17 @@
         }
         
         &.router-link-exact-active {
-            border-left: 3px solid #645ddb;
+            border-left: 3px solid $crater-theme;
         }
         
         &.router-link-exact-active {
-            background-color: #F9FBFF;
+            background-color: $gray--very-light;
         }
-
+        
         &:hover {
-            background-color: #F9FBFF;
+            background-color: $gray--very-light;
         }
-
+ 
         .left {
 
             .status-expired {
diff --git a/resources/assets/sass/pages/invoices/view.scss b/resources/assets/sass/pages/invoices/view.scss
index 0ca23a26..08496d13 100644
--- a/resources/assets/sass/pages/invoices/view.scss
+++ b/resources/assets/sass/pages/invoices/view.scss
@@ -33,15 +33,15 @@
         }
 
         &.router-link-exact-active {
-           border-left: 3px solid #645ddb;
+           border-left: 3px solid $crater-theme;
        }
        
        &.router-link-exact-active {
-           background-color: #F9FBFF;
-       }
+            background-color: $gray--very-light;
+        }
 
         &:hover {
-            background-color: #F9FBFF;
+            background-color: $gray--very-light;
         }
 
         .left {

From 799d212d9b66a9866e70aca5f358b47f02b1afc8 Mon Sep 17 00:00:00 2001
From: satyaprakash10 <satyaprakashvarma10@gmail.com>
Date: Tue, 10 Dec 2019 11:15:49 +0530
Subject: [PATCH 3/5] refactor classes on invoice and estimate view page

---
 resources/assets/sass/pages/estimates/view.scss | 5 +----
 resources/assets/sass/pages/invoices/view.scss  | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/resources/assets/sass/pages/estimates/view.scss b/resources/assets/sass/pages/estimates/view.scss
index 15e1df92..8a55fc03 100644
--- a/resources/assets/sass/pages/estimates/view.scss
+++ b/resources/assets/sass/pages/estimates/view.scss
@@ -34,12 +34,9 @@
         
         &.router-link-exact-active {
             border-left: 3px solid $crater-theme;
-        }
-        
-        &.router-link-exact-active {
             background-color: $gray--very-light;
         }
-        
+     
         &:hover {
             background-color: $gray--very-light;
         }
diff --git a/resources/assets/sass/pages/invoices/view.scss b/resources/assets/sass/pages/invoices/view.scss
index 08496d13..69379564 100644
--- a/resources/assets/sass/pages/invoices/view.scss
+++ b/resources/assets/sass/pages/invoices/view.scss
@@ -34,12 +34,9 @@
 
         &.router-link-exact-active {
            border-left: 3px solid $crater-theme;
+           background-color: $gray--very-light;
        }
        
-       &.router-link-exact-active {
-            background-color: $gray--very-light;
-        }
-
         &:hover {
             background-color: $gray--very-light;
         }

From 3d6875a53226c11ef37428e076b923e709ca9098 Mon Sep 17 00:00:00 2001
From: Jay_Makwana <jaimakwana786@gmail.com>
Date: Mon, 23 Dec 2019 21:00:26 +0530
Subject: [PATCH 4/5] refactor css variables

---
 resources/assets/sass/pages/invoices/view.scss | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/assets/sass/pages/invoices/view.scss b/resources/assets/sass/pages/invoices/view.scss
index 69379564..d7d9e05f 100644
--- a/resources/assets/sass/pages/invoices/view.scss
+++ b/resources/assets/sass/pages/invoices/view.scss
@@ -33,12 +33,12 @@
         }
 
         &.router-link-exact-active {
-           border-left: 3px solid $crater-theme;
-           background-color: $gray--very-light;
+           border-left: 3px solid $ls-color-primary;
+           background-color: $ls-color-gray--very-light;
        }
-       
+
         &:hover {
-            background-color: $gray--very-light;
+            background-color: $ls-color-gray--very-light;
         }
 
         .left {

From 7a59f3fe0c9f96abeb34375d57e52a56a1bef67c Mon Sep 17 00:00:00 2001
From: Jay_Makwana <jaimakwana786@gmail.com>
Date: Mon, 23 Dec 2019 21:05:48 +0530
Subject: [PATCH 5/5] refactor variable in estimate view scss

---
 resources/assets/sass/pages/estimates/view.scss | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/assets/sass/pages/estimates/view.scss b/resources/assets/sass/pages/estimates/view.scss
index 8a55fc03..d49a6c83 100644
--- a/resources/assets/sass/pages/estimates/view.scss
+++ b/resources/assets/sass/pages/estimates/view.scss
@@ -31,16 +31,16 @@
         &:last-child {
             margin-bottom: 98px;
         }
-        
+
         &.router-link-exact-active {
-            border-left: 3px solid $crater-theme;
-            background-color: $gray--very-light;
+            border-left: 3px solid $ls-color-primary;
+            background-color: $ls-color-gray--very-light;
         }
-     
+
         &:hover {
-            background-color: $gray--very-light;
+            background-color: $ls-color-gray--very-light;
         }
- 
+
         .left {
 
             .status-expired {