commit 2dbff5ec1853f5f48354e0bbdecfae2d7489fbbb
author Eran (ev672n), Vosk <ev672n@att.com> Mon Oct 29 19:33:00 2018 +0200
committer Eran (ev672n), Vosk <ev672n@att.com> Mon Oct 29 19:33:00 2018 +0200
tree 932b4549f366400753354b7e5937f7ecae40511f
parent e0cf0c1c4a425816704a1e5b325fe7c8b9d2759a

Sync code

Sync the code between repositories

Change-Id: Ib7ee4d0e0f53b58a9bf97dadb15e094789b4f915
Issue-ID: SDC-1874
Signed-off-by: Eran (ev672n), Vosk <ev672n@att.com>

public/src/app/bar-icons/bar-icons.component.html

diff --git a/public/src/app/bar-icons/bar-icons.component.html b/public/src/app/bar-icons/bar-icons.component.html
index 761a5cb..b855ede 100644
--- a/public/src/app/bar-icons/bar-icons.component.html
+++ b/public/src/app/bar-icons/bar-icons.component.html
@@ -15,7 +15,7 @@
       <hr>
 
       <button mat-icon-button (click)="enableImports()" data-tests-id="import-rules" pTooltip="Import" tooltipPosition="top" [disabled]="store.viewOnly">
-        <span style="width: 100%;
+        <span [style.color]="store.expandImports[store.tabIndex] ? '#009FDB' : '#5a5a5a'" style="width: 100%;
             color:#5a5a5a;
                 height: 100%;
                 display: flex;
@@ -26,9 +26,9 @@
       <hr>
     </div>
 
-    <button mat-icon-button (click)="enableSetting()" data-tests-id="setting-gear" [style.color]="this.store.expandAdvancedSetting[store.tabIndex] ? '#009FDB' : 'black'"
+    <button mat-icon-button (click)="enableSetting()" data-tests-id="setting-gear"
       pTooltip="Settings" tooltipPosition="top">
-      <span style="width: 100%;
+      <span [style.color]="this.store.expandAdvancedSetting[store.tabIndex] ? '#009FDB' : '#5a5a5a'" style="width: 100%;
           color:#5a5a5a;
           height: 100%;
           display: flex;
@@ -47,7 +47,9 @@
   <!-- advanced setting -->
   <div class="setting" *ngIf="store.expandAdvancedSetting[store.tabIndex]">
     <div *mobxAutorun style="width: 100%;" [class]="tabName+'-setting-list'">
-      <div style="font-size: 1.5em; padding: 0 12px;">{{tabName}} Advanced Setting</div>
+      <div style="font-size: 1.5em; padding: 0 12px;">
+        {{tabName}} Advanced Settings
+      </div>
       <form #cdumpConfForm="ngForm">
         <div *ngFor="let prop of store.configurationForm" class="field" [id]="prop.name">
           <div style="display: flex;">