diff --git a/packages/ketchup/src/assets/image-list.js b/packages/ketchup/src/assets/image-list.js index 3706b140cb..045f79b203 100644 --- a/packages/ketchup/src/assets/image-list.js +++ b/packages/ketchup/src/assets/image-list.js @@ -677,6 +677,336 @@ const data = [ value: 'Guides', visible: true, }, + { + children: [ + { + cells: { + ROUTE: { + value: 'customization', + }, + }, + icon: 'style', + value: 'Style customization', + visible: true, + }, + ], + expandable: true, + icon: 'https://dfstudio-d420.kxcdn.com/wordpress/wp-content/uploads/2019/06/digital_camera_photo-1080x675.jpg', + isExpanded: false, + value: 'Guides', + visible: true, + }, + { + children: [ + { + cells: { + ROUTE: { + value: 'customization', + }, + }, + icon: 'style', + value: 'Style customization', + visible: true, + }, + ], + expandable: true, + icon: 'https://dfstudio-d420.kxcdn.com/wordpress/wp-content/uploads/2019/06/digital_camera_photo-1080x675.jpg', + isExpanded: false, + value: 'Guides', + visible: true, + badgeData: [ + { + imageData: { + resource: + 'https://ketchup.smeup.com/ketchup-showcase/header_logo_dark.svg', + sizeX: '1.75rem', + sizeY: 'auto', + color: 'var(--kup-text-on-primary-color)', + }, + position: 'BL', + }, + ], + }, + { + children: [ + { + cells: { + ROUTE: { + value: 'customization', + }, + }, + icon: 'style', + value: 'Style customization', + visible: true, + }, + ], + expandable: true, + icon: 'https://dfstudio-d420.kxcdn.com/wordpress/wp-content/uploads/2019/06/digital_camera_photo-1080x675.jpg', + isExpanded: false, + value: 'Guides', + visible: true, + }, + { + children: [ + { + cells: { + ROUTE: { + value: 'customization', + }, + }, + icon: 'style', + value: 'Style customization', + visible: true, + }, + ], + expandable: true, + icon: 'https://dfstudio-d420.kxcdn.com/wordpress/wp-content/uploads/2019/06/digital_camera_photo-1080x675.jpg', + isExpanded: false, + value: 'Guides', + visible: true, + badgeData: [ + { + imageData: { + resource: + 'https://ketchup.smeup.com/ketchup-showcase/header_logo_dark.svg', + sizeX: '1.75rem', + sizeY: 'auto', + color: 'var(--kup-text-on-primary-color)', + }, + position: 'BL', + }, + ], + }, + { + children: [ + { + cells: { + ROUTE: { + value: 'customization', + }, + }, + icon: 'style', + value: 'Style customization', + visible: true, + }, + ], + expandable: true, + icon: 'https://dfstudio-d420.kxcdn.com/wordpress/wp-content/uploads/2019/06/digital_camera_photo-1080x675.jpg', + isExpanded: false, + value: 'Guides', + visible: true, + }, + { + children: [ + { + cells: { + ROUTE: { + value: 'customization', + }, + }, + icon: 'style', + value: 'Style customization', + visible: true, + }, + ], + expandable: true, + icon: 'https://dfstudio-d420.kxcdn.com/wordpress/wp-content/uploads/2019/06/digital_camera_photo-1080x675.jpg', + isExpanded: false, + value: 'Guides', + visible: true, + }, + { + children: [ + { + cells: { + ROUTE: { + value: 'customization', + }, + }, + icon: 'style', + value: 'Style customization', + visible: true, + }, + ], + expandable: true, + icon: 'https://c8.alamy.com/compit/f4j1rh/verticale-di-tronchi-di-alberi-di-boschi-guardando-verso-l-alto-da-terra-con-il-sole-che-splende-attraverso-foglie-f4j1rh.jpg', + isExpanded: false, + value: 'Guides', + visible: true, + }, + { + cells: { + ROUTE: { + value: 'accordion', + }, + }, + icon: 'view-sequential', + value: 'Accordion', + visible: true, + }, + { + cells: { + ROUTE: { + value: 'accordion', + }, + }, + icon: 'view-sequential', + value: 'Accordion', + visible: true, + }, + { + cells: { + ROUTE: { + value: 'accordion', + }, + }, + icon: 'view-sequential', + value: 'Accordion', + visible: true, + }, + { + cells: { + ROUTE: { + value: 'accordion', + }, + }, + icon: 'view-sequential', + value: 'Accordion', + visible: true, + }, + { + children: [ + { + cells: { + ROUTE: { + value: 'customization', + }, + }, + icon: 'style', + value: 'Style customization', + visible: true, + }, + ], + expandable: true, + icon: 'https://c8.alamy.com/compit/f4j1rh/verticale-di-tronchi-di-alberi-di-boschi-guardando-verso-l-alto-da-terra-con-il-sole-che-splende-attraverso-foglie-f4j1rh.jpg', + isExpanded: false, + value: 'Guides', + visible: true, + }, + { + children: [ + { + cells: { + ROUTE: { + value: 'customization', + }, + }, + icon: 'style', + value: 'Style customization', + visible: true, + }, + ], + expandable: true, + icon: 'https://c8.alamy.com/compit/f4j1rh/verticale-di-tronchi-di-alberi-di-boschi-guardando-verso-l-alto-da-terra-con-il-sole-che-splende-attraverso-foglie-f4j1rh.jpg', + isExpanded: false, + value: 'Guides', + visible: true, + }, + { + children: [ + { + cells: { + ROUTE: { + value: 'customization', + }, + }, + icon: 'style', + value: 'Style customization', + visible: true, + }, + ], + expandable: true, + icon: 'https://c8.alamy.com/compit/f4j1rh/verticale-di-tronchi-di-alberi-di-boschi-guardando-verso-l-alto-da-terra-con-il-sole-che-splende-attraverso-foglie-f4j1rh.jpg', + isExpanded: false, + value: 'Guides', + visible: true, + }, + { + children: [ + { + cells: { + ROUTE: { + value: 'customization', + }, + }, + icon: 'style', + value: 'Style customization', + visible: true, + }, + ], + expandable: true, + icon: 'https://c8.alamy.com/compit/f4j1rh/verticale-di-tronchi-di-alberi-di-boschi-guardando-verso-l-alto-da-terra-con-il-sole-che-splende-attraverso-foglie-f4j1rh.jpg', + isExpanded: false, + value: 'Guides', + visible: true, + }, + { + children: [ + { + cells: { + ROUTE: { + value: 'customization', + }, + }, + icon: 'style', + value: 'Style customization', + visible: true, + }, + ], + expandable: true, + icon: 'https://c8.alamy.com/compit/f4j1rh/verticale-di-tronchi-di-alberi-di-boschi-guardando-verso-l-alto-da-terra-con-il-sole-che-splende-attraverso-foglie-f4j1rh.jpg', + isExpanded: false, + value: 'Guides', + visible: true, + }, + { + children: [ + { + cells: { + ROUTE: { + value: 'customization', + }, + }, + icon: 'style', + value: 'Style customization', + visible: true, + }, + ], + expandable: true, + icon: 'https://dfstudio-d420.kxcdn.com/wordpress/wp-content/uploads/2019/06/digital_camera_photo-1080x675.jpg', + isExpanded: false, + value: 'Guides', + visible: true, + }, + { + children: [ + { + cells: { + ROUTE: { + value: 'customization', + }, + }, + icon: 'style', + value: 'Style customization', + visible: true, + }, + ], + expandable: true, + icon: 'https://dfstudio-d420.kxcdn.com/wordpress/wp-content/uploads/2019/06/digital_camera_photo-1080x675.jpg', + isExpanded: false, + value: 'Guides', + visible: true, + }, { children: [ { diff --git a/packages/ketchup/src/components/kup-badge/styles/kup-badge-classes.scss b/packages/ketchup/src/components/kup-badge/styles/kup-badge-classes.scss index 7b48b05dad..98b7b37ff3 100644 --- a/packages/ketchup/src/components/kup-badge/styles/kup-badge-classes.scss +++ b/packages/ketchup/src/components/kup-badge/styles/kup-badge-classes.scss @@ -10,14 +10,6 @@ transform: translate(-15%, 15%); } -:host(.#{$kup-class-top-left}) { - top: 0; - left: 0; - bottom: unset; - right: unset; - transform: translate(15%, 15%); -} - :host(.#{$kup-class-bottom-right}) { top: unset; right: 0; diff --git a/packages/ketchup/src/components/kup-image-list/kup-image-list.tsx b/packages/ketchup/src/components/kup-image-list/kup-image-list.tsx index cb0a4c18aa..85a2513a26 100644 --- a/packages/ketchup/src/components/kup-image-list/kup-image-list.tsx +++ b/packages/ketchup/src/components/kup-image-list/kup-image-list.tsx @@ -259,8 +259,15 @@ export class KupImageList { wrapperClass: 'image-list__image', badgeData: node.badgeData, }; + const image = ; const label =
{node.value}
; + + const hasExternalResource = + props.resource.indexOf('.') > -1 || + props.resource.indexOf('/') > -1 || + props.resource.indexOf('\\') > -1; + return ( -
- +
+ {!hasExternalResource && ( + + )} {image} {label}
diff --git a/packages/ketchup/src/components/kup-image-list/styles/kup-image-list-main.scss b/packages/ketchup/src/components/kup-image-list/styles/kup-image-list-main.scss index 2302b4de01..8d6fd0e507 100644 --- a/packages/ketchup/src/components/kup-image-list/styles/kup-image-list-main.scss +++ b/packages/ketchup/src/components/kup-image-list/styles/kup-image-list-main.scss @@ -138,6 +138,17 @@ box-sizing: border-box; position: relative; } + .f-cell__content .image-list__wrapper.images{ + height: 100%; + justify-content: flex-end; + + .f-image{ + position: unset; + overflow: auto; + height: 100%; + display: flex; + } + } } &__item { @@ -177,6 +188,7 @@ } } + @media screen and (min-width: 678px) { :host { --kup_imagelist_columns: var(--kup-imagelist-columns, 8); diff --git a/packages/ketchup/src/f-components/f-image/f-image.tsx b/packages/ketchup/src/f-components/f-image/f-image.tsx index 596f130ec1..cd93272629 100644 --- a/packages/ketchup/src/f-components/f-image/f-image.tsx +++ b/packages/ketchup/src/f-components/f-image/f-image.tsx @@ -74,9 +74,7 @@ function createIcon(props: FImageProps): HTMLDivElement { 'f-image__icon': true, }; const style: GenericObject = { - background: props.color - ? props.color - : `var(${KupThemeColorValues.ICON})`, + background: props.color ? props.color : `var(--kup-gray-color-70)`, }; if (props.resource.indexOf('--kup') > -1) { let themeIcon: string = props.resource.replace('--', '');