Skip to content

Commit 59b1913

Browse files
Olucas7almeida-erickJaviMiot
authored
Tt 37 show complete descriptions on hover (#846)
* fix: TT-610 Fix pipeline * fix: TT-610 Fix pipeline - CI Time Tracker ui * fix: TT-610 Fix pipeline - read from OS env variable in .ts * feat: TT-37-show-complete-descriptions-on-hover * Refactoring HTML and CSS Code * Refactoring... * feat: delete text-overflow * Final Refactor * Width box correction Co-authored-by: Erick Almeida <[email protected]> Co-authored-by: JaviMiot <[email protected]>
1 parent 07b7778 commit 59b1913

File tree

2 files changed

+54
-20
lines changed

2 files changed

+54
-20
lines changed

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

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<div class="row scroll-table mt-5 ml-0">
2-
<table
3-
class="table table-striped mb-0"
4-
datatable
5-
[dtTrigger]="dtTrigger"
6-
[dtOptions]="dtOptions"
2+
<table class="table table-striped mb-0" datatable [dtTrigger]="dtTrigger" [dtOptions]="dtOptions"
73
*ngIf="(reportDataSource$ | async) as dataSource">
84
<thead class="thead-blue">
95
<tr class="d-flex">
@@ -25,7 +21,7 @@
2521
</thead>
2622
<app-loading-bar *ngIf="dataSource.isLoading"></app-loading-bar>
2723
<tbody *ngIf="!dataSource.isLoading">
28-
<tr class="d-flex" *ngFor="let entry of dataSource.data">
24+
<tr class="d-flex col-height" *ngFor="let entry of dataSource.data">
2925
<td class="hidden-col">{{ entry.id }}</td>
3026
<td class="col md-col">{{ entry.owner_email }}</td>
3127
<td class="col sm-col">
@@ -48,14 +44,14 @@
4844
</a>
4945
</ng-container>
5046
</td>
51-
<td class="col lg-col">{{ entry.description }}</td>
52-
<td class="col lg-col">
47+
<td class="col lg-scroll">{{ entry.description }}</td>
48+
<td class="col lg-scroll">
5349
<ng-container *ngIf="entry.technologies.length > 0">
54-
<div *ngFor="let technology of entry.technologies" class="badge bg-secondary text-wrap">
55-
{{ technology }}
56-
</div>
50+
<div *ngFor="let technology of entry.technologies" class="badge bg-secondary text-wrap">
51+
{{ technology }}
52+
</div>
5753
</ng-container>
58-
</td>
54+
</td>
5955
</tr>
6056
</tbody>
6157
</table>

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

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

13-
.sm-col{
19+
.sm-col {
1420
width: 6em;
1521
max-width: 8em;
1622
}
1723

18-
.md-col{
24+
.md-col {
1925
width: 9em;
2026
}
2127

22-
.lg-col{
28+
.lg-col {
2329
width: 12em;
2430
overflow: hidden;
2531
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+
}
2659
}
27-
.hidden-col{
60+
61+
.lg-scroll {
62+
@include scroll-style;
63+
}
64+
65+
.hidden-col {
2866
display: none;
2967
}
3068

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

0 commit comments

Comments
 (0)