From 056d8eac00806550a6f3118f5b3b5bd7dca8004a Mon Sep 17 00:00:00 2001 From: kurilova Date: Tue, 18 Jun 2024 11:12:50 +0000 Subject: [PATCH] Fix styles for helperbird --- modules/ui/src/app/app.component.scss | 2 +- .../app/components/device-item/device-item.component.scss | 3 ++- .../app/components/shutdown-app/shutdown-app.component.scss | 2 +- .../certificate-item/certificate-item.component.scss | 6 +++--- .../src/app/pages/certificates/certificates.component.scss | 5 +++++ .../profile-item/profile-item.component.scss | 2 +- modules/ui/src/app/pages/settings/settings.component.scss | 5 +++++ .../download-options/download-options.component.scss | 1 - 8 files changed, 18 insertions(+), 8 deletions(-) diff --git a/modules/ui/src/app/app.component.scss b/modules/ui/src/app/app.component.scss index 176b22389..20e81c53e 100644 --- a/modules/ui/src/app/app.component.scss +++ b/modules/ui/src/app/app.component.scss @@ -95,7 +95,7 @@ $nav-open-btn-width: 210px; box-sizing: border-box; height: 34px; margin: 11px 0; - line-height: 50%; + line-height: 50% !important; } .app-sidebar-button { diff --git a/modules/ui/src/app/components/device-item/device-item.component.scss b/modules/ui/src/app/components/device-item/device-item.component.scss index f7516f219..2f0c65b14 100644 --- a/modules/ui/src/app/components/device-item/device-item.component.scss +++ b/modules/ui/src/app/components/device-item/device-item.component.scss @@ -51,6 +51,7 @@ $border-radius: 12px; .device-item-with-actions { display: grid; width: $device-item-width; + min-height: calc($icon-width - 2px); border-radius: $border-radius; border: 1px solid #c4c7c5; background: $white; @@ -162,7 +163,7 @@ $border-radius: 12px; .button-start { grid-area: start; width: $icon-width; - height: calc($icon-width - 2px); + height: 100%; background-color: mat.get-color-from-palette($color-primary, 50); justify-self: end; border-radius: 0 $border-radius $border-radius 0; diff --git a/modules/ui/src/app/components/shutdown-app/shutdown-app.component.scss b/modules/ui/src/app/components/shutdown-app/shutdown-app.component.scss index a424bf842..8c6a76e74 100644 --- a/modules/ui/src/app/components/shutdown-app/shutdown-app.component.scss +++ b/modules/ui/src/app/components/shutdown-app/shutdown-app.component.scss @@ -24,5 +24,5 @@ box-sizing: border-box; height: 34px; margin: 11px 2px 11px 0; - line-height: 50%; + line-height: 50% !important; } diff --git a/modules/ui/src/app/pages/certificates/certificate-item/certificate-item.component.scss b/modules/ui/src/app/pages/certificates/certificate-item/certificate-item.component.scss index db2a2fb9c..bab73098b 100644 --- a/modules/ui/src/app/pages/certificates/certificate-item/certificate-item.component.scss +++ b/modules/ui/src/app/pages/certificates/certificate-item/certificate-item.component.scss @@ -46,7 +46,7 @@ border-radius: 4px; color: $grey-700; display: flex; - align-items: start; + align-items: flex-start; justify-content: center; & ::ng-deep .mat-mdc-button-persistent-ripple { border-radius: 4px; @@ -69,12 +69,12 @@ .certificate-item-name { font-size: 16px; color: $grey-800; - height: 24px; + min-height: 24px; } .certificate-item-organisation, .certificate-item-expires { font-size: 14px; color: $grey-700; - height: 20px; + min-height: 20px; } } diff --git a/modules/ui/src/app/pages/certificates/certificates.component.scss b/modules/ui/src/app/pages/certificates/certificates.component.scss index eca247502..5ee4e9847 100644 --- a/modules/ui/src/app/pages/certificates/certificates.component.scss +++ b/modules/ui/src/app/pages/certificates/certificates.component.scss @@ -46,12 +46,17 @@ margin: 4px; padding: 8px !important; box-sizing: content-box; + line-height: normal !important; .close-button-icon { width: 24px; height: 24px; margin: 0; } + + ::ng-deep * { + line-height: inherit !important; + } } } diff --git a/modules/ui/src/app/pages/risk-assessment/profile-item/profile-item.component.scss b/modules/ui/src/app/pages/risk-assessment/profile-item/profile-item.component.scss index 1b745a68b..b755bc295 100644 --- a/modules/ui/src/app/pages/risk-assessment/profile-item/profile-item.component.scss +++ b/modules/ui/src/app/pages/risk-assessment/profile-item/profile-item.component.scss @@ -39,7 +39,7 @@ text-overflow: ellipsis; font-size: 16px; color: $grey-800; - height: 24px; + min-height: 24px; } .profile-item-button { diff --git a/modules/ui/src/app/pages/settings/settings.component.scss b/modules/ui/src/app/pages/settings/settings.component.scss index 6bec40683..770d79a52 100644 --- a/modules/ui/src/app/pages/settings/settings.component.scss +++ b/modules/ui/src/app/pages/settings/settings.component.scss @@ -46,12 +46,17 @@ margin: 4px; padding: 8px; box-sizing: content-box; + line-height: normal !important; .close-button-icon { width: 24px; height: 24px; margin: 0; } + + ::ng-deep * { + line-height: inherit !important; + } } } diff --git a/modules/ui/src/app/pages/testrun/components/download-options/download-options.component.scss b/modules/ui/src/app/pages/testrun/components/download-options/download-options.component.scss index 7c054dc29..cf368929d 100644 --- a/modules/ui/src/app/pages/testrun/components/download-options/download-options.component.scss +++ b/modules/ui/src/app/pages/testrun/components/download-options/download-options.component.scss @@ -34,7 +34,6 @@ $option-height: 36px; ::ng-deep.mat-mdc-form-field-infix { padding: 6px 0; - height: $option-height; width: $option-width; min-height: $option-height; }