From 17cf89fadafca823fef00b24598dc55559359255 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Tue, 14 Aug 2018 12:48:05 +0200 Subject: [PATCH] MOBILE-2509 grades: Remove padding on grade column name --- src/core/grades/components/course/core-grades-course.html | 4 ++-- src/core/grades/components/course/course.scss | 5 +++++ src/core/grades/providers/helper.ts | 6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/core/grades/components/course/core-grades-course.html b/src/core/grades/components/course/core-grades-course.html index 25798e609..fcfe59d9b 100644 --- a/src/core/grades/components/course/core-grades-course.html +++ b/src/core/grades/components/course/core-grades-course.html @@ -19,8 +19,8 @@ - - + + diff --git a/src/core/grades/components/course/course.scss b/src/core/grades/components/course/course.scss index a04232fb8..2559d03e2 100644 --- a/src/core/grades/components/course/course.scss +++ b/src/core/grades/components/course/course.scss @@ -32,6 +32,11 @@ core-grades-course { .core-grades-table-gradeitem { padding-left: 5px; font-weight: bold; + + &.column-itemname { + padding-left: 0; + } + img { width: 16px; height: 16px; diff --git a/src/core/grades/providers/helper.ts b/src/core/grades/providers/helper.ts index c7c7a62a1..cea9bc9dd 100644 --- a/src/core/grades/providers/helper.ts +++ b/src/core/grades/providers/helper.ts @@ -426,13 +426,13 @@ export class CoreGradesHelperProvider { row['image'] = 'assets/img/grades/agg_sum.png'; } else if (text.indexOf('/outcomes') > -1 || text.indexOf('fa-tasks') > -1) { row['itemtype'] = 'outcome'; - row['image'] = 'assets/img/grades/outcomes.png'; + row['icon'] = 'fa-tasks'; } else if (text.indexOf('i/folder') > -1 || text.indexOf('fa-folder') > -1) { row['itemtype'] = 'category'; - row['icon'] = 'folder'; + row['icon'] = 'fa-folder'; } else if (text.indexOf('/manual_item') > -1 || text.indexOf('fa-square-o') > -1) { row['itemtype'] = 'manual'; - row['icon'] = 'square-outline'; + row['icon'] = 'fa-square-o'; } else if (text.indexOf('/mod/') > -1) { const module = text.match(/mod\/([^\/]*)\//); if (typeof module[1] != 'undefined') {