Skip to content

Commit 28268af

Browse files
shawonshawon
authored andcommitted
adjust table design
1 parent 71cdb42 commit 28268af

File tree

10 files changed

+74
-24
lines changed

10 files changed

+74
-24
lines changed

eform-client/src/app/modules/advanced/components/entity-search/entity-search/entity-search.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
[showPaginator]="true"
3737
[paginationTemplate]="paginatorTpl"
3838
[pageOnFront]="false"
39-
[rowStriped]="true"
39+
[rowStriped]="false"
4040
[showToolbar]="true"
4141
[showColumnMenuButton]="false"
4242
[toolbarTemplate]="toolbarTpl"

eform-client/src/app/modules/advanced/components/entity-select/entity-select/entity-select.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
[showPaginator]="true"
3737
[paginationTemplate]="paginatorTpl"
3838
[pageOnFront]="false"
39-
[rowStriped]="true"
39+
[rowStriped]="false"
4040
[showToolbar]="true"
4141
[showColumnMenuButton]="false"
4242
[toolbarTemplate]="toolbarTpl"

eform-client/src/app/modules/advanced/components/sites/sites/sites.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
[cellTemplate]="{ siteUId: siteUIdTpl, siteName: siteNameTpl, units: unitsTpl, tags: tagsTpl, actions: actionsTpl}"
1919
[showPaginator]="false"
2020
[pageOnFront]="false"
21-
[rowStriped]="true"
21+
[rowStriped]="false"
2222
[showToolbar]="false"
2323
[showColumnMenuButton]="false">
2424
</mtx-grid>

eform-client/src/app/modules/advanced/components/units/units.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
actions: actionsTpl}"
2222
[showPaginator]="false"
2323
[pageOnFront]="false"
24-
[rowStriped]="true"
24+
[rowStriped]="false"
2525
[showToolbar]="false"
2626
[showColumnMenuButton]="false">
2727
</mtx-grid>

eform-client/src/app/modules/advanced/components/workers/workers/workers.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
[cellTemplate]="{actions: actionsTpl}"
2020
[showPaginator]="false"
2121
[pageOnFront]="false"
22-
[rowStriped]="true"
22+
[rowStriped]="false"
2323
[showColumnMenuButton]="false">
2424
</mtx-grid>
2525
<ng-template #actionsTpl let-row let-i="index">

eform-client/src/app/modules/device-users/components/device-users-page/device-users-page.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
actions: actionsTpl}"
4141
[showPaginator]="false"
4242
[pageOnFront]="false"
43-
[rowStriped]="true"
43+
[rowStriped]="false"
4444
[showToolbar]="true"
4545
[showColumnMenuButton]="false"
4646
[toolbarTemplate]="toolbarTpl">

eform-client/src/app/modules/email-recipients/components/email-recipients-page/email-recipients-page.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
[showPaginator]="true"
5050
[paginationTemplate]="paginatorTpl"
5151
[pageOnFront]="false"
52-
[rowStriped]="true"
52+
[rowStriped]="false"
5353
[showToolbar]="true"
5454
[showColumnMenuButton]="false"
5555
[toolbarTemplate]="toolbarTpl"

eform-client/src/app/modules/plugins-management/components/installed/installed-plugins-page/installed-plugins-page.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
[cellTemplate]="{id: idTpl, name: nameTpl, version: versionTpl, actions: actionsTpl}"
1717
[showPaginator]="false"
1818
[pageOnFront]="false"
19-
[rowStriped]="true"
19+
[rowStriped]="false"
2020
[showColumnMenuButton]="false">
2121
</mtx-grid>
2222

eform-client/src/scss/libs/theme.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,12 @@ body, .theme-light {
206206
--mdc-theme-on-primary: #{$on-primary};
207207
--mdc-theme-primary-dark: #{$primary-dark-light-mode};
208208
--mdc-theme-on-primary-dark: #{$on-primary-dark};
209+
--mat-app-background-color: #{$bg-light}
209210
}
210211
body, .theme-dark {
211212
--mdc-theme-primary: #{$primary-dark};
212213
--mdc-theme-on-primary: #{$on-primary-dark};
213214
--mdc-theme-primary-dark: #{$primary-dark-dark-mode};
214215
--mdc-theme-on-primary-dark: #{$on-primary-dark};
216+
--mat-app-background-color: #{$bg-dark}
215217
}

eform-client/src/scss/styles.scss

Lines changed: 64 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ body, .theme-light {
7070
--btn-delete-text: #{$text-header-dark};
7171
--text-body: #{$text-body-light};
7272
--card: #{$card-light};
73+
--mat-table-row-item-outline-color: #{$border-light}!important;
7374
}
7475

7576
body, .theme-dark {
@@ -89,6 +90,7 @@ body, .theme-dark {
8990
--btn-delete-text: #{$text-header-light};
9091
--text-body: #{$text-body-dark};
9192
--card: #{$card-dark};
93+
--mat-table-row-item-outline-color: #{$border-dark}!important;
9294
}
9395

9496
a {
@@ -451,7 +453,7 @@ ngx-material-timepicker-container {
451453
font-family: var(--font-family);
452454
font-size: var(--Text-size-sm, 14px);
453455
font-style: normal;
454-
//font-weight: 600;
456+
font-weight: 600;
455457
line-height: var(--Text-line-height-sm, 22px);
456458
}
457459
}
@@ -503,11 +505,10 @@ ngx-material-timepicker-container {
503505
color: var(--text-header);
504506
cursor: pointer;
505507

506-
/* Text/sm/Medium */
507508
font-family: var(--font-family);
508509
font-size: var(--Text-size-sm, 14px);
509510
font-style: normal;
510-
//font-weight: 600;
511+
font-weight: 600;
511512
line-height: var(--Text-line-height-sm, 22px); /* 157.143% */
512513

513514
&:disabled,
@@ -534,11 +535,10 @@ ngx-material-timepicker-container {
534535
cursor: pointer;
535536
border: unset;
536537

537-
/* Text/sm/Medium */
538538
font-family: var(--font-family);
539539
font-size: var(--Text-size-sm, 14px);
540540
font-style: normal;
541-
//font-weight: 600;
541+
font-weight: 600;
542542
line-height: var(--Text-line-height-sm, 22px); /* 157.143% */
543543

544544
&:disabled,
@@ -564,11 +564,10 @@ ngx-material-timepicker-container {
564564
cursor: pointer;
565565
border: unset;
566566

567-
/* Text/sm/Medium */
568567
font-family: var(--font-family);
569568
font-size: var(--Text-size-sm, 14px);
570569
font-style: normal;
571-
//font-weight: 600;
570+
font-weight: 600;
572571
line-height: var(--Text-line-height-sm, 22px); /* 157.143% */
573572

574573
&:disabled,
@@ -590,6 +589,14 @@ ngx-material-timepicker-container {
590589
align-self: stretch;
591590
border: unset!important;
592591
box-shadow: unset!important;
592+
h2{
593+
color: var(--text-header, #0F1316);
594+
font-family: var(--font-family, "Nunito Sans");
595+
font-size: var(--Header-size-md, 24px);
596+
font-style: normal;
597+
font-weight: 600;
598+
line-height: var(--Header-line-height-md, 32px); /* 133.333% */
599+
}
593600
}
594601

595602
.mat-app-background{
@@ -663,7 +670,7 @@ ngx-material-timepicker-container {
663670
font-family: var(--font-family, "Nunito Sans");
664671
font-size: var(--Text-size-sm, 14px);
665672
font-style: normal;
666-
//font-weight: 600;
673+
font-weight: 600;
667674
line-height: var(--Text-line-height-sm, 22px);
668675
}
669676

@@ -672,7 +679,7 @@ ngx-material-timepicker-container {
672679
font-family: var(--font-family, "Nunito Sans");
673680
font-size: var(--Text-size-sm, 14px);
674681
font-style: normal;
675-
//font-weight: 600;
682+
font-weight: 600;
676683
line-height: var(--Text-line-height-sm, 22px);
677684
}
678685
}
@@ -682,19 +689,60 @@ ngx-material-timepicker-container {
682689
border-right-color: var(--border) !important;
683690
}
684691

692+
.mat-mdc-cell{
693+
border-bottom-color: var(--border) !important;
694+
}
695+
685696
.mtx-grid{
686-
outline: unset !important;
697+
border-color: var(--border) !important;
687698
.mat-mdc-table{
688699
background: var(--bg)!important;
700+
border-bottom: 1px solid var(--border)!important;
701+
border-color: var(--border) !important;
689702
.mat-mdc-header-row, thead{
690-
border-bottom: 1px solid var(--border);
691-
background: var(--card,);
703+
border-color: var(--border) !important;
704+
background: var(--card)!important;
705+
tr{
706+
border-color: var(--border) !important;
707+
th{
708+
border-color: var(--border) !important;
709+
color: var(--text-header, #0F1316);
710+
font-family: var(--font-family, "Nunito Sans");
711+
font-size: var(--Text-size-sm, 14px);
712+
font-style: normal;
713+
font-weight: 600;
714+
line-height: var(--Text-line-height-sm, 22px);
715+
}
716+
}
692717
}
693-
694718
}
695-
thead{
696-
border-bottom: 1px solid var(--border);
697-
background: var(--card,);
719+
tbody{
720+
border-color: var(--border) !important;
721+
tr{
722+
border-color: var(--border) !important;
723+
td{
724+
border-color: var(--border) !important;
725+
color: var(--text-body);
726+
font-family: var(--font-family, "Nunito Sans");
727+
font-size: var(--Text-size-sm, 14px);
728+
font-style: normal;
729+
font-weight: 500;
730+
line-height: var(--Text-line-height-sm, 22px);
731+
}
732+
//&:last-child {
733+
// border-bottom: 1px solid var(--border)!important;
734+
//}
735+
}
698736
}
699737

700738
}
739+
740+
//.mat-mdc-table-sticky-border-elem-top,
741+
//.mat-mdc-table-sticky-border-elem-bottom {
742+
// border-color: var(--border) !important;
743+
//}
744+
//
745+
//.mat-mdc-table-sticky-border-elem-right,
746+
//.mat-mdc-table-sticky-border-elem-left {
747+
// border-color: var(--border) !important;
748+
//}

0 commit comments

Comments
 (0)