From b9fac75ac88415a00c128f8e2edb884d82ecdaac Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu, 4 Apr 2024 17:35:17 +0100 Subject: [PATCH] Refresh the style of alerts (#9115) * Init * Update _alert.scss * Update _theme.scss --- war/src/main/scss/abstracts/_theme.scss | 52 +++++++++++++++++------ war/src/main/scss/base/_style.scss | 51 ---------------------- war/src/main/scss/components/_alert.scss | 54 ++++++++++++++++++++++++ war/src/main/scss/components/_index.scss | 1 + 4 files changed, 95 insertions(+), 63 deletions(-) create mode 100644 war/src/main/scss/components/_alert.scss diff --git a/war/src/main/scss/abstracts/_theme.scss b/war/src/main/scss/abstracts/_theme.scss index d779588c13e7..e8fab3b59b7d 100644 --- a/war/src/main/scss/abstracts/_theme.scss +++ b/war/src/main/scss/abstracts/_theme.scss @@ -90,18 +90,46 @@ $semantics: ( --breadcrumbs-bar-background: hsla(240, 20%, 96.5%, 0.8); // Alert call outs - --alert-success-text-color: #155724; - --alert-success-bg-color: #d4edda; - --alert-success-border-color: #c3e6cb; - --alert-info-text-color: #31708f; - --alert-info-bg-color: #d9edf7; - --alert-info-border-color: #bce8f1; - --alert-warning-text-color: #8a6d3b; - --alert-warning-bg-color: #fcf8e3; - --alert-warning-border-color: #faebcc; - --alert-danger-text-color: #a94442; - --alert-danger-bg-color: #f2dede; - --alert-danger-border-color: #ebccd1; + --alert-success-text-color: var(--success-color); + --alert-success-bg-color: color-mix( + in sRGB, + var(--success-color) 10%, + transparent + ); + --alert-success-border-color: color-mix( + in sRGB, + var(--success-color) 5%, + transparent + ); + --alert-info-text-color: var(--blue); + --alert-info-bg-color: color-mix(in sRGB, var(--blue) 10%, transparent); + --alert-info-border-color: color-mix(in sRGB, var(--blue) 5%, transparent); + --alert-warning-text-color: color-mix( + in sRGB, + var(--warning-color) 80%, + var(--text-color) + ); + --alert-warning-bg-color: color-mix( + in sRGB, + var(--warning-color) 10%, + transparent + ); + --alert-warning-border-color: color-mix( + in sRGB, + var(--warning-color) 5%, + transparent + ); + --alert-danger-text-color: var(--error-color); + --alert-danger-bg-color: color-mix( + in sRGB, + var(--error-color) 10%, + transparent + ); + --alert-danger-border-color: color-mix( + in sRGB, + var(--error-color) 5%, + transparent + ); // Typography --text-color-secondary: var(--secondary); diff --git a/war/src/main/scss/base/_style.scss b/war/src/main/scss/base/_style.scss index 6d18f031619f..71caf8b1e470 100644 --- a/war/src/main/scss/base/_style.scss +++ b/war/src/main/scss/base/_style.scss @@ -1048,57 +1048,6 @@ select.select-ajax-pending { display: none; } -.alert { - font-size: var(--font-size-sm); - padding: 15px; - margin-bottom: 20px; - border: 1px solid transparent; - border-radius: var(--form-input-border-radius); -} - -.alert a { - color: inherit; - text-decoration: underline; - - &:hover, - &:focus, - &:active { - text-decoration: underline; - } -} - -.alert-success { - color: var(--alert-success-text-color); - background-color: var(--alert-success-bg-color); - border-color: var(--alert-success-border-color); -} - -.alert-info { - color: var(--alert-info-text-color); - background-color: var(--alert-info-bg-color); - border-color: var(--alert-info-border-color); -} - -.alert-warning { - color: var(--alert-warning-text-color); - background-color: var(--alert-warning-bg-color); - border-color: var(--alert-warning-border-color); -} - -.alert-warning p { - color: var(--alert-warning-text-color); -} - -.alert-danger { - color: var(--alert-danger-text-color); - background-color: var(--alert-danger-bg-color); - border-color: var(--alert-danger-border-color); -} - -.alert-danger p { - color: var(--alert-danger-text-color); -} - body.no-decoration #main-panel { margin: 0 auto !important; } diff --git a/war/src/main/scss/components/_alert.scss b/war/src/main/scss/components/_alert.scss new file mode 100644 index 000000000000..3397eeaab91d --- /dev/null +++ b/war/src/main/scss/components/_alert.scss @@ -0,0 +1,54 @@ +.alert { + font-size: var(--font-size-sm); + padding: 15px; + margin-bottom: 20px; + border: 1px solid transparent; + border-radius: 10px; + + strong { + font-weight: 500; + } +} + +.alert a { + color: inherit; + text-decoration: underline; + + &:hover, + &:focus, + &:active { + text-decoration: underline; + } +} + +.alert-success { + color: var(--alert-success-text-color); + background-color: var(--alert-success-bg-color); + border-color: var(--alert-success-border-color); +} + +.alert-info { + color: var(--alert-info-text-color); + background-color: var(--alert-info-bg-color); + border-color: var(--alert-info-border-color); +} + +.alert-warning { + color: var(--alert-warning-text-color); + background-color: var(--alert-warning-bg-color); + border-color: var(--alert-warning-border-color); +} + +.alert-warning p { + color: var(--alert-warning-text-color); +} + +.alert-danger { + color: var(--alert-danger-text-color); + background-color: var(--alert-danger-bg-color); + border-color: var(--alert-danger-border-color); +} + +.alert-danger p { + color: var(--alert-danger-text-color); +} diff --git a/war/src/main/scss/components/_index.scss b/war/src/main/scss/components/_index.scss index 8551ffb500c4..3048d06ae2c5 100644 --- a/war/src/main/scss/components/_index.scss +++ b/war/src/main/scss/components/_index.scss @@ -1,4 +1,5 @@ @use "app-bar"; +@use "alert"; @use "badges"; @use "breadcrumbs"; @use "buttons-deprecated";