diff --git a/src/components/CMyCardService/CMyCardService.vue b/src/components/CMyCardService/CMyCardService.vue index a0c90518..f98345f2 100644 --- a/src/components/CMyCardService/CMyCardService.vue +++ b/src/components/CMyCardService/CMyCardService.vue @@ -1050,7 +1050,7 @@ > {{ calendarStore.getContribtypeById(reccontr) }} diff --git a/src/components/CMyChipList/CMyChipList.scss b/src/components/CMyChipList/CMyChipList.scss index 425610dc..ff42c23d 100755 --- a/src/components/CMyChipList/CMyChipList.scss +++ b/src/components/CMyChipList/CMyChipList.scss @@ -19,7 +19,7 @@ color: $mainColor; margin-bottom: $s-xs; letter-spacing: 0.02em; - background: linear-gradient(135deg, $mainColor, lighten($mainColor, 12%)); + background: linear-gradient(135deg, $mainColor, color.adjust($mainColor, $lightness: 12%)); -webkit-background-clip: text; -webkit-text-fill-color: transparent; background-clip: text; diff --git a/src/components/CMyRecCard/CMyRecCard.scss b/src/components/CMyRecCard/CMyRecCard.scss index 68a35572..c81975c8 100755 --- a/src/components/CMyRecCard/CMyRecCard.scss +++ b/src/components/CMyRecCard/CMyRecCard.scss @@ -438,7 +438,8 @@ color: rgba(44, 62, 80, 0.7); // Grigio bluastro più caldo del grigio puro font-size: 0.85rem; display: flex; - text-align: right; + margin-left: auto; + flex-flow: wrap; gap: 4px; i { @@ -446,6 +447,18 @@ } } +.cities-contrib-row { + display: flex; + align-items: flex-end; + justify-content: space-between; + gap: 8px; + flex-wrap: wrap; + + @media (max-width: $mobile-breakpoint) { + gap: 6px; + } +} + // ======================================== // ACTIONS SECTION // ======================================== diff --git a/src/components/CMyRecCard/CMyRecCard.vue b/src/components/CMyRecCard/CMyRecCard.vue index 9b97847b..e209e28d 100755 --- a/src/components/CMyRecCard/CMyRecCard.vue +++ b/src/components/CMyRecCard/CMyRecCard.vue @@ -230,7 +230,11 @@
@@ -311,17 +315,35 @@ {{ t('event.attend') }} - - - + +
- , {{ rec.comune }} ({{ rec.prov }}) - + + + {{ calendarStore.getContribtypeById(reccontr) }} + +
+
+ + , {{ rec.comune }} ({{ rec.prov }}) + +
@@ -405,7 +427,6 @@
- mycontr._id === id) return (ctrec && ctrec.color) ? ctrec.color : 'green' + }, + getIconByContribType: (mystate: ICalendarState) => (id: string) => { + const ctrec = mystate.contribtype.find((mycontr) => mycontr._id === id) + return (ctrec && ctrec.icon) ? ctrec.icon : '' + }, getContribtypeRecByLabel: (mystate: ICalendarState) => (label: string) => { const ctrec = mystate.contribtype.find((mycontr) => mycontr.label === label) diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index 899f5e20..a36b8cad 100755 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -4692,6 +4692,8 @@ export const colTableProducts = [ const colcontribtype = [ AddCol({ name: '_id', label_trans: 'others.value' }), AddCol({ name: 'label', label_trans: 'proj.longdescr' }), + AddCol({ name: 'icon', label_trans: 'proj.icon' }), + AddCol({ name: 'color', label_trans: 'event.color' }), AddCol({ name: 'showprice', label_trans: 'event.showprice',