Skip to content
This repository was archived by the owner on Feb 10, 2021. It is now read-only.

Commit 9dd319f

Browse files
committed
status-list: update styling, adding selected and hover states
1 parent 8b4a1f5 commit 9dd319f

File tree

9 files changed

+80
-101
lines changed

9 files changed

+80
-101
lines changed

src/app/charts/chart-item/chart-item.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
color: #303030;
1111
}
1212
.selected a {
13-
color: #000000;
13+
color: #303030;
1414
text-decoration: none;
1515
}
1616

src/app/lists/device-list/device-list.component.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
</ng-container>
1010
<ng-container matColumnDef="expandedDetail">
1111
<td mat-cell *matCellDef="let device" [attr.colspan]="displayedColumns.length">
12-
<div class="device-detail" [@detailExpand]="device == expandedDevice ? 'expanded' : 'collapsed'">
13-
<div class="device-folders">
12+
<div class="table-detail" [@detailExpand]="device == expandedDevice ? 'expanded' : 'collapsed'">
13+
<div class="detail-items">
1414
<span>Folders: </span>
15-
<span class="folder-name" *ngFor="let folder of device.folders">{{folder.label | trim}}</span>
15+
<span class="item-name" *ngFor="let folder of device.folders">{{folder.label | trim}}</span>
1616
</div>
1717
</div>
1818
</td>
1919
</ng-container>
2020

2121
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
22-
<tr mat-row *matRowDef="let device; columns: displayedColumns;" class="device-row"
22+
<tr mat-row *matRowDef="let device; columns: displayedColumns;" class="table-row"
2323
[class.expanded-row]="expandedDevice === device"
2424
(click)="expandedDevice = expandedDevice === device ? null : device">
2525
</tr>

src/app/lists/device-list/device-list.component.scss

Lines changed: 0 additions & 44 deletions
This file was deleted.

src/app/lists/device-list/device-list.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { trigger, state, style, transition, animate } from '@angular/animations'
1414
@Component({
1515
selector: 'app-device-list',
1616
templateUrl: './device-list.component.html',
17-
styleUrls: ['./device-list.component.scss'],
17+
styleUrls: ['../status-list/status-list.component.scss'],
1818
animations: [
1919
trigger('detailExpand', [
2020
state('collapsed', style({ height: '0px', minHeight: '0' })),

src/app/lists/folder-list/folder-list.component.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
<!-- Expanded Content Column - The detail row is made up of this one column that spans across all columns -->
1111
<ng-container matColumnDef="expandedDetail">
1212
<td mat-cell *matCellDef="let folder" [attr.colspan]="displayedColumns.length">
13-
<div class="folder-detail" [@detailExpand]="folder == expandedFolder ? 'expanded' : 'collapsed'">
14-
<div class="folder-devices">
13+
<div class="table-detail" [@detailExpand]="folder == expandedFolder ? 'expanded' : 'collapsed'">
14+
<div class="detail-items">
1515
<span>Shared with: </span>
16-
<span class="device-name" *ngFor="let device of folder.devices">{{device.name}}</span>
16+
<span class="item-name" *ngFor="let device of folder.devices">{{device.name}}</span>
1717
</div>
1818
</div>
1919
</td>
2020
</ng-container>
2121

2222
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
23-
<tr mat-row *matRowDef="let folder; columns: displayedColumns;" class="folder-row"
24-
[class.example-expanded-row]="expandedFolder === folder"
23+
<tr mat-row *matRowDef="let folder; columns: displayedColumns;" class="table-row"
24+
[class.expanded-row]="expandedFolder === folder"
2525
(click)="expandedFolder = expandedFolder === folder ? null : folder">
2626
</tr>
2727
<tr mat-row *matRowDef="let row; columns: ['expandedDetail']" class="detail-row"></tr>

src/app/lists/folder-list/folder-list.component.scss

Lines changed: 0 additions & 44 deletions
This file was deleted.

src/app/lists/folder-list/folder-list.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { trigger, state, style, transition, animate } from '@angular/animations'
1414
@Component({
1515
selector: 'app-folder-list',
1616
templateUrl: './folder-list.component.html',
17-
styleUrls: ['./folder-list.component.scss'],
17+
styleUrls: ['../status-list/status-list.component.scss'],
1818
animations: [
1919
trigger('detailExpand', [
2020
state('collapsed', style({ height: '0px', minHeight: '0' })),
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,70 @@
11
.status-list .tui-card-toggle {
22
padding: 16px 16px 0 16px;
3+
}
4+
5+
.full-width-table {
6+
width: 100%;
7+
}
8+
9+
.mat-form-field {
10+
font-size: 14px;
11+
width: 100%;
12+
}
13+
14+
tr.detail-row {
15+
height: 0;
16+
}
17+
18+
tr.table-row:not(.expanded-row):hover {
19+
background: whitesmoke;
20+
color: #303030;
21+
}
22+
23+
tr.table-row:not(.expanded-row):active {
24+
background: #DDDDDD;
25+
color: #303030;
26+
}
27+
28+
.expanded-row {
29+
background: #DDDDDD;
30+
color: #303030;
31+
}
32+
33+
.table-row td {
34+
border-bottom-width: 0;
35+
}
36+
37+
.table-detail {
38+
overflow: hidden;
39+
display: flex;
40+
}
41+
42+
.detail-items {
43+
padding: 16px;
44+
}
45+
46+
// Hide empty name
47+
.item-name:empty {
48+
display: none;
49+
}
50+
51+
.item-name:not(:last-child):after {
52+
content: ", ";
53+
}
54+
55+
@media (prefers-color-scheme: dark) {
56+
tr.table-row:not(.expanded-row):hover {
57+
background: #212121;
58+
color: white;
59+
}
60+
61+
tr.table-row:not(.expanded-row):active {
62+
background: #212121;
63+
color: white;
64+
}
65+
66+
.expanded-row {
67+
background: #212121;
68+
color: white;
69+
}
370
}

src/styles.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
@import '~@angular/material/theming';
44
@import './app/card/card.component.scss';
55
@import './app/charts/chart-item/chart-item.component.scss';
6+
@import './app/lists/status-list/status-list.component.scss';
67

78

89
// Custom typography
@@ -81,7 +82,6 @@ $tech-ui-dark-theme: mat-dark-theme($tech-ui-primary, $tech-ui-accent, $tech-ui-
8182
@include angular-material-theme($tech-ui-theme);
8283
@include tui-card-theme($tech-ui-theme);
8384
@include chart-item-theme($tech-ui-theme);
84-
8585

8686
html, body {
8787
height: 100%;

0 commit comments

Comments
 (0)