Skip to content

Commit 24ca877

Browse files
authored
Revert "Tt 37 show complete descriptions on hover (#846)"
This reverts commit 59b1913.
1 parent 59b1913 commit 24ca877

File tree

2 files changed

+20
-54
lines changed

2 files changed

+20
-54
lines changed

src/app/modules/reports/components/time-entries-table/time-entries-table.component.html

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<div class="row scroll-table mt-5 ml-0">
2-
<table class="table table-striped mb-0" datatable [dtTrigger]="dtTrigger" [dtOptions]="dtOptions"
2+
<table
3+
class="table table-striped mb-0"
4+
datatable
5+
[dtTrigger]="dtTrigger"
6+
[dtOptions]="dtOptions"
37
*ngIf="(reportDataSource$ | async) as dataSource">
48
<thead class="thead-blue">
59
<tr class="d-flex">
@@ -21,7 +25,7 @@
2125
</thead>
2226
<app-loading-bar *ngIf="dataSource.isLoading"></app-loading-bar>
2327
<tbody *ngIf="!dataSource.isLoading">
24-
<tr class="d-flex col-height" *ngFor="let entry of dataSource.data">
28+
<tr class="d-flex" *ngFor="let entry of dataSource.data">
2529
<td class="hidden-col">{{ entry.id }}</td>
2630
<td class="col md-col">{{ entry.owner_email }}</td>
2731
<td class="col sm-col">
@@ -44,14 +48,14 @@
4448
</a>
4549
</ng-container>
4650
</td>
47-
<td class="col lg-scroll">{{ entry.description }}</td>
48-
<td class="col lg-scroll">
51+
<td class="col lg-col">{{ entry.description }}</td>
52+
<td class="col lg-col">
4953
<ng-container *ngIf="entry.technologies.length > 0">
50-
<div *ngFor="let technology of entry.technologies" class="badge bg-secondary text-wrap">
51-
{{ technology }}
52-
</div>
54+
<div *ngFor="let technology of entry.technologies" class="badge bg-secondary text-wrap">
55+
{{ technology }}
56+
</div>
5357
</ng-container>
54-
</td>
58+
</td>
5559
</tr>
5660
</tbody>
5761
</table>

src/app/modules/reports/components/time-entries-table/time-entries-table.component.scss

Lines changed: 8 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,30 @@
11
@import '../../../../../styles/colors.scss';
2-
3-
.col {
2+
.col{
43
white-space: nowrap;
54
overflow: hidden;
5+
text-overflow: ellipsis;
66
font-size: small;
77
}
8-
9-
.col-height {
10-
min-height: auto;
11-
max-height: 8rem;
12-
}
13-
14-
.x-sm-col {
8+
.x-sm-col{
159
width: 5em;
1610
max-width: 7em;
1711
}
1812

19-
.sm-col {
13+
.sm-col{
2014
width: 6em;
2115
max-width: 8em;
2216
}
2317

24-
.md-col {
18+
.md-col{
2519
width: 9em;
2620
}
2721

28-
.lg-col {
22+
.lg-col{
2923
width: 12em;
3024
overflow: hidden;
3125
white-space: normal;
32-
border: none;
33-
}
34-
35-
@mixin scroll-style {
36-
width: 25em;
37-
overflow: hidden;
38-
white-space: normal;
39-
display: -webkit-box;
40-
-webkit-box-orient: vertical;
41-
margin: 8px 10px 0px 10px;
42-
border: none;
43-
overflow-y: auto;
44-
overflow-wrap: break-word;
45-
46-
&::-webkit-scrollbar {
47-
width: 0.5em;
48-
}
49-
50-
&::-webkit-scrollbar-track {
51-
box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
52-
}
53-
54-
&::-webkit-scrollbar-thumb {
55-
background-color: #7a8486;
56-
outline: 1px solid #7a8486;
57-
border-radius: 0.5em;
58-
}
5926
}
60-
61-
.lg-scroll {
62-
@include scroll-style;
63-
}
64-
65-
.hidden-col {
27+
.hidden-col{
6628
display: none;
6729
}
6830

@@ -132,4 +94,4 @@ table.dataTable thead .sorting_desc {
13294
text-transform: capitalize;
13395
font-style: italic;
13496
cursor: pointer;
135-
}
97+
}

0 commit comments

Comments
 (0)