2 files changed, 8 insertions, 1 deletions
diff --git a/portal-FE-common/src/app/layout/components/tabbar/tabbar.component.html b/portal-FE-common/src/app/layout/components/tabbar/tabbar.component.html
index 31bb197c..93dd3450 100644
--- a/portal-FE-common/src/app/layout/components/tabbar/tabbar.component.html
+++ b/portal-FE-common/src/app/layout/components/tabbar/tabbar.component.html
@@ -59,7 +59,7 @@
             <div style="display: flex; flex-direction:row;">
               <app-sidebar (collapsedEvent)="receiveCollapsed($event)"></app-sidebar>
               <app-userbar></app-userbar>
-              <div class="container" style="margin-left: 370px;">
+              <div class="container" [ngStyle]="setStyle()">
                 <router-outlet></router-outlet>
               </div>
             </div>
diff --git a/portal-FE-common/src/app/layout/components/tabbar/tabbar.component.ts b/portal-FE-common/src/app/layout/components/tabbar/tabbar.component.ts
index 7a10e39d..b0b882d3 100644
--- a/portal-FE-common/src/app/layout/components/tabbar/tabbar.component.ts
+++ b/portal-FE-common/src/app/layout/components/tabbar/tabbar.component.ts
@@ -92,4 +92,11 @@ export class TabbarComponent implements OnInit {
     if(this.tabs.length != 0 && $event.index != 0)
       this.tabs[$event.index - 1].active = true;
   }
+  
+  setStyle() {  
+    const style = {
+       'margin-left': this.collapedSideBar ? '80px' : '370px',
+    };
+    return style;
+  }
 }