diff --git a/packages/fiori/src/IllustratedMessage.hbs b/packages/fiori/src/IllustratedMessage.hbs index d117dced4ac8..f586f6fdb3bf 100644 --- a/packages/fiori/src/IllustratedMessage.hbs +++ b/packages/fiori/src/IllustratedMessage.hbs @@ -9,7 +9,7 @@ {{#if hasFormattedTitle}} {{else}} - {{effectiveTitleText}} + {{effectiveTitleText}} {{/if}} {{/if}} diff --git a/packages/fiori/src/UploadCollection.hbs b/packages/fiori/src/UploadCollection.hbs index 4584c4355881..2b8e17d66849 100644 --- a/packages/fiori/src/UploadCollection.hbs +++ b/packages/fiori/src/UploadCollection.hbs @@ -17,8 +17,8 @@ {{#if _showNoData}}
- {{_noDataText}} - {{_noDataDescription}} + {{_noDataText}} + {{_noDataDescription}}
{{/if}} diff --git a/packages/fiori/src/ViewSettingsDialog.hbs b/packages/fiori/src/ViewSettingsDialog.hbs index cf78a800049b..c74d1c8259aa 100644 --- a/packages/fiori/src/ViewSettingsDialog.hbs +++ b/packages/fiori/src/ViewSettingsDialog.hbs @@ -16,7 +16,7 @@ @click="{{_navigateToFilters}}" > {{/if}} - {{_title}} + {{_title}}

- "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore + "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in @@ -291,7 +291,7 @@

- "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore + "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in @@ -299,7 +299,7 @@

- "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore + "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in diff --git a/packages/fiori/test/pages/FCL.html b/packages/fiori/test/pages/FCL.html index 88c4a75396ff..b89521bba59c 100644 --- a/packages/fiori/test/pages/FCL.html +++ b/packages/fiori/test/pages/FCL.html @@ -55,7 +55,7 @@ The Wizard control is supposed to break down large tasks, into smaller steps, easier for the user to work with.
- Sed fermentum, mi et tristique ullamcorper, sapien sapien faucibus sem, quis pretium nibh lorem malesuada diam. Nulla quis arcu aliquet, feugiat massa semper, volutpat diam. Nam vitae ante posuere, molestie neque sit amet, dapibus velit. Maecenas eleifend tempor lorem. Mauris vitae elementum mi, sed eleifend ligula. Nulla tempor vulputate dolor, nec dignissim quam convallis ut. Praesent vitae commodo felis, ut iaculis felis. Fusce quis eleifend sapien, eget facilisis nibh. Suspendisse est velit, scelerisque ut commodo eget, dignissim quis metus. Cras faucibus consequat gravida. Curabitur vitae quam felis. Phasellus ac leo eleifend, commodo tortor et, varius quam. Aliquam erat volutpat. + Sed fermentum, mi et tristique ullamcorper, sapien sapien faucibus sem, quis pretium nibh lorem malesuada diam. Nulla quis arcu aliquet, feugiat massa semper, volutpat diam. Nam vitae ante posuere, molestie neque sit amet, dapibus velit. Maecenas eleifend tempor lorem. Mauris vitae elementum mi, sed eleifend ligula. Nulla tempor vulputate dolor, nec dignissim quam convallis ut. Praesent vitae commodo felis, ut iaculis felis. Fusce quis eleifend sapien, eget facilisis nibh. Suspendisse est velit, scelerisque ut commodo eget, dignissim quis metus. Cras faucibus consequat gravida. Curabitur vitae quam felis. Phasellus ac leo eleifend, commodo tortor et, varius quam. Aliquam erat volutpat. Open Wizard Dialog

@@ -644,7 +644,7 @@

- "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore + "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in @@ -652,7 +652,7 @@

- "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore + "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in @@ -660,7 +660,7 @@

- "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore + "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in diff --git a/packages/main/src/ColorPalettePopover.hbs b/packages/main/src/ColorPalettePopover.hbs index 8a3f589b66b8..3e393a75aa6b 100644 --- a/packages/main/src/ColorPalettePopover.hbs +++ b/packages/main/src/ColorPalettePopover.hbs @@ -9,6 +9,7 @@

{{_colorPaletteTitle}}
diff --git a/packages/main/src/ResponsivePopover.hbs b/packages/main/src/ResponsivePopover.hbs index dc12efb5261a..02c092f75ebb 100644 --- a/packages/main/src/ResponsivePopover.hbs +++ b/packages/main/src/ResponsivePopover.hbs @@ -20,7 +20,13 @@ {{else}}
{{#if headerText }} - {{headerText}} + + {{headerText}} + {{/if}} {{#unless _hideCloseButton}}
- {{morePopoverTitle}} + + {{morePopoverTitle}} +
{{/if}} diff --git a/packages/main/src/themes/Dialog.css b/packages/main/src/themes/Dialog.css index 4cd5b58901fb..3a3e2f397ccf 100644 --- a/packages/main/src/themes/Dialog.css +++ b/packages/main/src/themes/Dialog.css @@ -36,6 +36,10 @@ user-select: text; } +::slotted([slot="header"]) { + max-width: 100%; +} + .ui5-popup-root { display: flex; flex-direction: column; diff --git a/packages/main/src/themes/Title.css b/packages/main/src/themes/Title.css index ccdfada904bf..135814a8f933 100644 --- a/packages/main/src/themes/Title.css +++ b/packages/main/src/themes/Title.css @@ -19,7 +19,6 @@ box-sizing: border-box; overflow: hidden; text-overflow: ellipsis; - white-space: nowrap; max-width: 100%; vertical-align: bottom; -webkit-margin-before: 0; @@ -30,11 +29,19 @@ cursor: inherit; } -:host([wrapping-type="Normal"]) .ui5-title-root, -:host([wrapping-type="Normal"]) ::slotted(*) { +:host { white-space: pre-line; } +:host([wrapping-type="None"]) { + white-space: nowrap; +} + +.ui5-title-root, +:host ::slotted(*) { + white-space: inherit; +} + ::slotted(*) { font-size: inherit; font-family: inherit; diff --git a/packages/main/test/pages/DateTimePicker.html b/packages/main/test/pages/DateTimePicker.html index a860e04c0b10..e6b4dbd8e7b3 100644 --- a/packages/main/test/pages/DateTimePicker.html +++ b/packages/main/test/pages/DateTimePicker.html @@ -19,12 +19,12 @@
- DateTimePicker
+ DateTimePicker
- DateTimePicker format pattern + DateTimePicker format pattern
Default format pattern
- DateTimePicker with no format pattern & min-max dates in ISO format
+ DateTimePicker with no format pattern & min-max dates in ISO format
- Test DateTimePicker change event on submit + Test DateTimePicker change event on submit

@@ -112,7 +112,7 @@
- Test DateTimePicker change event on cancel + Test DateTimePicker change event on cancel

@@ -138,7 +138,7 @@
- DateTimePicker states + DateTimePicker states @@ -149,7 +149,7 @@
- DateTimePicker compact size + DateTimePicker compact size @@ -161,7 +161,7 @@
- DateTimePicker with secondary calendar type + DateTimePicker with secondary calendar type

Wrapping

- Truncated Title Lorem Ipsum Dolor, Sit Amet Consectetur Adipisicing Elit. Numquam, Ab. - Wrapping Title Lorem Ipsum Dolor, Sit Amet Consectetur Adipisicing Elit. Numquam, Ab. + Wrapping Title Lorem Ipsum Dolor, Sit Amet Consectetur Adipisicing Elit. Numquam, Ab. + Truncated Title Lorem Ipsum Dolor, Sit Amet Consectetur Adipisicing Elit. Numquam, Ab.
@@ -47,10 +47,10 @@

Usage With ui5-link

Wrapping With Link

- Truncated With Link (60) Lorem Ipsum Dolor, Sit Amet Consectetur Adipisicing Elit. Numquam, Ab. + Wrapping With Link (60) Lorem Ipsum Dolor, Sit Amet Consectetur Adipisicing Elit. Numquam, Ab. - - Wrapping With Link (61) Lorem Ipsum Dolor, Sit Amet Consectetur Adipisicing Elit. Numquam, Ab. + + Truncated With Link (61) Lorem Ipsum Dolor, Sit Amet Consectetur Adipisicing Elit. Numquam, Ab.
diff --git a/packages/playground/_stories/fiori/FlexibleColumnLayout/FlexibleColumnLayout.stories.ts b/packages/playground/_stories/fiori/FlexibleColumnLayout/FlexibleColumnLayout.stories.ts index 059255c7b7b0..e9a44f741405 100644 --- a/packages/playground/_stories/fiori/FlexibleColumnLayout/FlexibleColumnLayout.stories.ts +++ b/packages/playground/_stories/fiori/FlexibleColumnLayout/FlexibleColumnLayout.stories.ts @@ -471,7 +471,7 @@ Basic.args = { style="padding: 1rem 1rem; background: var(--sapList_Background);" >

- "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris @@ -482,7 +482,7 @@ Basic.args = {

- "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris @@ -493,7 +493,7 @@ Basic.args = {

- "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris diff --git a/packages/website/docs/_samples/fiori/FlexibleColumnLayout/Basic/sample.html b/packages/website/docs/_samples/fiori/FlexibleColumnLayout/Basic/sample.html index 0ccbe241429d..a782174d83c0 100644 --- a/packages/website/docs/_samples/fiori/FlexibleColumnLayout/Basic/sample.html +++ b/packages/website/docs/_samples/fiori/FlexibleColumnLayout/Basic/sample.html @@ -144,7 +144,7 @@

- "Lorem ipsum dolor sit amet, consectetur adipiscing + "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris @@ -155,7 +155,7 @@

- "Lorem ipsum dolor sit amet, consectetur adipiscing + "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris @@ -166,7 +166,7 @@

- "Lorem ipsum dolor sit amet, consectetur adipiscing + "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris