Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

myDashboard: date and badges placement (fixes #7432) #7433

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −15
Open

myDashboard: date and badges placement (fixes #7432) #7433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Realign the dashboard items to the left
  • Loading branch information
@Mutugiii
Mutugiii committed Apr 2, 2024
commit b6f97dd4019f6ee27fd41b3cdd52faf3229d2d03
26 changes: 13 additions & 13 deletions src/app/dashboard/dashboard.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ <h1 class="mat-title">{{displayName}}<span class="mat-subheading-2"> - <ng-conta
<planet-role [role]="role"></planet-role><span *ngIf="!last">, </span>
</ng-container></span></h1>
<h1 class="mat-title">{{visits | number}} <ng-container i18n>Visits</ng-container></h1>
</div>
<div class="date">
<p>{{dateNow | date:'longDate'}}</p>
</div>
<div class="badges">
<div *ngFor="let badgeGroup of badgeGroups">
<span *ngFor="let course of badgesCourses[badgeGroup]" class="cursor-pointer" (click)="openCourseView(course)" [matTooltip]="course.doc.courseTitle">
<mat-icon
[ngClass]="{ 'primary-text-color': course.inCertification, 'grey-text-color': !course.inCertification }"
fontSet="fa"
[fontIcon]="badgeIcons[badgeGroup]">
</mat-icon>
</span>
<div class="date">
<p>{{dateNow | date:'longDate'}}</p>
</div>
<div class="badges">
<div *ngFor="let badgeGroup of badgeGroups">
<span *ngFor="let course of badgesCourses[badgeGroup]" class="cursor-pointer" (click)="openCourseView(course)" [matTooltip]="course.doc.courseTitle">
<mat-icon
[ngClass]="{ 'primary-text-color': course.inCertification, 'grey-text-color': !course.inCertification }"
fontSet="fa"
[fontIcon]="badgeIcons[badgeGroup]">
</mat-icon>
</span>
</div>
</div>
</div>
</mat-card>
Expand Down
3 changes: 1 addition & 2 deletions src/app/dashboard/dashboard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ $top-row-height: calc(#{$dashboard-tile-width} + 0.5rem);
}

.date, .badges {
margin: 0.2rem 0;
justify-self: end;
}

Expand All @@ -68,8 +69,6 @@ $top-row-height: calc(#{$dashboard-tile-width} + 0.5rem);
.badges {
grid-area: badge;
width: 100%;
display: flex;
justify-content: flex-end;

& > div {
margin-right: 0.5rem;
Expand Down
Loading