Skip to content

Commit be63dd6

Browse files
Fix all dropdowns
1 parent 42c1fff commit be63dd6

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

src/app/applications/applications-list/applications-table/applications-table.component.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<mat-spinner></mat-spinner>
55
}
66
</div>
7-
} @if (errorMessage) {
7+
}
8+
@if (errorMessage) {
89
<div class="error-messages p-3 m-2">
910
{{ errorMessage | translate }}
1011
</div>
@@ -218,12 +219,13 @@
218219
<td *matCellDef="let element" mat-cell>
219220
@if (element?.id | canEditApplication) {
220221
<div class="dropdown">
222+
<!-- TODO: Prevent default -->
221223
<a
224+
(click)="$event.stopPropagation();$event.preventDefault()"
222225
[attr.aria-label]="'APPLICATION-TABLE-ROW.SHOW-OPTIONS' | translate"
223226
aria-expanded="false"
224227
class="applicationRow__edit dropdown-toggle"
225228
data-bs-toggle="dropdown"
226-
href="#"
227229
id="tableRowDropdown-{{ element.id }}"
228230
role="button"
229231
></a>

src/app/gateway/gateway-table/gateway-table.component.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[localStorageKey]="gatewayTableSavedColumns"
55
></app-column-selector>
66

7-
<div class="mat-elevation-z8 overflow-auto">
7+
<div class="mat-elevation-z8 ">
88
@if (isLoadingResults) {
99
<div class="loading-shade">
1010
@if (isLoadingResults) {
@@ -275,15 +275,16 @@
275275
@if (gatewayStatus(gateway)) {
276276
<fa-icon [icon]="faCheckCircle" class="fa-ok"></fa-icon>
277277
} @else {
278-
<fa-icon [icon]="faExclamationTriangle" class="fa-error"></fa-icon>
279-
}
278+
<fa-icon [icon]="faExclamationTriangle" class="fa-error"></fa-icon>
279+
}
280280
</td>
281281
</ng-container>
282282

283283
<ng-container matColumnDef="menu">
284284
<th *matHeaderCellDef mat-header-cell></th>
285285
<td *matCellDef="let gateway" class="overflowVisible" mat-cell>
286286
@if (gateway.canEdit) {
287+
<!-- TODO: Shinanigans with menu-->
287288
<div class="dropdown">
288289
<a
289290
[attr.aria-label]="'LORA-GATEWAY-TABLE-ROW.SHOW-OPTIONS' | translate"

src/assets/scss/components/_tables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ table {
3737

3838
.dropdown {
3939
.applicationRow__edit {
40-
width: 10px;
40+
width: 20px;
4141
height: 20px;
4242
background-image: radial-gradient(circle, $black 2px, transparent 1px);
4343
background-size: 100% 33.33%;

0 commit comments

Comments
 (0)