Skip to content

Commit fc86ff1

Browse files
Merge pull request #3511 from ita-social-projects/bugfix/#7581-fix-cols-on-big-table
[Bugfix] #7581 fix cols on big table
2 parents 67a6dc5 + 27754ed commit fc86ff1

File tree

2 files changed

+25
-13
lines changed

2 files changed

+25
-13
lines changed

src/app/ubs/ubs-admin/components/ubs-admin-table/ubs-admin-table.component.scss

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,27 @@ mat-header-cell {
4646
color: var(--ubs-primary-white);
4747
font-family: var(--primary-font);
4848
border: 1px solid var(--ubs-primary-light-grey);
49-
width: 200px;
5049
text-align: center;
5150
font-size: 14px;
5251
min-height: 39px;
53-
min-width: 48px;
5452
overflow: hidden;
5553
word-wrap: break-word;
56-
white-space: nowrap;
54+
white-space: normal;
5755
overflow-wrap: break-word;
5856
flex: none;
5957
display: block;
6058
line-height: 2.8;
6159
padding: 0;
60+
width: auto;
61+
62+
.column-title {
63+
display: block;
64+
word-break: normal;
65+
overflow-wrap: break-word;
66+
line-height: 25px;
67+
width: 100%;
68+
padding: 5px 0 3px;
69+
}
6270
}
6371

6472
.cdk-column-select {
@@ -171,6 +179,10 @@ mat-cell {
171179
padding: 0;
172180
}
173181

182+
.mat-cell:first-child {
183+
min-width: auto;
184+
}
185+
174186
.primary-color {
175187
color: var(--primary-green);
176188
}
@@ -187,17 +199,17 @@ mat-cell:first-of-type {
187199
padding-left: 0;
188200
}
189201

190-
.column-title {
191-
color: var(--ubs-secondary-light-grey);
192-
font-size: 14px;
193-
overflow: hidden;
194-
text-overflow: ellipsis;
202+
.mat-header-cell:first-child {
203+
min-width: auto;
195204
}
196205

197206
.icon-row {
198207
display: flex;
199-
align-items: center;
200-
margin-left: 5px;
208+
justify-content: center;
209+
margin-top: 5px;
210+
white-space: nowrap;
211+
padding-top: 5px;
212+
gap: 5px;
201213
}
202214

203215
.amount-items {
@@ -413,8 +425,6 @@ mat-cell:first-of-type {
413425

414426
/* stylelint-disable-next-line */
415427
mat-header-cell mat-icon {
416-
padding-top: 5px;
417-
padding-left: 10px;
418428
font-size: 12px;
419429

420430
&:hover {

src/app/ubs/ubs-admin/models/non-sortable-columns.model.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ export const nonSortableColumns = [
1010
'commentForOrderByClient',
1111
'orderCertificateCode',
1212
'idOrderFromShop',
13-
'bagsAmount',
13+
'mixedWaste120L',
14+
'textileWaste60L',
15+
'textileWaste20L',
1416
'phone_number',
1517
'recipient_phone',
1618
'comment_to_address_for_client',

0 commit comments

Comments
 (0)