diff --git a/scripts/langindex.json b/scripts/langindex.json index 2d2e2f376..4553ed0ac 100644 --- a/scripts/langindex.json +++ b/scripts/langindex.json @@ -1979,12 +1979,10 @@ "core.minutes": "moodle", "core.misc": "admin", "core.mod_assign": "assign/pluginname", - "core.mod_assignment": "assignment/pluginname", "core.mod_book": "book/pluginname", "core.mod_chat": "chat/pluginname", "core.mod_choice": "choice/pluginname", "core.mod_data": "data/pluginname", - "core.mod_database": "data/pluginname", "core.mod_external-tool": "lti/pluginname", "core.mod_feedback": "feedback/pluginname", "core.mod_file": "moodle/file", @@ -1992,7 +1990,6 @@ "core.mod_forum": "forum/pluginname", "core.mod_glossary": "glossary/pluginname", "core.mod_h5pactivity": "h5pactivity/pluginname", - "core.mod_ims": "imscp/pluginname", "core.mod_imscp": "imscp/pluginname", "core.mod_label": "label/pluginname", "core.mod_lesson": "lesson/pluginname", diff --git a/src/addons/block/timeline/components/events/events.scss b/src/addons/block/timeline/components/events/events.scss index 8ea49fcb1..8be5516b3 100644 --- a/src/addons/block/timeline/components/events/events.scss +++ b/src/addons/block/timeline/components/events/events.scss @@ -19,6 +19,7 @@ h4.core-bold { .addon-block-timeline-activity core-mod-icon { --margin-end: 0.5rem; + --margin-vertical: 0; } .addon-block-timeline-activity-time, diff --git a/src/addons/calendar/calendar-common.scss b/src/addons/calendar/calendar-common.scss index 8fdaaeefe..c12303e90 100644 --- a/src/addons/calendar/calendar-common.scss +++ b/src/addons/calendar/calendar-common.scss @@ -6,11 +6,7 @@ > ion-icon { color: white; border-radius: 50%; - padding: 6px; - } - - > core-mod-icon { - padding: 6px; + padding: 0.7rem; } &.addon-calendar-eventtype-category > ion-icon { @@ -30,4 +26,4 @@ } } -} \ No newline at end of file +} diff --git a/src/addons/calendar/components/calendar/addon-calendar-calendar.html b/src/addons/calendar/components/calendar/addon-calendar-calendar.html index ca1e7dc08..9d072a910 100644 --- a/src/addons/calendar/components/calendar/addon-calendar-calendar.html +++ b/src/addons/calendar/components/calendar/addon-calendar-calendar.html @@ -81,13 +81,10 @@ {{ event.timestart * 1000 | coreFormatDate: timeFormat }} - - {{ 'addon.calendar.type' + event.formattedType | translate }} - + {{ event.iconTitle }} diff --git a/src/addons/calendar/components/calendar/calendar.scss b/src/addons/calendar/components/calendar/calendar.scss index 24e0c2e99..f293233fc 100644 --- a/src/addons/calendar/components/calendar/calendar.scss +++ b/src/addons/calendar/components/calendar/calendar.scss @@ -148,17 +148,6 @@ } } - core-mod-icon { - margin-right: 1px; - margin-left: 1px; - --size: 16px; - display: inline-block; - vertical-align: bottom; - ::ng-deep img { - display: block; - } - } - ion-slide { display: block; font-size: inherit; diff --git a/src/addons/calendar/pages/day/day.html b/src/addons/calendar/pages/day/day.html index 01a7daceb..62939f984 100644 --- a/src/addons/calendar/pages/day/day.html +++ b/src/addons/calendar/pages/day/day.html @@ -68,7 +68,7 @@ (click)="gotoEvent(event.id)" [class.item-dimmed]="event.ispast" [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" button detail="true"> + [modname]="event.modulename" [componentId]="event.instance">