Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(styles): updates for Message Box [ci visual] #5764

Merged
merged 1 commit into from
Nov 12, 2024
Merged

fix(styles): updates for Message Box [ci visual] #5764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/styles/src/icon.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ $blockTNT: sap-icon-TNT;
@include fd-icon-control-enumeration($block);

line-height: 1;
font-size: 1rem;
font-size: var(--fdIcon_Font_Size, 1rem);
font-style: normal;
display: inline-flex;
color: var(--fdIcon_Color, inherit);
background-color: var(--fdIcon_Background_Color, transparent);

@include fd-fiori-focus(0);
}
Expand Down
54 changes: 25 additions & 29 deletions packages/styles/src/message-box.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,14 @@
$block: #{$fd-namespace}-message-box;
$bar: #{$fd-namespace}-bar;
$button: #{$fd-namespace}-button;
$fd-message-box-title-icon-text-size: 1rem;
$fd-message-box-footer-button-min-width: 4rem;
$fd-message-box-content-padding-x: (s: 1rem, m: 2rem, l: 2rem, xl: 3rem);
$defaultBoxShadow: var(--sapContent_HeaderShadow);
$errorBoxShadow: var(--fdMessage_Box_Error_Box_Shadow);
$successBoxShadow: var(--fdMessage_Box_Success_Box_Shadow);
$warningBoxShadow: var(--fdMessage_Box_Warning_Box_Shadow);
$informationBoxShadow: var(--fdMessage_Box_Information_Box_Shadow);

$message-box-states: (
"confirmation": ("iconColor": var(--sapNeutralElementColor), "boxShadow": var(--sapContent_HeaderShadow)),
"error": ("iconColor": var(--sapNegativeElementColor), "boxShadow": $errorBoxShadow),
"success": ("iconColor": var(--sapPositiveElementColor), "boxShadow": $successBoxShadow),
"warning": ("iconColor": var(--sapCriticalElementColor), "boxShadow": $warningBoxShadow),
"information": ("iconColor": var(--sapInformativeElementColor), "boxShadow": $informationBoxShadow)
"error": ("iconColor": var(--sapNegativeElementColor), "boxShadow": var(--sapContent_Error_HeaderShadow)),
"success": ("iconColor": var(--sapPositiveElementColor), "boxShadow": var(--sapContent_Success_HeaderShadow)),
"warning": ("iconColor": var(--sapCriticalElementColor), "boxShadow": var(--sapContent_Warning_HeaderShadow)),
"information": ("iconColor": var(--sapInformativeElementColor), "boxShadow": var(--sapContent_Information_HeaderShadow))
);

.#{$block} {
Expand All @@ -40,10 +34,11 @@ $message-box-states: (

@each $size-label, $size in $fd-message-box-content-padding-x {
&--#{$size-label} {
.#{$block}__header.#{$bar},
.#{$block}__footer.#{$bar},
.#{$block}__header,
.#{$block}__footer,
.#{$block}__body {
padding-inline: map.get($fd-message-box-content-padding-x, $size-label);
--fdBar_Padding_X: #{map.get($fd-message-box-content-padding-x, $size-label)};
--fdMessageBox_Body_Inline_Padding: #{map.get($fd-message-box-content-padding-x, $size-label)};
}
}
}
Expand All @@ -53,16 +48,9 @@ $message-box-states: (
}
}

&__header,
&__footer {
&.#{$bar} {
@extend %dialog-paddings;
}
}

&__footer {
.#{$block}__decisive-button.#{$button} {
min-width: $fd-message-box-footer-button-min-width;
.#{$block}__decisive-button {
--fdButton_Min_Width: 4rem;
}
}

Expand All @@ -71,8 +59,9 @@ $message-box-states: (

@extend %dialog-body;

padding-inline: 1rem;
padding-inline: var(--fdMessageBox_Body_Inline_Padding, 1rem);
padding-block: 1rem;

}

&__title {
Expand All @@ -84,7 +73,7 @@ $message-box-states: (
&__more {
@include fd-reset();

margin-top: 1rem;
margin-block-start: 1rem;
}

// MODIFIERS
Expand All @@ -94,15 +83,22 @@ $message-box-states: (

@each $set-name, $state-set in $message-box-states {
&--#{$set-name} {
.#{$block}__header.#{$bar} {
box-shadow: map.get($state-set, "boxShadow");
.#{$block}__header {
--fdBar_Shadow: #{map.get($state-set, "boxShadow")};

:not(button) > [class*="sap-icon"] {
font-size: 1rem;
--fdIcon_Font_Size: 1rem;
--fdIcon_Color: #{map.get($state-set, "iconColor")};

margin-inline-end: 0.5rem;
color: map.get($state-set, "iconColor");
}
}
}
}

@include fd-compact-or-condensed() {
.#{$block}__decisive-button {
--fdButton_Min_Width: 4rem;
}
}
}
6 changes: 2 additions & 4 deletions packages/styles/src/mixins/_icons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,10 @@
@each $enumeration-name, $enumeration-value in $fd-icon-control-enumerations {
&.#{$block} {
&--color-#{$enumeration-name} {
color: map.get($enumeration-value, "color");
--fdIcon_Color: #{map.get($enumeration-value, "color")};
}
&--background-#{$enumeration-name} {
&::#{$position} {
background-color: map.get($enumeration-value, "background-color");
}
--fdIcon_Background_Color: #{map.get($enumeration-value, "background-color")};
}
}
}
Expand Down
9 changes: 0 additions & 9 deletions packages/styles/src/theming/common/message-box/_sap_fiori.scss
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions packages/styles/src/theming/common/message-box/_sap_fiori_hc.scss
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions packages/styles/src/theming/common/message-box/_sap_horizon.scss
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions packages/styles/src/theming/common/message-box/_sap_horizon_hc.scss
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion packages/styles/src/theming/sap_fiori_3.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
@import "./common/panel/sap_fiori";
@import "./common/carousel/sap_fiori";
@import "./common/feed-list-item/sap_fiori";
@import "./common/message-box/sap_fiori";
@import "./common/busy-indicator/sap_fiori";
@import "./common/menu/sap_fiori";
@import "./common/checkbox/sap_foiri";
Expand Down
1 change: 0 additions & 1 deletion packages/styles/src/theming/sap_fiori_3_dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
@import "./common/panel/sap_fiori";
@import "./common/carousel/sap_fiori";
@import "./common/feed-list-item/sap_fiori";
@import "./common/message-box/sap_fiori";
@import "./common/busy-indicator/sap_fiori";
@import "./common/menu/sap_fiori";
@import "./common/checkbox/sap_foiri";
Expand Down
1 change: 0 additions & 1 deletion packages/styles/src/theming/sap_fiori_3_hcb.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
@import "./common/carousel/sap_fiori";
@import "./common/carousel/sap_fiori_hc";
@import "./common/feed-list-item/sap_fiori";
@import "./common/message-box/sap_fiori_hc";
@import "./common/busy-indicator/sap_fiori_hc";
@import "./common/menu/sap_fiori";
@import "./common/checkbox/sap_fiori_hc";
Expand Down
1 change: 0 additions & 1 deletion packages/styles/src/theming/sap_fiori_3_hcw.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
@import "./common/panel/sap_fiori";
@import "./common/carousel/sap_fiori_hc";
@import "./common/feed-list-item/sap_fiori";
@import "./common/message-box/sap_fiori_hc";
@import "./common/busy-indicator/sap_fiori_hc";
@import "./common/menu/sap_fiori";
@import "./common/checkbox/sap_fiori_hc";
Expand Down
1 change: 0 additions & 1 deletion packages/styles/src/theming/sap_fiori_3_light_dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
@import "./common/panel/sap_fiori";
@import "./common/carousel/sap_fiori";
@import "./common/feed-list-item/sap_fiori";
@import "./common/message-box/sap_fiori";
@import "./common/busy-indicator/sap_fiori";
@import "./common/menu/sap_fiori";
@import "./common/checkbox/sap_foiri";
Expand Down
1 change: 0 additions & 1 deletion packages/styles/src/theming/sap_horizon.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
@import "./common/panel/sap_horizon";
@import "./common/carousel/sap_horizon";
@import "./common/feed-list-item/sap_horizon";
@import "./common/message-box/sap_horizon";
@import "./common/busy-indicator/sap_horizon";
@import "./common/menu/sap_horizon";
@import "./common/checkbox/sap_horizon";
Expand Down
1 change: 0 additions & 1 deletion packages/styles/src/theming/sap_horizon_dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
@import "./common/panel/sap_horizon";
@import "./common/carousel/sap_horizon";
@import "./common/feed-list-item/sap_horizon";
@import "./common/message-box/sap_horizon";
@import "./common/busy-indicator/sap_horizon";
@import "./common/menu/sap_horizon";
@import "./common/checkbox/sap_horizon";
Expand Down
1 change: 0 additions & 1 deletion packages/styles/src/theming/sap_horizon_hcb.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
@import "./common/panel/sap_horizon";
@import "./common/carousel/sap_horizon_hc";
@import "./common/feed-list-item/sap_horizon";
@import "./common/message-box/sap_horizon_hc";
@import "./common/busy-indicator/sap_horizon_hc";
@import "./common/menu/sap_horizon";
@import "./common/checkbox/sap_horizon_hc";
Expand Down
1 change: 0 additions & 1 deletion packages/styles/src/theming/sap_horizon_hcw.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
@import "./common/panel/sap_horizon";
@import "./common/carousel/sap_horizon_hc";
@import "./common/feed-list-item/sap_horizon";
@import "./common/message-box/sap_horizon_hc";
@import "./common/busy-indicator/sap_horizon_hc";
@import "./common/menu/sap_horizon";
@import "./common/checkbox/sap_horizon_hc";
Expand Down
6 changes: 4 additions & 2 deletions packages/styles/stories/Components/feed-input/placeholder-image.example.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<div class="fd-feed-input"
role="region"
aria-label="Feed input empty example">
<div class="fd-avatar fd-avatar--s fd-avatar--placeholder sap-icon--person-placeholder fd-feed-input__thumb"
<div class="fd-avatar fd-avatar--s fd-avatar--placeholder fd-feed-input__thumb"
role="img"
aria-label="John Doe"
title="John Doe"></div>
title="John Doe">
<i class="fd-avatar__icon sap-icon--person-placeholder" role="presentation" aria-hidden="true" aria-label="Image placeholder"></i>
</div>
<textarea class="fd-textarea fd-feed-input__textarea"
placeholder="Post something here"
aria-label="Feed message"
Expand Down
24 changes: 12 additions & 12 deletions packages/styles/stories/Components/message-box/responsive.example.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

<div class="fd-message-box-docs-static fd-message-box fd-message-box--information fd-message-box--active">
<div class="fd-message-box-docs-static fd-message-box fd-message-box--information fd-message-box--active" role="alertdialog" aria-modal="true" aria-labelledby="fd-message-box-title-7 fd-message-box-text-7" tabindex="-1">
<section class="fd-message-box__content fd-message-box__content--s">
<header class="fd-bar fd-bar--header fd-message-box__header">
<div class="fd-bar__left">
<div class="fd-bar__element">
<h2 class="fd-title fd-title--h5">Information</h2>
<h1 class="fd-title fd-title--h5" id="fd-message-box-title-7">Information</h1>
</div>
</div>
</header>
<div class="fd-message-box__body">
<div class="fd-message-box__body" id="fd-message-box-text-7">
Informative message box for a small screen in cozy mode (mobile) and a "Show more" link in the body.
<div class="fd-message-box__more">
<a href="#" class="fd-link" tabindex="0"><span class="fd-link__content">Show more</span></a>
Expand All @@ -28,16 +28,16 @@ <h2 class="fd-title fd-title--h5">Information</h2>

<br><br><br>

<div class="fd-message-box-docs-static fd-message-box fd-message-box--error fd-message-box--active">
<div class="fd-message-box-docs-static fd-message-box fd-message-box--error fd-message-box--active" role="alertdialog" aria-modal="true" aria-labelledby="fd-message-box-title-8 fd-message-box-text-8" tabindex="-1">
<section class="fd-message-box__content fd-message-box__content--m">
<header class="fd-bar fd-bar--header fd-message-box__header">
<div class="fd-bar__left">
<div class="fd-bar__element">
<h2 class="fd-title fd-title--h5">Error</h2>
<h1 class="fd-title fd-title--h5" id="fd-message-box-title-8">Error</h1>
</div>
</div>
</header>
<div class="fd-message-box__body">
<div class="fd-message-box__body" id="fd-message-box-text-8">
Error message box for a medium-sized screen in cozy mode (mobile).
</div>
<footer class="fd-bar fd-bar--footer fd-message-box__footer">
Expand All @@ -55,16 +55,16 @@ <h2 class="fd-title fd-title--h5">Error</h2>

<br><br><br>

<div class="fd-message-box-docs-static fd-message-box fd-message-box--success fd-message-box--active">
<div class="fd-message-box-docs-static fd-message-box fd-message-box--success fd-message-box--active" role="alertdialog" aria-modal="true" aria-labelledby="fd-message-box-title-9 fd-message-box-text-9" tabindex="-1">
<section class="fd-message-box__content fd-message-box__content--l">
<header class="fd-bar fd-bar--header fd-message-box__header">
<div class="fd-bar__left">
<div class="fd-bar__element">
<h2 class="fd-title fd-title--h5">Success</h2>
<h1 class="fd-title fd-title--h5" id="fd-message-box-title-9">Success</h1>
</div>
</div>
</header>
<div class="fd-message-box__body">
<div class="fd-message-box__body" id="fd-message-box-text-9">
Success message box for a large screen in compact mode (desktop).
</div>
<footer class="fd-bar fd-bar--footer fd-message-box__footer">
Expand All @@ -81,16 +81,16 @@ <h2 class="fd-title fd-title--h5">Success</h2>

<br><br><br>

<div class="fd-message-box-docs-static fd-message-box fd-message-box--warning fd-message-box--active">
<div class="fd-message-box-docs-static fd-message-box fd-message-box--warning fd-message-box--active" role="alertdialog" aria-modal="true" aria-labelledby="fd-message-box-title-10 fd-message-box-text-10" tabindex="-1">
<section class="fd-message-box__content fd-message-box__content--xl">
<header class="fd-bar fd-bar--header fd-message-box__header">
<div class="fd-bar__left">
<div class="fd-bar__element">
<h2 class="fd-title fd-title--h5">Warning</h2>
<h1 class="fd-title fd-title--h5" id="fd-message-box-title-10">Warning</h1>
</div>
</div>
</header>
<div class="fd-message-box__body">
<div class="fd-message-box__body" id="fd-message-box-text-10">
Warning message box for an extra large screen in compact mode (desktop).
</div>
<footer class="fd-bar fd-bar--footer fd-message-box__footer">
Expand Down
6 changes: 3 additions & 3 deletions packages/styles/stories/Components/message-box/structure.example.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<div class="fd-message-box-docs-static fd-message-box fd-message-box--active">
<div class="fd-message-box-docs-static fd-message-box fd-message-box--active" role="alertdialog" aria-modal="true" aria-labelledby="fd-message-box-title-1 fd-message-box-text-1" tabindex="-1">
<section class="fd-message-box__content">
<header class="fd-bar fd-bar--header fd-message-box__header">
<div class="fd-bar__left">
<div class="fd-bar__element">
<h2 class="fd-title fd-title--h5">Title</h2>
<h1 class="fd-title fd-title--h5" id="fd-message-box-title-1">Title</h1>
</div>
</div>
</header>
<div class="fd-message-box__body">
<div class="fd-message-box__body" id="fd-message-box-text-1">
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
</div>
<footer class="fd-bar fd-bar--footer fd-message-box__footer">
Expand Down
Loading
Loading