From 84f27b1d456006fc4e711755e94590391e1c500e Mon Sep 17 00:00:00 2001
From: rusikv <rvasylkiv@thingsboard.io>
Date: Wed, 18 Oct 2023 17:50:38 +0300
Subject: [PATCH 1/2] UI: Fixed position of help icon in custom date config of
 card widgets

---
 .../settings/common/date-format-settings-panel.component.html   | 2 +-
 .../settings/common/date-format-settings-panel.component.scss   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/date-format-settings-panel.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/date-format-settings-panel.component.html
index ee332924f0..3a2d9f78b9 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/date-format-settings-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/date-format-settings-panel.component.html
@@ -21,7 +21,7 @@
     <div class="fixed-title-width" translate>date.format</div>
     <mat-form-field class="tb-date-format-input" required fxFlex appearance="outline" subscriptSizing="dynamic">
       <input matInput [formControl]="dateFormatFormControl" placeholder="{{ 'widget-config.set' | translate }}">
-      <div matSuffix tb-help-popup="date/date-format" [tb-help-popup-style]="{width: '800px'}"></div>
+      <div matSuffix tb-help-popup="date/date-format" [tb-help-popup-style]="{width: '800px'}" style="line-height: normal"></div>
     </mat-form-field>
   </div>
   <mat-divider></mat-divider>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/date-format-settings-panel.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/date-format-settings-panel.component.scss
index ec6a762966..784b4fbeb4 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/date-format-settings-panel.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/date-format-settings-panel.component.scss
@@ -51,7 +51,6 @@
         .mat-mdc-form-field-icon-suffix {
           display: flex;
           align-items: center;
-          line-height: normal;
         }
       }
     }

From 357428749905cca6d8aca705dcdbe675fe93eb44 Mon Sep 17 00:00:00 2001
From: rusikv <rvasylkiv@thingsboard.io>
Date: Thu, 19 Oct 2023 15:05:25 +0300
Subject: [PATCH 2/2] UI: fix for help icon in custom date of card widgets

---
 .../common/date-format-settings-panel.component.html     | 2 +-
 .../common/date-format-settings-panel.component.scss     | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/date-format-settings-panel.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/date-format-settings-panel.component.html
index 3a2d9f78b9..279b48fb3a 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/date-format-settings-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/date-format-settings-panel.component.html
@@ -21,7 +21,7 @@
     <div class="fixed-title-width" translate>date.format</div>
     <mat-form-field class="tb-date-format-input" required fxFlex appearance="outline" subscriptSizing="dynamic">
       <input matInput [formControl]="dateFormatFormControl" placeholder="{{ 'widget-config.set' | translate }}">
-      <div matSuffix tb-help-popup="date/date-format" [tb-help-popup-style]="{width: '800px'}" style="line-height: normal"></div>
+      <div matIconSuffix tb-help-popup="date/date-format" [tb-help-popup-style]="{width: '800px'}"></div>
     </mat-form-field>
   </div>
   <mat-divider></mat-divider>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/date-format-settings-panel.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/date-format-settings-panel.component.scss
index 784b4fbeb4..7ca3237b5d 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/date-format-settings-panel.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/date-format-settings-panel.component.scss
@@ -48,9 +48,12 @@
     }
     .mat-mdc-form-field.tb-date-format-input {
       .mat-mdc-text-field-wrapper.mdc-text-field--outlined {
-        .mat-mdc-form-field-icon-suffix {
-          display: flex;
-          align-items: center;
+        .mat-mdc-form-field-flex {
+          .mat-mdc-form-field-icon-suffix {
+            display: flex;
+            align-items: center;
+            line-height: normal;
+          }
         }
       }
     }