From 685cd76da2e6e226f0c068b367b31eadedffca78 Mon Sep 17 00:00:00 2001
From: Sercan Yemen <sercanyemen@gmail.com>
Date: Thu, 2 Nov 2017 11:16:24 +0300
Subject: [PATCH] Fixed: Minor issues with E-Commerce app + Fixed: Navigation
 collapsable items don't expand if the url has extra parameters in it

---
 .../vertical/nav-collapse/nav-vertical-collapse.component.ts  | 2 +-
 .../main/content/apps/e-commerce/order/order.component.scss   | 2 +-
 .../content/apps/e-commerce/product/product.component.html    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts b/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts
index f215bf6a..af40fa3b 100644
--- a/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts
+++ b/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts
@@ -166,7 +166,7 @@ export class FuseNavVerticalCollapseComponent implements OnInit
                 }
             }
 
-            if ( parent.children[i].url === url )
+            if ( parent.children[i].url === url || url.includes(parent.children[i].url) )
             {
                 return true;
             }
diff --git a/src/app/main/content/apps/e-commerce/order/order.component.scss b/src/app/main/content/apps/e-commerce/order/order.component.scss
index 2becc79d..158b8f92 100644
--- a/src/app/main/content/apps/e-commerce/order/order.component.scss
+++ b/src/app/main/content/apps/e-commerce/order/order.component.scss
@@ -37,7 +37,7 @@
                         overflow: auto;
 
                         .invoice-container {
-                            padding: 64px;
+                            padding: 16px;
 
                             .card {
                                 width: 1020px;
diff --git a/src/app/main/content/apps/e-commerce/product/product.component.html b/src/app/main/content/apps/e-commerce/product/product.component.html
index 7cb5c3aa..b8aaabb9 100644
--- a/src/app/main/content/apps/e-commerce/product/product.component.html
+++ b/src/app/main/content/apps/e-commerce/product/product.component.html
@@ -79,7 +79,7 @@
                                               name="description"
                                               formControlName="description"
                                               placeholder="Product Description"
-                                              rows="10">
+                                              rows="5">
                                     </textarea>
                                 </mat-form-field>
 
@@ -203,7 +203,7 @@
                         <mat-tab label="Shipping">
                             <div class="tab-content p-24" fusePerfectScrollbar fxLayout="column">
 
-                                <div class="py-16" fxFlex="1 0 auto" fxLayout="row">
+                                <div class="py-16" fxLayout="row">
                                     <mat-form-field fxFlex>
                                         <input matInput
                                                name="Width"