Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 29 additions & 1 deletion packages/fiori/test/pages/DialogWithBar.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8">

<title>Dialog test page</title>
<title>Dialog with Bar/Toolbar test page</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<meta charset="utf-8">

Expand All @@ -16,6 +16,12 @@
#dialog-bar::part(footer) {
padding-inline: 0;
}

#dialog-custom-colors::part(header) {
--sapPageHeader_TextColor: blue;
--sapPageHeader_Background: lightblue;
--sapNegativeElementColor: blue;
}
</style>

<body class="bar1auto">
Expand Down Expand Up @@ -59,6 +65,14 @@
</ui5-bar>
</ui5-dialog>

<ui5-button id="dialogOpener">Open Dialog with Toolbar and overstyled Header</ui5-button>
<ui5-dialog id="dialog-custom-colors" state="Negative" header-text="State :: Negative">
<ui5-text>Dialog with state</ui5-text>
<ui5-toolbar slot="footer">
<ui5-toolbar-button class="dialogCloser" text="Close"></ui5-toolbar-button>
</ui5-toolbar>
</ui5-dialog>

<script>
window["dialog-bar-open"].addEventListener("click", function () {
window["dialog-bar"].open = true;
Expand All @@ -83,6 +97,20 @@
window["closeDialogStateButton"].addEventListener("click", function () {
window["dialog-bar-state"].removeAttribute("open");
});

var dialogOpener = document.getElementById("dialogOpener");
var dialog = document.getElementById("dialog-custom-colors");
var dialogClosers = [...dialog.querySelectorAll(".dialogCloser")];


dialogOpener.addEventListener("click", () => {
dialog.open = true;
});
dialogClosers.forEach(btn => {
btn.addEventListener("click", () => {
dialog.open = false;
});
});
</script>
</body>

Expand Down
8 changes: 4 additions & 4 deletions packages/main/src/themes/Dialog.css
Original file line number Diff line number Diff line change
Expand Up @@ -84,18 +84,18 @@
}

:host([state="Negative"]) .ui5-dialog-value-state-icon {
color: var(--_ui5_dialog_header_error_state_icon_color);
color: var(--sapNegativeElementColor);
}

:host([state="Information"]) .ui5-dialog-value-state-icon {
color: var(--_ui5_dialog_header_information_state_icon_color);
color: var(--sapInformativeElementColor);
}
:host([state="Positive"]) .ui5-dialog-value-state-icon {
color: var(--_ui5_dialog_header_success_state_icon_color);
color: var(--sapPositiveElementColor);
}

:host([state="Critical"]) .ui5-dialog-value-state-icon {
color: var(--_ui5_dialog_header_warning_state_icon_color);
color: var(--sapCriticalElementColor);
}

.ui5-popup-header-root {
Expand Down
2 changes: 1 addition & 1 deletion packages/main/src/themes/PopupsCommon.css
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
}

.ui5-popup-header-root {
background: var(--_ui5_popup_header_background);
background: var(--sapPageHeader_Background);
}

/*** Responsive paddings for the Header and Footer ***/
Expand Down
4 changes: 0 additions & 4 deletions packages/main/src/themes/base/Dialog-parameters.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,5 @@
--_ui5_dialog_header_focus_left_offset: 2px;
--_ui5_dialog_header_focus_right_offset: 2px;
--_ui5_dialog_header_border_radius: 0px;
--_ui5_dialog_header_error_state_icon_color: var(--sapNegativeElementColor);
--_ui5_dialog_header_information_state_icon_color: var(--sapInformativeElementColor);
--_ui5_dialog_header_success_state_icon_color: var(--sapPositiveElementColor);
--_ui5_dialog_header_warning_state_icon_color: var(--sapCriticalElementColor);
--_ui5_dialog_header_state_line_height: 0.0625rem;
}
1 change: 0 additions & 1 deletion packages/main/src/themes/base/PopupsCommon-parameters.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
--_ui5_popup_viewport_margin: 10px;
--_ui5_popup_header_prop_header_text_alignment: flex-start;
--_ui5_popup_border_radius: var(--sapElement_BorderCornerRadius);
--_ui5_popup_header_background: var(--sapPageHeader_Background);
--_ui5_popup_header_shadow: var(--sapContent_HeaderShadow);
--_ui5_popup_header_border: none;
}
Loading