Merge branch 'MDL-60372-master' of git://github.com/lameze/moodle

moodle · Oct 19, 2017 · 4ee428f · 4ee428f
2 parents ff70811 + 28b77ce
commit 4ee428f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/lib/classes/output/icon_system_fontawesome.php b/lib/classes/output/icon_system_fontawesome.php
@@ -203,8 +203,8 @@ public function get_core_icon_map() {
             'core:i/completion_self' => 'fa-user-o',
             'core:i/dashboard' => 'fa-tachometer',
             'core:i/lock' => 'fa-lock',
-            'core:i/categoryevent' => 'fa-users',
-            'core:i/courseevent' => 'fa-calendar',
+            'core:i/categoryevent' => 'fa-cubes',
+            'core:i/courseevent' => 'fa-university',
             'core:i/db' => 'fa-database',
             'core:i/delete' => 'fa-trash',
             'core:i/down' => 'fa-arrow-down',
@@ -284,7 +284,7 @@ public function get_core_icon_map() {
             'core:i/search' => 'fa-search',
             'core:i/settings' => 'fa-cog',
             'core:i/show' => 'fa-eye-slash',
-            'core:i/siteevent' => 'fa-share-alt',
+            'core:i/siteevent' => 'fa-globe',
             'core:i/star-rating' => 'fa-star',
             'core:i/stats' => 'fa-line-chart',
             'core:i/switch' => 'fa-exchange',

diff --git a/pix/i/categoryevent.png b/pix/i/categoryevent.png
diff --git a/pix/i/categoryevent.svg b/pix/i/categoryevent.svg
diff --git a/pix/i/siteevent.png b/pix/i/siteevent.png
diff --git a/pix/i/siteevent.svg b/pix/i/siteevent.svg