From 30f5ae931901711ebb614bf4136dcf53faecc6af Mon Sep 17 00:00:00 2001 From: sumeyyeKurtulus Date: Tue, 13 Aug 2024 16:36:01 +0300 Subject: [PATCH 1/3] update: toastr styles --- .../lib/components/toast/toast.component.html | 4 ++-- .../lib/components/toast/toast.component.scss | 20 +++++++++++-------- .../lib/components/toast/toast.component.ts | 12 +++++------ 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.html index 0f123fdadd..74e4f72a0a 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.html +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.html @@ -1,11 +1,11 @@
- +
@if (toast.options?.closable) { }
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.scss b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.scss index b4966c310d..1b4c9eb5e7 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.scss +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.scss @@ -14,35 +14,39 @@ $toastClass: abp-toast; .#{$toastClass} { display: grid; - grid-template-columns: 50px 1fr; + grid-template-columns: 35px 1fr; gap: 10px; margin: 5px 0; - padding: 10px; - border-radius: 0px; + padding: 7px; width: 350px; user-select: none; box-shadow: 0 0 10px -5px rgba(#000, 0.4); z-index: 9999; + color: #fff; + border-radius: 8px; + font-size: 14px; + box-shadow: 0 0 20px 0 rgba(76, 87, 125, 0.02); + @include fillColor(#f0f0f0, #000); opacity: 1; &.#{$toastClass}-success { - @include fillColor(#51a351, #fff); + @include fillColor(#4fbf67, #fff); } &.#{$toastClass}-info { - @include fillColor(#2f96b4, #fff); + @include fillColor(#438aa7, #fff); } &.#{$toastClass}-warning { - @include fillColor(#f89406, #fff); + @include fillColor(#ff9f38, #fff); } &.#{$toastClass}-error { - @include fillColor(#bd362f, #fff); + @include fillColor(#c00d49, #fff); } .#{$toastClass}-icon { display: flex; align-items: center; justify-content: center; .icon { - font-size: 36px; + font-size: 32px; } } .#{$toastClass}-content { diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.ts index 4d842df02a..b528d490a4 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.ts @@ -18,22 +18,22 @@ export class ToastComponent implements OnInit { get iconClass(): string { const { iconClass } = this.toast.options || {}; - + if (iconClass) { return iconClass; } switch (this.toast.severity) { case 'success': - return 'fa-check-circle'; + return 'bi-check'; case 'info': - return 'fa-info-circle'; + return 'bi-info-circle'; case 'warning': - return 'fa-exclamation-triangle'; + return 'bi-exclamation-triangle'; case 'error': - return 'fa-times-circle'; + return 'bi-shield-exclamation'; default: - return 'fa-exclamation-circle'; + return 'bi-exclamation-triangle'; } } From 855a2952b2884740ecb1819405c8b3b6d05dab92 Mon Sep 17 00:00:00 2001 From: sumeyyeKurtulus Date: Fri, 16 Aug 2024 10:50:30 +0300 Subject: [PATCH 2/3] add: tiny padding to align with default icon configurations --- .../src/lib/components/toast/toast.component.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.scss b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.scss index 1b4c9eb5e7..bc800aebd3 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.scss +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.scss @@ -55,6 +55,8 @@ $toastClass: abp-toast; align-self: center; flex-direction: column; word-break: break-word; + padding-bottom: 2px; + .#{$toastClass}-close-button { position: absolute; top: 0; @@ -65,7 +67,7 @@ $toastClass: abp-toast; margin: 0; padding: 0px 5px 0 0; width: 25px; - height: 25px; + height: 100%; border: none; border-radius: 50%; background: transparent; From 7c4b15c712f713c1eee9b3a74ce59d6bc6c15784 Mon Sep 17 00:00:00 2001 From: sumeyyeKurtulus Date: Mon, 19 Aug 2024 09:19:08 +0300 Subject: [PATCH 3/3] update: smaller padding for the grid template --- .../theme-shared/src/lib/components/toast/toast.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.scss b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.scss index bc800aebd3..b4be48fb95 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.scss +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/toast/toast.component.scss @@ -15,7 +15,7 @@ $toastClass: abp-toast; .#{$toastClass} { display: grid; grid-template-columns: 35px 1fr; - gap: 10px; + gap: 5px; margin: 5px 0; padding: 7px; width: 350px;