diff --git a/packages/fiori/test/pages/FCL.html b/packages/fiori/test/pages/FCL.html index c103e3e04710..bd4d8b4d7549 100644 --- a/packages/fiori/test/pages/FCL.html +++ b/packages/fiori/test/pages/FCL.html @@ -526,26 +526,26 @@

- 10 inch Portable DVD + 10 inch Portable DVD - 7 inch Widescreen + 7 inch Widescreen Portable DVD Player w MP3 - Astro Laptop 1516 + Astro Laptop 1516 - Astro Phone 6 - Audio/Video Cable Kit - 4m + Astro Phone 6 + Audio/Video Cable Kit - 4m - Beam Breaker B-1 - Beam Breaker B-2 - Beam Breaker B-3 - Beam Breaker B-4 + Beam Breaker B-1 + Beam Breaker B-2 + Beam Breaker B-3 + Beam Breaker B-4 - Camcorder View - Benda Laptop 1408 + Camcorder View + Benda Laptop 1408 - Cepat Tablet 10.5 + Cepat Tablet 10.5 - Gladiator MX + Gladiator MX diff --git a/packages/fiori/test/pages/ShellBar.html b/packages/fiori/test/pages/ShellBar.html index aa921672537c..62323e3573e4 100644 --- a/packages/fiori/test/pages/ShellBar.html +++ b/packages/fiori/test/pages/ShellBar.html @@ -189,20 +189,20 @@

ShellBar in Compact

Instructions
- 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 diff --git a/packages/fiori/test/samples/FlexibleColumnLayout.sample.html b/packages/fiori/test/samples/FlexibleColumnLayout.sample.html index 84afce5bc3ab..9d2e917fd711 100644 --- a/packages/fiori/test/samples/FlexibleColumnLayout.sample.html +++ b/packages/fiori/test/samples/FlexibleColumnLayout.sample.html @@ -61,19 +61,19 @@

FlexibleColumnLayout - One Initial Column



- 10 inch Portable DVD - 7 inch WidescreenPortable DVD Player w MP3 - Astro Laptop 1516 - Astro Phone 6 - Audio/Video Cable Kit - 4m - Beam Breaker B-1 - Beam Breaker B-2 - Beam Breaker B-3 - Beam Breaker B-4 - Camcorder View - Benda Laptop 1408 - Cepat Tablet 10.5 - Gladiator MX + 10 inch Portable DVD + 7 inch WidescreenPortable DVD Player w MP3 + Astro Laptop 1516 + Astro Phone 6 + Audio/Video Cable Kit - 4m + Beam Breaker B-1 + Beam Breaker B-2 + Beam Breaker B-3 + Beam Breaker B-4 + Camcorder View + Benda Laptop 1408 + Cepat Tablet 10.5 + Gladiator MX diff --git a/packages/main/src/AvatarGroup.hbs b/packages/main/src/AvatarGroup.hbs index eebd624cec4f..722994b23d5c 100644 --- a/packages/main/src/AvatarGroup.hbs +++ b/packages/main/src/AvatarGroup.hbs @@ -1,9 +1,9 @@
-
{{else}} - diff --git a/packages/main/src/MultiComboBoxPopover.hbs b/packages/main/src/MultiComboBoxPopover.hbs index baa7c4086f60..6df14ddb148d 100644 --- a/packages/main/src/MultiComboBoxPopover.hbs +++ b/packages/main/src/MultiComboBoxPopover.hbs @@ -69,7 +69,7 @@ {{#each _filteredItems}} {{description}} - {{#if info}} - {{info}} + {{#if additionalText}} + {{additionalText}} {{/if}}
{{/if}} @@ -17,8 +17,8 @@ {{/unless}}
{{#unless description}} - {{#if info}} - {{info}} + {{#if additionalText}} + {{additionalText}} {{/if}} {{/unless}} {{/inline}} diff --git a/packages/main/src/StandardListItem.js b/packages/main/src/StandardListItem.js index 3cd2b178ead0..87b0ea54b523 100644 --- a/packages/main/src/StandardListItem.js +++ b/packages/main/src/StandardListItem.js @@ -62,25 +62,25 @@ const metadata = { }, /** - * Defines the info, displayed in the end of the list item. + * Defines the additionalText, displayed in the end of the list item. * @type {string} * @public - * @since 0.13.0 + * @since 1.0.0-rc.15 */ - info: { + additionalText: { type: String, }, /** - * Defines the state of the info. + * Defines the state of the additionalText. *
* Available options are: "None" (by default), "Success", "Warning", "Information" and "Erorr". * @type {ValueState} * @defaultvalue "None" * @public - * @since 0.13.0 + * @since 1.0.0-rc.15 */ - infoState: { + additionalTextState: { type: ValueState, defaultValue: ValueState.None, }, @@ -126,7 +126,7 @@ const metadata = { * * diff --git a/packages/main/src/SuggestionItem.js b/packages/main/src/SuggestionItem.js index c731c1f3d9ca..5c9ed2e0e009 100644 --- a/packages/main/src/SuggestionItem.js +++ b/packages/main/src/SuggestionItem.js @@ -89,23 +89,25 @@ const metadata = { }, /** - * Defines the info, displayed in the end of the item. + * Defines the additionalText, displayed in the end of the item. * @type {string} + * @since 1.0.0-rc.15 * @public */ - info: { + additionalText: { type: String, }, /** - * Defines the state of the info. + * Defines the state of the additionalText. *

* Available options are: "None" (by default), "Success", "Warning" and "Erorr". * @type {ValueState} * @defaultvalue "None" + * @since 1.0.0-rc.15 * @public */ - infoState: { + additionalTextState: { type: ValueState, defaultValue: ValueState.None, }, diff --git a/packages/main/src/SuggestionListItem.hbs b/packages/main/src/SuggestionListItem.hbs index 3f19b140ea91..2e461ba36691 100644 --- a/packages/main/src/SuggestionListItem.hbs +++ b/packages/main/src/SuggestionListItem.hbs @@ -16,7 +16,7 @@ {{#if info}} - {{info}} + {{info}} {{/if}} {{/if}} @@ -26,7 +26,7 @@ {{#unless hasDescription}} {{#if info}} - {{info}} + {{info}} {{/if}} {{/unless}} {{/inline}} diff --git a/packages/main/src/Tree.hbs b/packages/main/src/Tree.hbs index b8076eca7da5..3fbfcf5fb836 100644 --- a/packages/main/src/Tree.hbs +++ b/packages/main/src/Tree.hbs @@ -15,8 +15,8 @@ type="Active" level="{{this.level}}" icon="{{this.treeItem.icon}}" - info="{{this.treeItem.info}}" - info-state="{{this.treeItem.infoState}}" + additional-text="{{this.treeItem.additionalText}}" + additional-text-state="{{this.treeItem.additionalTextState}}" ?_toggle-button-end="{{ ../_toggleButtonEnd}}" ?_minimal="{{../_minimal}}" .treeItem="{{this.treeItem}}" diff --git a/packages/main/src/TreeItem.js b/packages/main/src/TreeItem.js index 0f70027b42b0..67a0813824fd 100644 --- a/packages/main/src/TreeItem.js +++ b/packages/main/src/TreeItem.js @@ -69,25 +69,25 @@ const metadata = { }, /** - * Defines the info, displayed in the end of the tree item. + * Defines the additionalText, displayed in the end of the tree item. * @type {string} * @public - * @since 1.0.0-rc.12 + * @since 1.0.0-rc.15 */ - info: { + additionalText: { type: String, }, /** - * Defines the state of the info. + * Defines the state of the additionalText. *
* Available options are: "None" (by default), "Success", "Warning", "Information" and "Erorr". * @type {ValueState} * @defaultvalue "None" * @public - * @since 1.0.0-rc.12 + * @since 1.0.0-rc.15 */ - infoState: { + additionalTextState: { type: ValueState, defaultValue: ValueState.None, }, diff --git a/packages/main/src/TreeListItem.hbs b/packages/main/src/TreeListItem.hbs index e78cfe5d0adb..9ff60f1f147f 100644 --- a/packages/main/src/TreeListItem.hbs +++ b/packages/main/src/TreeListItem.hbs @@ -24,7 +24,7 @@ {{/if}} {{#if info}} - {{info}} + {{info}} {{/if}} {{/inline}} diff --git a/packages/main/src/TreeListItem.js b/packages/main/src/TreeListItem.js index cce6dce4170f..2e02c1f262de 100644 --- a/packages/main/src/TreeListItem.js +++ b/packages/main/src/TreeListItem.js @@ -73,25 +73,25 @@ const metadata = { }, /** - * Defines the info, displayed in the end of the tree item. + * Defines the additionalText, displayed in the end of the tree item. * @type {string} * @public - * @since 1.0.0-rc.12 + * @since 1.0.0-rc.15 */ - info: { + additionalText: { type: String, }, /** - * Defines the state of the info. + * Defines the state of the additionalText. *
* Available options are: "None" (by default), "Success", "Warning", "Information" and "Erorr". * @type {ValueState} * @defaultvalue "None" * @public - * @since 1.0.0-rc.12 + * @since 1.0.0-rc.15 */ - infoState: { + additionalTextState: { type: ValueState, defaultValue: ValueState.None, }, @@ -207,7 +207,7 @@ const metadata = { * The ui5-li-tree exposes the following CSS Shadow Parts: * * diff --git a/packages/main/src/features/InputSuggestions.js b/packages/main/src/features/InputSuggestions.js index 2ccb98d376d9..a9bd909a620a 100644 --- a/packages/main/src/features/InputSuggestions.js +++ b/packages/main/src/features/InputSuggestions.js @@ -64,8 +64,8 @@ class Suggestions { image: suggestion.image || undefined, icon: suggestion.icon || undefined, type: suggestion.type || undefined, - info: suggestion.info || undefined, - infoState: suggestion.infoState, + additionalText: suggestion.additionalText || undefined, + additionalTextState: suggestion.additionalTextState, group: suggestion.group, key: idx, }); diff --git a/packages/main/src/themes/ListItem.css b/packages/main/src/themes/ListItem.css index 322bb2523620..779a15e57dd3 100644 --- a/packages/main/src/themes/ListItem.css +++ b/packages/main/src/themes/ListItem.css @@ -32,27 +32,27 @@ color: var(--sapList_Active_TextColor); } -/* [ui5-li]: title, description, info state */ +/* [ui5-li]: title, description, additionalTextState */ :host([active][actionable]) .ui5-li-title, :host([active][actionable]) .ui5-li-desc, -:host([active][actionable]) .ui5-li-info { +:host([active][actionable]) .ui5-li-additional-text { color: var(--sapList_Active_TextColor); } -/* [ui5-li]: infoState */ -:host([info-state="Warning"]) .ui5-li-info { +/* [ui5-li]: additionalTextState */ +:host([additional-text-state="Warning"]) .ui5-li-additional-text { color: var(--sapCriticalTextColor); } -:host([info-state="Success"]) .ui5-li-info { +:host([additional-text-state="Success"]) .ui5-li-additional-text { color: var(--sapPositiveTextColor); } -:host([info-state="Error"]) .ui5-li-info { +:host([additional-text-state="Error"]) .ui5-li-additional-text { color: var(--sapNegativeTextColor); } -:host([info-state="Information"]) .ui5-li-info { +:host([additional-text-state="Information"]) .ui5-li-additional-text { color: var(--sapInformativeTextColor); } @@ -105,7 +105,7 @@ font-size: var(--_ui5_list_item_title_size); } -.ui5-li-info, +.ui5-li-additional-text, .ui5-li-title, .ui5-li-desc { white-space: nowrap; @@ -118,7 +118,7 @@ font-size: var(--sapFontSize); } -.ui5-li-info { +.ui5-li-additional-text { margin: 0 0.25rem; color: var(--sapNeutralTextColor); font-size: 0.875rem; @@ -127,7 +127,7 @@ max-width: 40%; } -:host([description]) .ui5-li-info { +:host([description]) .ui5-li-additional-text { align-self: flex-end; } @@ -206,7 +206,7 @@ margin: .5rem 0 .5rem 0.75rem; } -[dir="rtl"] .ui5-li-info { +[dir="rtl"] .ui5-li-additional-text { text-align: left; } diff --git a/packages/main/test/pages/Carousel.html b/packages/main/test/pages/Carousel.html index d54814c7657f..8b128abee367 100644 --- a/packages/main/test/pages/Carousel.html +++ b/packages/main/test/pages/Carousel.html @@ -332,15 +332,15 @@ New Items - Voluptate do eu cupidatat + Voluptate do eu cupidatat elit est culpa. Reprehenderit eiusmod voluptate ex est dolor nostrud Lorem Lorem do nisi laborum veniam. Sint do non culpa aute occaecat labore ipsum veniam minim tempor est. Duis pariatur aute culpa irure ad excepteur pariatur culpa culpa ea duis occaecat aute irure. Ipsum velit culpa non exercitation ex laboris deserunt in eu non officia in. Laborum sunt aliqua labore cupidatat sunt labore. - Laptop Lenovo - IPhone 3 + Laptop Lenovo + IPhone 3 diff --git a/packages/main/test/pages/Input.html b/packages/main/test/pages/Input.html index a3772f280113..0ac1006221cc 100644 --- a/packages/main/test/pages/Input.html +++ b/packages/main/test/pages/Input.html @@ -393,9 +393,9 @@

Test Backspace

var suggestion = document.createElement("ui5-suggestion-item"); suggestion.id = item.key; suggestion.icon = "world"; - suggestion.info = "explore"; + suggestion.additionalText = "explore"; suggestion.group = item.text.length === 1; - suggestion.infoState = "Success"; + suggestion.additionalTextState = "Success"; suggestion.description = "travel the world"; suggestion.text = item.text input.appendChild(suggestion); diff --git a/packages/main/test/pages/Input_quickview.html b/packages/main/test/pages/Input_quickview.html index 65cb93376da1..0b19b804d145 100644 --- a/packages/main/test/pages/Input_quickview.html +++ b/packages/main/test/pages/Input_quickview.html @@ -44,9 +44,9 @@

Quick View sample

Audit Log Settings OData API Audit Products - Laptop Lenovo - IPhone 3 - HP Monitor 24 + Laptop Lenovo + IPhone 3 + HP Monitor 24 @@ -88,9 +88,9 @@

Test Quick View sample

Audit Log Settings OData API Audit Products - Laptop Lenovo - IPhone 3 - HP Monitor 24 + Laptop Lenovo + IPhone 3 + HP Monitor 24 diff --git a/packages/main/test/pages/List.html b/packages/main/test/pages/List.html index c972199ea203..e6925eeeeac4 100644 --- a/packages/main/test/pages/List.html +++ b/packages/main/test/pages/List.html @@ -20,14 +20,14 @@ New Items - Voluptate do eu cupidatat elit est culpa. Reprehenderit eiusmod voluptate ex est dolor nostrud Lorem Lorem do nisi laborum veniam. Sint do non culpa aute occaecat labore ipsum veniam minim tempor est. Duis pariatur aute culpa irure ad excepteur pariatur culpa culpa ea duis occaecat aute irure. Ipsum velit culpa non exercitation ex laboris deserunt in eu non officia in. Laborum sunt aliqua labore cupidatat sunt labore. - Laptop Lenovo - IPhone 3 + Voluptate do eu cupidatat elit est culpa. Reprehenderit eiusmod voluptate ex est dolor nostrud Lorem Lorem do nisi laborum veniam. Sint do non culpa aute occaecat labore ipsum veniam minim tempor est. Duis pariatur aute culpa irure ad excepteur pariatur culpa culpa ea duis occaecat aute irure. Ipsum velit culpa non exercitation ex laboris deserunt in eu non officia in. Laborum sunt aliqua labore cupidatat sunt labore. + Laptop Lenovo + IPhone 3 Discounted Items - HP Monitor 24 - Audio cabel - DVD set + HP Monitor 24 + Audio cabel + DVD set Discounted Items HP Monitor 24 @@ -41,14 +41,14 @@

ui5-list

New Items - Voluptate do eu cupidatat elit est culpa. Reprehenderit eiusmod voluptate ex est dolor nostrud Lorem Lorem do nisi laborum veniam. Sint do non culpa aute occaecat labore ipsum veniam minim tempor est. Duis pariatur aute culpa irure ad excepteur pariatur culpa culpa ea duis occaecat aute irure. Ipsum velit culpa non exercitation ex laboris deserunt in eu non officia in. Laborum sunt aliqua labore cupidatat sunt labore. - Laptop Lenovo - IPhone 3 + Voluptate do eu cupidatat elit est culpa. Reprehenderit eiusmod voluptate ex est dolor nostrud Lorem Lorem do nisi laborum veniam. Sint do non culpa aute occaecat labore ipsum veniam minim tempor est. Duis pariatur aute culpa irure ad excepteur pariatur culpa culpa ea duis occaecat aute irure. Ipsum velit culpa non exercitation ex laboris deserunt in eu non officia in. Laborum sunt aliqua labore cupidatat sunt labore. + Laptop Lenovo + IPhone 3 Discounted Items - HP Monitor 24 - Audio cabel - DVD set + HP Monitor 24 + Audio cabel + DVD set Discounted Items HP Monitor 24 @@ -240,16 +240,16 @@

Items 3/3

Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. - Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. - Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. + Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. + Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. - Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. - Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. + Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. + Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. - Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. - Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. + Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. + Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.