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

Jump to bottom

fix(ui5-dynamic-page): theme styling #7966

Merged
merged 1 commit into from
Dec 21, 2023
Merged

fix(ui5-dynamic-page): theme styling #7966

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
24 changes: 11 additions & 13 deletions packages/fiori/src/DynamicPage.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,7 @@
{{/if}}

{{#if actionsInTitle}}
<ui5-dynamic-page-header-actions
?snapped="{{headerSnapped}}"
?pinned="{{headerPinned}}"
@ui5-expand-button-click={{onExpandClick}}
@ui5-pin-button-click={{onPinClick}}
></ui5-dynamic-page-header-actions>
{{> header-actions}}
{{/if}}

</div>
Expand All @@ -24,12 +19,7 @@
{{/if}}

{{#unless actionsInTitle}}
<ui5-dynamic-page-header-actions
?snapped="{{headerSnapped}}"
?pinned="{{headerPinned}}"
@ui5-expand-button-click={{onExpandClick}}
@ui5-pin-button-click={{onPinClick}}
></ui5-dynamic-page-header-actions>
{{> header-actions}}
{{/unless}}

<div class="{{classes.content}}">
Expand All @@ -45,4 +35,12 @@
<div class="{{classes.footer}}">
<slot name="footer"></slot>
</div>
</div>
</div>
{{#*inline "header-actions"}}
<ui5-dynamic-page-header-actions
?snapped="{{headerSnapped}}"
?pinned="{{headerPinned}}"
@ui5-expand-button-click={{onExpandClick}}
@ui5-pin-button-click={{onPinClick}}
></ui5-dynamic-page-header-actions>
{{/inline}}
1 change: 0 additions & 1 deletion packages/fiori/src/DynamicPageTitle.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
@focusin={{_onfocusin}}
@keydown="{{_onkeydown}}">
</span>

<div class="{{classes.topArea}}">
{{#if hasBreadcrumb}}
<div class="{{classes.breadcrumbs}}">
Expand Down
65 changes: 44 additions & 21 deletions packages/fiori/src/themes/DynamicPage.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@
z-index: 1;
}

.ui5-dynamic-page-content {
padding: 0 0 0 var(--_ui5_dynamic_page_title_content_padding_left);
}

:host {
display: block;
height: 100%;
background-color: var(--ui5_dynamic_page_background);
}

.ui5-dynamic-page-root {
Expand Down Expand Up @@ -69,10 +66,9 @@

::slotted([slot="footer"]) {
/* TODO css vars? */
border: 1px solid;
border-radius: 0.25rem;
background-color: #fff;
box-sizing: border-box;
background-color: var(--_ui5_dynamic_page_header_background_color);
box-sizing: content-box;
width: auto;
margin: 0 0.5rem 0.5rem 0.5rem;
}
Expand Down Expand Up @@ -105,27 +101,54 @@

/* Responsive paddings */

:host([media-range="S"]) .ui5-dynamic-page-fit-content,
:host([media-range="S"]) ::slotted([slot="titleArea"]),
:host([media-range="S"]) ::slotted([slot="headerArea"]) {
padding: 0 1rem;
:host([media-range="S"]) .ui5-dynamic-page-content,
:host([media-range="S"]) .ui5-dynamic-page-fit-content {
padding: var(--_ui5_dynamic_page_content_padding_S);
}

:host([media-range="S"]) ::slotted([slot="titleArea"]) {
padding: var(--_ui5_dynamic_page_title_padding_S);
}

:host([media-range="S"]) ::slotted([slot="headerArea"]) {
padding-top: 0.5rem;
padding: var(--_ui5_dynamic_page_header_padding_S);
}

:host([media-range="M"]) .ui5-dynamic-page-content,
:host([media-range="M"]) .ui5-dynamic-page-fit-content {
padding: var(--_ui5_dynamic_page_content_padding_M);
}

:host([media-range="M"]) ::slotted([slot="titleArea"]) {
padding: var(--_ui5_dynamic_page_title_padding_M);
}

:host([media-range="M"]) ::slotted([slot="headerArea"]) {
padding: var(--_ui5_dynamic_page_header_padding_M);
}

:host([media-range="L"]) .ui5-dynamic-page-content,
:host([media-range="L"]) .ui5-dynamic-page-fit-content {
padding: var(--_ui5_dynamic_page_content_padding_L);
}

:host([media-range="L"]) ::slotted([slot="titleArea"]) {
padding: var(--_ui5_dynamic_page_title_padding_L);
}

:host([media-range="M"]) .ui5-dynamic-page-fit-content,
:host([media-range="M"]) ::slotted([slot="titleArea"]),
:host([media-range="M"]) ::slotted([slot="headerArea"]),
:host([media-range="L"]) .ui5-dynamic-page-fit-content,
:host([media-range="L"]) ::slotted([slot="titleArea"]),
:host([media-range="L"]) ::slotted([slot="headerArea"]) {
padding: 0 2rem;
padding: var(--_ui5_dynamic_page_header_padding_L);
}

:host([media-range="XL"]) .ui5-dynamic-page-content,
:host([media-range="XL"]) .ui5-dynamic-page-fit-content {
padding: var(--_ui5_dynamic_page_content_padding_XL);
}

:host([media-range="XL"]) ::slotted([slot="titleArea"]) {
padding: var(--_ui5_dynamic_page_title_padding_XL);
}

:host([media-range="XL"]) .ui5-dynamic-page-fit-content,
:host([media-range="XL"]) ::slotted([slot="titleArea"]),
:host([media-range="XL"]) ::slotted([slot="headerArea"]) {
padding: 0 3rem;
padding: var(--_ui5_dynamic_page_header_padding_XL);
}
3 changes: 2 additions & 1 deletion packages/fiori/src/themes/DynamicPageHeader.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
:host {
background: #fff;
background-color: var(--_ui5_dynamic_page_header_background_color);
display: block;
box-shadow: var(--_ui5_dynamic_page_header-boxshadow);
}

.ui5-dynamic-page-header-root {
Expand Down
6 changes: 3 additions & 3 deletions packages/fiori/src/themes/DynamicPageHeaderActions.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
height: 1.5rem;
background-color: var(--sapObjectHeader_Background);
border: 1px solid var(--sapButton_BorderColor);
box-shadow: var(--sapContent_Shadow0);
box-shadow: var(--_ui5_dynamic_page_header-actions-boxshadow);
}

.ui5-dynamic-page-header-actions--wrapper {
Expand All @@ -32,12 +32,12 @@

&:before {
right: 50%;
background: linear-gradient(to right, transparent, var(--sapObjectHeader_BorderColor));
/*background: linear-gradient(to right, transparent, var(--sapObjectHeader_BorderColor));*/
}

&::after {
left: 50%;
background: linear-gradient(to left, transparent, var(--sapObjectHeader_BorderColor));
/*background: linear-gradient(to left, transparent, var(--sapObjectHeader_BorderColor));*/
}
}
}
18 changes: 14 additions & 4 deletions packages/fiori/src/themes/DynamicPageTitle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
display: flex;
flex-direction: column;
width: 100%;
background-color: var(--sapObjectHeader_Background);
background-color: var(--_ui5_dynamic_page_header_background_color);
min-height: var(--_ui5_dynamic_page_title_min_height);
word-wrap: break-word;
padding-top: var(--_ui5_dynamic_page_title_padding_top);
padding-bottom: var(--_ui5_dynamic_page_title_padding_bottom);
border-bottom: var(--_ui5_dynamic_page_title_border);
}

:host .ui5-dynamic-page-title-root {
Expand All @@ -17,8 +18,9 @@
}

:host(:hover) {
background-color: var(--sapObjectHeader_Hover_Background);
background-color: var(--_ui5_dynamic_page_title_hover_background);
cursor: pointer;
border-bottom: var(--_ui5_dynamic_page_title_hover_border);
}

:host([snapped]) {
Expand All @@ -38,6 +40,7 @@
font-family: var(--sapObjectHeader_Title_FontFamily);
color: var(--sapObjectHeader_Title_TextColor);
padding: var(--_ui5_dynamic_page_title_heading_padding_top) 0 0 0;
margin: var(--_ui5_dynamic_page_title_heading_margin);
}

::slotted([ui5-title][slot="expandedHeading"]),
Expand All @@ -61,7 +64,7 @@

/* actions */
::slotted([ui5-toolbar][slot="actions"]) {
/* padding: 0 0 0 1rem; */
padding: 0 0 0 1rem;
}

.ui5-dynamic-page-title--wrapper {
Expand All @@ -85,6 +88,7 @@
min-width: 3rem;
flex-grow: 1;
display: flex;
align-items: center;
}

.ui5-dynamic-page-title--actions ::slotted([slot="actions"]) {
Expand All @@ -102,13 +106,19 @@
width: 0.0625rem;
vertical-align: middle;
background: var(--sapToolbar_SeparatorColor);
margin: 0 0.5rem;
margin: 0 0.5rem 0 0.25rem;
}
}

::slotted([slot="navigationActions"]) {
border: none;
flex: 0 1;
padding-left: 0;
padding-right: 0;
}

::slotted([slot="breadcrumbs"]) {
margin-bottom: -0.5rem;
}

.ui5-dynamic-page-title--top-area {
Expand Down
18 changes: 16 additions & 2 deletions packages/fiori/src/themes/base/DynamicPage-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
:root {
--_ui5_dynamic_page_title_content_padding_left: 1rem;
--_ui5_dynamic_page_footer_spacer: 4rem;
--_ui5_dynamic_page_footer_spacer: 4rem;

--_ui5_dynamic_page_title_padding_S: 0.5rem 1rem;
--_ui5_dynamic_page_title_padding_M: 0.5rem 2rem;
--_ui5_dynamic_page_title_padding_L: 0.5rem 2rem;
--_ui5_dynamic_page_title_padding_XL: 0.5rem 3rem;
--_ui5_dynamic_page_header_padding_S: 0.5rem 1rem 0;
--_ui5_dynamic_page_header_padding_M: 1rem 2rem;
--_ui5_dynamic_page_header_padding_L: 1rem 3rem;
--_ui5_dynamic_page_header_padding_XL: 1rem 3rem;
--_ui5_dynamic_page_content_padding_S: 2rem 1rem 0;
--_ui5_dynamic_page_content_padding_M: 2rem 2rem 0;
--_ui5_dynamic_page_content_padding_L: 1rem 2rem 0;
--_ui5_dynamic_page_content_padding_XL: 1rem 3rem 0;

--ui5_dynamic_page_background: var(--sapBackgroundColor);
}
4 changes: 4 additions & 0 deletions packages/fiori/src/themes/base/DynamicPageHeader-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
:root {
--_ui5_dynamic_page_header_padding_top: 1rem;
--_ui5_dynamic_page_header_padding_bottom: 1rem;

--_ui5_dynamic_page_header_background_color: var(--sapObjectHeader_Background);
--_ui5_dynamic_page_header-actions-boxshadow: var(--sapContent_Shadow0);
--_ui5_dynamic_page_header-boxshadow: var(--sapContent_HeaderShadow);
}
7 changes: 6 additions & 1 deletion packages/fiori/src/themes/base/DynamicPageTitle-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
:root {
--_ui5_dynamic_page_title_padding_top: 0.5rem;
--_ui5_dynamic_page_title_padding_bottom: 0.5rem;
--_ui5_dynamic_page_title_min_height: 3rem;
--_ui5_dynamic_page_title_min_height: 4rem;

--_ui5_dynamic_page_title_breadcrumbs_padding_top: 0.5rem;
--_ui5_dynamic_page_title_breadcrumbs_padding_bottom: 0.25rem;

--_ui5_dynamic_page_title_heading_padding_top: 0.3125rem;

--_ui5_dynamic_page_title_subheading_margin_top: 0.25rem;

--_ui5_dynamic_page_title_content_padding_left: 1rem;

--_ui5_dynamic_page_title_hover_background: var(--sapObjectHeader_Hover_Background);

}
16 changes: 16 additions & 0 deletions packages/fiori/src/themes/sap_belize/DynamicPage-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
:root {
/* paddings */
--_ui5_dynamic_page_title_padding_S: 0.5rem 0rem 0.5rem 1rem;
--_ui5_dynamic_page_title_padding_M: 0.5rem 1rem 0.5rem 2rem;
--_ui5_dynamic_page_title_padding_L: 0.5rem 2rem 0.5rem 3rem;
--_ui5_dynamic_page_title_padding_XL: 0.5rem 2rem 0.5rem 3rem;
--_ui5_dynamic_page_header_padding_S: 0.5rem 1rem 1rem 1rem;
--_ui5_dynamic_page_header_padding_M: 1rem 2rem;
--_ui5_dynamic_page_header_padding_L: 1rem 3rem;
--_ui5_dynamic_page_header_padding_XL: 1rem 3rem;
--_ui5_dynamic_page_content_padding_S: 2rem 1rem 0 1rem;
--_ui5_dynamic_page_content_padding_M: 2rem 2rem 0 2rem;
--_ui5_dynamic_page_content_padding_L: 1rem 3rem 0 3rem;
--_ui5_dynamic_page_content_padding_XL: 1rem 3rem 0 3rem;

}
2 changes: 1 addition & 1 deletion packages/fiori/src/themes/sap_belize/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "../base/sizes-parameters.css";
@import "../base/DynamicPage-parameters.css";
@import "./DynamicPage-parameters.css";
@import "../base/DynamicPageTitle-parameters.css";
@import "../base/DynamicPageHeader-parameters.css";
@import "../base/Bar-parameters.css";
Expand Down
6 changes: 6 additions & 0 deletions packages/fiori/src/themes/sap_belize_hcb/DynamicPageTitle-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@import "../base/DynamicPageTitle-parameters.css";

:root {
--_ui5_dynamic_page_title_border: 0.0625rem solid transparent;
--_ui5_dynamic_page_title_hover_border: 0.0625rem solid var(--sapObjectHeader_BorderColor);
}
2 changes: 1 addition & 1 deletion packages/fiori/src/themes/sap_belize_hcb/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../base/sizes-parameters.css";
@import "../base/DynamicPage-parameters.css";
@import "../base/DynamicPageTitle-parameters.css";
@import "./DynamicPageTitle-parameters.css";
@import "../base/DynamicPageHeader-parameters.css";
@import "../base/Bar-parameters.css";
@import "./FlexibleColumnLayout-parameters.css";
Expand Down
6 changes: 6 additions & 0 deletions packages/fiori/src/themes/sap_belize_hcw/DynamicPageTitle-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@import "../base/DynamicPageTitle-parameters.css";

:root {
--_ui5_dynamic_page_title_border: 0.0625rem solid transparent;
--_ui5_dynamic_page_title_hover_border: 0.0625rem solid var(--sapObjectHeader_BorderColor);
}
2 changes: 1 addition & 1 deletion packages/fiori/src/themes/sap_belize_hcw/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../base/sizes-parameters.css";
@import "../base/DynamicPage-parameters.css";
@import "../base/DynamicPageTitle-parameters.css";
@import "./DynamicPageTitle-parameters.css";
@import "../base/DynamicPageHeader-parameters.css";
@import "../base/Bar-parameters.css";
@import "./FlexibleColumnLayout-parameters.css";
Expand Down
3 changes: 3 additions & 0 deletions packages/fiori/src/themes/sap_fiori_3/DynamicPageTitle-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
:root {
--_ui5_dynamic_page_title_min_height: 3rem;
}
2 changes: 1 addition & 1 deletion packages/fiori/src/themes/sap_fiori_3/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../base/sizes-parameters.css";
@import "../base/DynamicPage-parameters.css";
@import "../base/DynamicPageTitle-parameters.css";
@import "./DynamicPageTitle-parameters.css";
@import "../base/DynamicPageHeader-parameters.css";
@import "../base/Bar-parameters.css";
@import "../base/FlexibleColumnLayout-parameters.css";
Expand Down
6 changes: 6 additions & 0 deletions packages/fiori/src/themes/sap_fiori_3_hcb/DynamicPageTitle-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@import "../sap_fiori_3/DynamicPageTitle-parameters.css";

:root {
--_ui5_dynamic_page_title_border: 0.0625rem solid transparent;
--_ui5_dynamic_page_title_hover_border: 0.0625rem solid var(--sapObjectHeader_BorderColor);
}
2 changes: 1 addition & 1 deletion packages/fiori/src/themes/sap_fiori_3_hcb/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../base/sizes-parameters.css";
@import "../base/DynamicPage-parameters.css";
@import "../base/DynamicPageTitle-parameters.css";
@import "./DynamicPageTitle-parameters.css";
@import "../base/DynamicPageHeader-parameters.css";
@import "../base/Bar-parameters.css";
@import "./FlexibleColumnLayout-parameters.css";
Expand Down
6 changes: 6 additions & 0 deletions packages/fiori/src/themes/sap_fiori_3_hcw/DynamicPageTitle-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@import "../sap_fiori_3/DynamicPageTitle-parameters.css";

:root {
--_ui5_dynamic_page_title_border: 0.0625rem solid transparent;
--_ui5_dynamic_page_title_hover_border: 0.0625rem solid var(--sapObjectHeader_BorderColor);
}
Loading