EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1468 from crazyserver/MOBILE-2509 

MOBILE-2509  grades: Remove padding on grade column name
main
Juan Leyva 2018-08-22 14:00:58 +01:00 committed by GitHub
parent a76a31fb08 17cf89fada
commit cfb58c96f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/grades/components/course/core-grades-course.html
View File

@ -19,8 +19,8 @@
<tr *ngFor="let row of gradesTable.rows" (click)="row.itemtype != 'category' && gotoGrade(row.id)" [class]="row.rowclass">
<td *ngIf="row.itemtype == 'category'" class="core-grades-table-category" [attr.rowspan]="row.rowspan">
</td>
<th class="core-grades-table-gradeitem" [attr.colspan]="row.colspan" [class.core-split-item-selected]="gradeId == row.id">
<ion-icon *ngIf="row.icon" name="{{row.icon}}" item-start></ion-icon>
<th class="core-grades-table-gradeitem" [class.column-itemname]="row.itemtype == 'category'" [attr.colspan]="row.colspan" [class.core-split-item-selected]="gradeId == row.id">
<core-icon *ngIf="row.icon" name="{{row.icon}}" item-start></core-icon>
<img *ngIf="row.image" [src]="row.image" item-start/>
<span [innerHTML]="row.gradeitem"></span>
</th>

5
src/core/grades/components/course/course.scss
View File

@ -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;

6
src/core/grades/providers/helper.ts
View File

@ -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') {