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

Extend scrolling to firefox #411

Merged
merged 4 commits into from
Nov 15, 2024
Merged

Extend scrolling to firefox #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b0c4db3
Extend scrolling to firefox
minottic Nov 15, 2024
7619bfc
Apply css to table HTML
minottic Nov 15, 2024
3122756
Improve image sizing
minottic Nov 15, 2024
de7796a
Add margin to image
minottic Nov 15, 2024
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
26 changes: 21 additions & 5 deletions scilog/src/app/overview/overview-table/overview-table.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,43 @@
(cdkDropListDropped)="drop($event)" (matSortChange)="onSortChange()">
<ng-container matColumnDef="name">
<th mat-header-cell cdkDrag *matHeaderCellDef mat-sort-header>Title </th>
<td mat-cell *matCellDef="let row"> {{row.name}} </td>
<td mat-cell *matCellDef="let row">
<div class="scrollable-text">
{{row.name}}
</div>
</td>
</ng-container>

<ng-container matColumnDef="description">
<th mat-header-cell cdkDrag *matHeaderCellDef mat-sort-header>Description </th>
<td mat-cell *matCellDef="let row"> {{row.description}} </td>
<td mat-cell *matCellDef="let row">
<div class="scrollable-text">
{{row.description}}
</div>
</td>
</ng-container>

<ng-container matColumnDef="ownerGroup">
<th mat-header-cell cdkDrag *matHeaderCellDef mat-sort-header>ownerGroup </th>
<td mat-cell *matCellDef="let row"> {{row.ownerGroup}} </td>
<td mat-cell *matCellDef="let row">
<div class="scrollable-text">
{{row.ownerGroup}}
</div>
</td>
</ng-container>

<ng-container matColumnDef="createdAt">
<th mat-header-cell cdkDrag *matHeaderCellDef mat-sort-header>Date </th>
<td mat-cell *matCellDef="let row"> {{row.createdAt | date}} </td>
<td mat-cell *matCellDef="let row">
<div class="scrollable-text">
{{row.createdAt | date}}
</div>
</td>
</ng-container>

<ng-container matColumnDef="thumbnail">
<th mat-header-cell cdkDrag *matHeaderCellDef>Thumbnail </th>
<td mat-cell *matCellDef="let row"><img [src]="getImage(row.thumbnail)" style="height: 100%;" /> </td>
<td mat-cell *matCellDef="let row"><img [src]="getImage(row.thumbnail)"/> </td>
</ng-container>

<ng-container matColumnDef="actions">
Expand Down
22 changes: 12 additions & 10 deletions scilog/src/app/overview/overview-table/overview-table.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@ table {
table-layout: fixed;
}

table th,
table td {
white-space: nowrap;
overflow: scroll;
}


.logbooks:hover {
background-color: var(--main-background)!important;
-webkit-transition: background-color 100ms linear, color 100ms linear;
Expand All @@ -18,11 +11,20 @@ table td {
}

.logbooks {
height: 65px;
height: 50px;
}

.scrollable-text {
white-space: nowrap;
overflow: scroll;
margin-right: 10px;
scrollbar-width: none;
}

.logbooks img {
max-height: 60px;
max-height: 45px;
height: 100%;
margin-top: 2px;
object-fit: contain;
}

Expand All @@ -34,7 +36,7 @@ table td {
}

.scrollable-container {
max-height: 65px * 11;
max-height: calc(100vh - 250px);
width: 100%;
overflow: auto;
}
Loading