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

fix(fe): fix data-table columns' width #1289

Merged
merged 3 commits into from
Oct 31, 2024
Merged

fix(fe): fix data-table columns' width #1289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2765b3d
fix: fix columns' width
fterra-encora Oct 30, 2024
529606a
refator: create css class padding-column
fterra-encora Oct 30, 2024
68a9c33
Merge branch 'main' into fix/data-table-columns-width
fterra-encora Oct 31, 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
16 changes: 8 additions & 8 deletions frontend/src/assets/styles/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1283,7 +1283,7 @@ cds-modal {
}

.paginator {
width: calc(100vw - 16rem);
width: 100%;
}

.headers-compact ~ .full {
Expand Down Expand Up @@ -1490,11 +1490,6 @@ cds-table-header-cell {
background: var(--light-theme-layer-accent-layer-accent-01, #dfdfe1);
}

:is(cds-table-header-cell, cds-table-cell):is(:first-child, :last-child) {
padding: 0;
width: 1.5rem;
}

.col-6_75rem {
width: 6.75rem;
}
Expand All @@ -1511,6 +1506,11 @@ cds-table-header-cell {
width: 7.0625rem;
}

.padding-column {
padding: 0;
width: 1.5rem;
}

cds-pagination {
border-radius: 0px 0px 4px 4px;
border-top: 1px solid var(--light-theme-border-border-subtle-01, #dfdfe1);
Expand Down Expand Up @@ -1874,7 +1874,7 @@ div.internal-grouping-01:has(svg.warning) span.body-compact-01 {
}

.paginator {
width: 100vw;
width: 100%;
}
.submission-details--title svg {
width: 5rem;
Expand Down Expand Up @@ -1985,7 +1985,7 @@ div.internal-grouping-01:has(svg.warning) span.body-compact-01 {
}

.paginator {
width: 100vw;
width: 100%;
}
cds-table {
width: 82rem;
Expand Down
6 changes: 2 additions & 4 deletions frontend/src/pages/SearchPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,17 +246,16 @@ onMounted(() => {
</div>
<div id="datatable" v-if="userhasAuthority">

<cds-table use-zebra-styles v-if="!loadingSearch">
<cds-table id="search-table" use-zebra-styles v-if="!loadingSearch">
<cds-table-head>
<cds-table-header-row>
<cds-table-header-cell />
<cds-table-header-cell class="padding-column" />
<cds-table-header-cell class="col-6_75rem">Client number</cds-table-header-cell>
<cds-table-header-cell class="col-6_75rem">Acronym</cds-table-header-cell>
<cds-table-header-cell class="col-19_4375rem">Name</cds-table-header-cell>
<cds-table-header-cell class="col-14_75rem">Type</cds-table-header-cell>
<cds-table-header-cell class="col-14_75rem">City</cds-table-header-cell>
<cds-table-header-cell class="col-7_0625rem">Status</cds-table-header-cell>
<cds-table-header-cell />
</cds-table-header-row>
</cds-table-head>
<cds-table-body>
Expand All @@ -276,7 +275,6 @@ onMounted(() => {
<cds-tag :type="tagColor(row.clientStatus)" title=""><span>{{ row.clientStatus }}</span></cds-tag>
</div>
</cds-table-cell>
<cds-table-cell />
</cds-table-row>
</cds-table-body>
</cds-table>
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/pages/SubmissionListPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,16 +129,16 @@ const summitSvg = useSvg(summit);
</div>

<div id="datatable" v-if="userhasAuthority">
<cds-table use-zebra-styles v-if="!loading">
<cds-table id="submissions-table" use-zebra-styles v-if="!loading">
<cds-table-head>
<cds-table-header-row>
<cds-table-header-cell />
<cds-table-header-cell class="padding-column" />
<cds-table-header-cell>Client name</cds-table-header-cell>
<cds-table-header-cell>Client type</cds-table-header-cell>
<cds-table-header-cell>District</cds-table-header-cell>
<cds-table-header-cell>Submitted on</cds-table-header-cell>
<cds-table-header-cell>Submission status</cds-table-header-cell>
<cds-table-header-cell />
<cds-table-header-cell class="padding-column" />
</cds-table-header-row>
</cds-table-head>
<cds-table-body>
Expand Down
Loading