From 6c34dcbd89abeefc70ff985df9f99354213f338d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Wed, 20 Jun 2018 15:26:47 +0200 Subject: [PATCH] MOBILE-2430 mainmenu: Change ionic icon by graduation cap --- src/addon/calendar/pages/event/event.html | 2 +- src/addon/calendar/pages/list/list.html | 2 +- src/addon/calendar/providers/helper.ts | 4 ++-- src/core/courses/providers/mainmenu-handler.ts | 2 +- src/core/mainmenu/pages/menu/menu.scss | 8 +++++++- src/core/sitehome/providers/mainmenu-handler.ts | 2 +- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/addon/calendar/pages/event/event.html b/src/addon/calendar/pages/event/event.html index 7e1087d80..dfa30e593 100644 --- a/src/addon/calendar/pages/event/event.html +++ b/src/addon/calendar/pages/event/event.html @@ -11,7 +11,7 @@ - + diff --git a/src/addon/calendar/pages/list/list.html b/src/addon/calendar/pages/list/list.html index de5065205..04e0d3e8a 100644 --- a/src/addon/calendar/pages/list/list.html +++ b/src/addon/calendar/pages/list/list.html @@ -23,7 +23,7 @@ - +

{{ event.timestart | coreToLocaleString }}

diff --git a/src/addon/calendar/providers/helper.ts b/src/addon/calendar/providers/helper.ts index c1a0a8888..a1a85759d 100644 --- a/src/addon/calendar/providers/helper.ts +++ b/src/addon/calendar/providers/helper.ts @@ -24,11 +24,11 @@ export class AddonCalendarHelperProvider { protected logger; protected EVENTICONS = { - course: 'ionic', + course: 'fa-university', group: 'people', site: 'globe', user: 'person', - category: 'albums' + category: 'fa-cubes' }; constructor(logger: CoreLoggerProvider, private courseProvider: CoreCourseProvider) { diff --git a/src/core/courses/providers/mainmenu-handler.ts b/src/core/courses/providers/mainmenu-handler.ts index 17073d458..aad553987 100644 --- a/src/core/courses/providers/mainmenu-handler.ts +++ b/src/core/courses/providers/mainmenu-handler.ts @@ -61,7 +61,7 @@ export class CoreCoursesMainMenuHandler implements CoreMainMenuHandler { }; } else { return { - icon: 'ionic', + icon: 'fa-graduation-cap', title: 'core.courses.mycourses', page: 'CoreCoursesMyCoursesPage', class: 'core-mycourses-handler' diff --git a/src/core/mainmenu/pages/menu/menu.scss b/src/core/mainmenu/pages/menu/menu.scss index 87c7bcce9..9ccb4fadc 100644 --- a/src/core/mainmenu/pages/menu/menu.scss +++ b/src/core/mainmenu/pages/menu/menu.scss @@ -1,3 +1,9 @@ page-core-mainmenu { - + .ion-md-fa-graduation-cap, + .ion-ios-fa-graduation-cap, + .ion-wp-fa-graduation-cap, + .ion-fa-graduation-cap { + @extend .fa-graduation-cap; + @extend .fa; + } } diff --git a/src/core/sitehome/providers/mainmenu-handler.ts b/src/core/sitehome/providers/mainmenu-handler.ts index 56cd67156..0ebb62738 100644 --- a/src/core/sitehome/providers/mainmenu-handler.ts +++ b/src/core/sitehome/providers/mainmenu-handler.ts @@ -23,7 +23,7 @@ import { CoreCoursesMyOverviewProvider } from '@core/courses/providers/my-overvi @Injectable() export class CoreSiteHomeMainMenuHandler implements CoreMainMenuHandler { name = 'CoreSiteHome'; - priority = 1000; + priority = 1200; isOverviewEnabled: boolean; constructor(private siteHomeProvider: CoreSiteHomeProvider, private myOverviewProvider: CoreCoursesMyOverviewProvider) { }