Skip to content

Commit 2f2777c

Browse files
Merge pull request #1544 from rocket-admin/table-view-fixes
Table view fixes
2 parents e714cd3 + be945b7 commit 2f2777c

File tree

4 files changed

+53
-23
lines changed

4 files changed

+53
-23
lines changed

frontend/src/app/components/dashboard/db-table-view/db-table-row-view/db-table-row-view.component.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
}
1313

1414
.row-preview-sidebar_open {
15+
position: relative;
1516
background-color: var(--mat-sidenav-content-background-color);
1617
border-left: solid 1px rgba(0, 0, 0, 0.12);
1718
opacity: 1;
@@ -40,12 +41,17 @@
4041
}
4142

4243
.row-preview-sidebar__header {
44+
position: sticky;
45+
top: 0;
46+
background-color: inherit;
4347
display: flex;
4448
align-items: center;
4549
justify-content: space-between;
4650
padding-top: 20px;
51+
padding-bottom: 20px;
4752
padding-left: 16px;
4853
padding-right: 16px;
54+
z-index: 1;
4955
}
5056

5157
.row-preview-sidebar__title {

frontend/src/app/components/dashboard/db-table-view/db-table-row-view/db-table-row-view.component.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ <h2 class="mat-heading-2 row-preview-sidebar__title">Preview</h2>
2323
</button>
2424
</div>
2525

26-
<br />
27-
2826
<mat-expansion-panel *ngIf="selectedRow?.relatedRecords?.referenced_by?.length" class="related-records-panel">
2927
<mat-expansion-panel-header class="related-records-panel__header">
3028
Related records

frontend/src/app/components/dashboard/db-table-view/db-table-view.component.css

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,30 @@
223223
background-color: #E8ECEE !important;
224224
}
225225

226+
@media (prefers-color-scheme: dark) {
227+
::ng-deep .active-filters .mat-mdc-chip {
228+
--mdc-chip-container-color: #3a4a5c !important;
229+
--mdc-chip-elevated-container-color: #3a4a5c !important;
230+
--mdc-chip-label-text-color: rgba(255, 255, 255, 0.87) !important;
231+
background-color: #3a4a5c !important;
232+
color: rgba(255, 255, 255, 0.87) !important;
233+
}
234+
235+
::ng-deep .active-filters .mat-mdc-chip:hover {
236+
--mdc-chip-container-color: #3a4a5c !important;
237+
--mdc-chip-elevated-container-color: #3a4a5c !important;
238+
background-color: #3a4a5c !important;
239+
}
240+
241+
::ng-deep .active-filters .mdc-evolution-chip__cell {
242+
background-color: #3a4a5c !important;
243+
}
244+
245+
::ng-deep .active-filters .mdc-evolution-chip__cell:hover {
246+
background-color: #3a4a5c !important;
247+
}
248+
}
249+
226250
.db-table-manage-columns-button__count {
227251
margin-left: 2px;
228252
}
@@ -273,7 +297,7 @@
273297
}
274298

275299
.table-surface {
276-
margin-bottom: 24px;
300+
margin-bottom: 72px;
277301
}
278302

279303
@media (prefers-color-scheme: dark) {

frontend/src/app/components/dashboard/db-table-view/saved-filters-panel/saved-filters-panel.component.css

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -366,47 +366,49 @@
366366

367367
@media (prefers-color-scheme: dark) {
368368
::ng-deep .static-filter-chip .mat-mdc-chip {
369-
--mdc-chip-container-color: #E8ECEE !important;
370-
--mdc-chip-elevated-container-color: #E8ECEE !important;
371-
background-color: #E8ECEE !important;
369+
--mdc-chip-container-color: #3a4a5c !important;
370+
--mdc-chip-elevated-container-color: #3a4a5c !important;
371+
--mdc-chip-label-text-color: rgba(255, 255, 255, 0.87) !important;
372+
background-color: #3a4a5c !important;
373+
color: rgba(255, 255, 255, 0.87) !important;
372374
}
373375

374376
::ng-deep .static-filter-chip .mat-mdc-chip:hover {
375-
--mdc-chip-container-color: #E8ECEE !important;
376-
--mdc-chip-elevated-container-color: #E8ECEE !important;
377-
background-color: #E8ECEE !important;
377+
--mdc-chip-container-color: #3a4a5c !important;
378+
--mdc-chip-elevated-container-color: #3a4a5c !important;
379+
background-color: #3a4a5c !important;
378380
}
379381

380382
::ng-deep .static-filter-chip .mat-mdc-chip:active {
381-
--mdc-chip-container-color: #E8ECEE !important;
382-
--mdc-chip-elevated-container-color: #E8ECEE !important;
383-
background-color: #E8ECEE !important;
383+
--mdc-chip-container-color: #3a4a5c !important;
384+
--mdc-chip-elevated-container-color: #3a4a5c !important;
385+
background-color: #3a4a5c !important;
384386
}
385387

386388
::ng-deep .static-filter-chip .mdc-evolution-chip__cell {
387-
background-color: #E8ECEE !important;
389+
background-color: #3a4a5c !important;
388390
}
389391

390392
::ng-deep .static-filter-chip .mdc-evolution-chip__cell:hover {
391-
background-color: #E8ECEE !important;
393+
background-color: #3a4a5c !important;
392394
}
393395

394396
::ng-deep .static-filter-chip .mat-mdc-chip.mdc-evolution-chip--with-primary-icon {
395-
--mdc-chip-container-color: #E8ECEE !important;
396-
--mdc-chip-elevated-container-color: #E8ECEE !important;
397-
background-color: #E8ECEE !important;
397+
--mdc-chip-container-color: #3a4a5c !important;
398+
--mdc-chip-elevated-container-color: #3a4a5c !important;
399+
background-color: #3a4a5c !important;
398400
}
399401

400402
::ng-deep .static-filter-chip .mat-mdc-chip.mdc-evolution-chip--with-primary-icon:hover {
401-
--mdc-chip-container-color: #E8ECEE !important;
402-
--mdc-chip-elevated-container-color: #E8ECEE !important;
403-
background-color: #E8ECEE !important;
403+
--mdc-chip-container-color: #3a4a5c !important;
404+
--mdc-chip-elevated-container-color: #3a4a5c !important;
405+
background-color: #3a4a5c !important;
404406
}
405407

406408
::ng-deep .static-filter-chip .mat-mdc-chip.mdc-evolution-chip--with-primary-icon:active {
407-
--mdc-chip-container-color: #E8ECEE !important;
408-
--mdc-chip-elevated-container-color: #E8ECEE !important;
409-
background-color: #E8ECEE !important;
409+
--mdc-chip-container-color: #3a4a5c !important;
410+
--mdc-chip-elevated-container-color: #3a4a5c !important;
411+
background-color: #3a4a5c !important;
410412
}
411413
}
412414

0 commit comments

Comments
 (0)