Skip to content

Commit b04f36c

Browse files
ByPortrandrianov
authored andcommitted
feat: add new colors
1 parent 61a065f commit b04f36c

39 files changed

+570
-249
lines changed

src/app/components/blank-layout-card/blank-layout-card.component.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
font-size: 14px;
1212

1313
.mdl-card__blank-layout-card.mdl-card {
14-
width: 450px;
15-
min-height: 500px;
14+
max-width: 450px;
1615
margin: auto;
1716

1817
.mdl-card__supporting-text {

src/app/components/message-menu/message-menu.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<li *ngFor="let item of messages" class="mdl-menu__item mdl-list__item mdl-list__item--two-line list__item--border-top">
1111
<span class="mdl-list__item-primary-content">
1212
<span class="mdl-list__item-avatar"
13-
ngClass="background-color--{{item.color}}">
13+
ngClass="background-color--{{ item.color }}">
1414
<span class="text">{{ item.icon }}</span>
1515
</span>
1616
<span>{{ item.name }}</span>

src/app/components/message-menu/message-menu.component.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
}
66

77
.messages-dropdown {
8+
&.mdl-menu {
9+
width: 310px;
10+
}
11+
812
.label {
913
color: $messages-dropdown-label-text-color;
1014
}

src/app/components/notification-menu/notification-menu.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<li class="mdl-menu__item mdl-list__item list__item--border-top"
1212
*ngFor="let item of notifications">
1313
<span class="mdl-list__item-primary-content">
14-
<span class="mdl-list__item-avatar" ngClass="background-color--{{item.color}}">
14+
<span class="mdl-list__item-avatar" ngClass="background-color--{{ item.color }}">
1515
<i class="material-icons">{{ item.icon }}</i>
1616
</span>
1717
<span>{{ item.text }}</span>

src/app/components/notification-menu/notification-menu.component.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
}
66

77
.notifications-dropdown.mdl-list {
8+
width: 310px;
9+
810
.mdl-list__item {
911
@include typo-dropdown-menu-li;
1012

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1+
@import '~theme/helpers';
2+
13
.mdl-layout .mdl-layout__content {
24
padding: 16px;
35
display: flex;
46
}
7+
8+
// FIXME: responsibility leak
9+
.not-found .mdl-layout__content {
10+
background-image: url('#{$image-path}/404.svg');
11+
}
Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
1-
import { Component } from '@angular/core';
1+
import { Component, HostBinding } from '@angular/core';
2+
import { Router } from '@angular/router';
23

34
@Component({
45
selector: 'app-blank-layout',
56
styleUrls: ['./blank-layout.component.scss'],
67
templateUrl: './blank-layout.component.html',
78
})
8-
export class BlankLayoutComponent { }
9+
export class BlankLayoutComponent {
10+
// FIXME: responsibility leak
11+
@HostBinding('class.not-found') private get notFound() {
12+
return this.router.url === '/pages/404';
13+
}
14+
15+
constructor(
16+
private router: Router,
17+
) { }
18+
}

src/app/pages/dashboard/line-chart/line-chart.component.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@ export class LineChartComponent extends BaseLineChartComponent {
3030
{
3131
values: [],
3232
key: 'Awesome',
33-
color: 'rgb(80, 150, 215)',
33+
color: '#00bcd4',
3434
},
3535
{
3636
values: [],
3737
key: 'Good',
3838
fillOpacity: 0.00001,
3939
area: true,
40-
color: 'rgb(0, 188, 212)',
40+
color: '#ffc107',
4141
},
4242
{
4343
values: [],
4444
key: 'Fail',
45-
color: 'rgb(255, 82, 82)',
45+
color: '#f44336',
4646
},
4747
];
4848
this.rawData = [

src/app/pages/dashboard/pie-chart/pie-chart.component.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ export class PieChartComponent extends BasePieChartComponent implements OnInit {
2323

2424
public ngOnInit() {
2525
const colors = [
26-
'rgba(96, 196, 150, 1)',
27-
'rgba(80, 150, 215, 1)',
28-
'rgba(0, 188, 212, 1)',
29-
'rgba(116, 199, 209, 1)',
30-
'rgba(255, 82, 82, 1)',
31-
'rgba(0, 0, 0, 0)',
26+
'#03a9f4',
27+
'#f44336',
28+
'#ff9800',
29+
'#ffc107',
30+
'#00bcd4',
31+
'',
3232
];
3333

3434
const rawData = this.pieChartService.getDaySchedule();

src/app/pages/dashboard/table-card/table-card.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<td class="mdl-data-table__cell--non-numeric">
1111
<span *ngFor="let resp of item.responsible"
1212
class="label label--mini"
13-
ngClass="background-color--{{resp.color}}">{{ resp.name }}</span>
13+
[ngClass]="resp.color">{{ resp.name }}</span>
1414
</td>
1515
<td class="mdl-data-table__cell--non-numeric">{{ item.email }}</td>
1616
<td class="mdl-data-table__cell--non-numeric">{{ item.deadline }}</td>
@@ -21,6 +21,7 @@
2121
<td class="mdl-data-table__cell--non-numeric task-done"
2222
*ngIf="item.progress >= 100">
2323
<i class="material-icons">done</i>
24+
<span>Complete</span>
2425
</td>
2526
</tr>
2627
</tbody>

0 commit comments

Comments
 (0)