Skip to content

Commit ef9eab6

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

File tree

10 files changed

+110
-24
lines changed

10 files changed

+110
-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: 100 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ body, .theme-light {
6161
--tp-white-text: black;
6262
--border: #{$border-light};
6363
--icon-secondary: #{$icon-secondary-light};
64-
--bg: #{$bg-light};
64+
--bg: #{$bg-light};
6565
--text-header: #{$text-header-light};
6666
//--mat-card-elevated-container-color: #{$bg-light}!important;
6767
--primary: #{$primary-light};
@@ -70,6 +70,8 @@ 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;
74+
--mat-card-elevated-container-color: #{$bg-light}!important;
7375
}
7476

7577
body, .theme-dark {
@@ -89,6 +91,8 @@ body, .theme-dark {
8991
--btn-delete-text: #{$text-header-light};
9092
--text-body: #{$text-body-dark};
9193
--card: #{$card-dark};
94+
--mat-table-row-item-outline-color: #{$border-dark}!important;
95+
--mat-card-elevated-container-color: #{$bg-dark}!important;
9296
}
9397

9498
a {
@@ -451,7 +455,7 @@ ngx-material-timepicker-container {
451455
font-family: var(--font-family);
452456
font-size: var(--Text-size-sm, 14px);
453457
font-style: normal;
454-
//font-weight: 600;
458+
font-weight: 600;
455459
line-height: var(--Text-line-height-sm, 22px);
456460
}
457461
}
@@ -503,11 +507,10 @@ ngx-material-timepicker-container {
503507
color: var(--text-header);
504508
cursor: pointer;
505509

506-
/* Text/sm/Medium */
507510
font-family: var(--font-family);
508511
font-size: var(--Text-size-sm, 14px);
509512
font-style: normal;
510-
//font-weight: 600;
513+
font-weight: 600;
511514
line-height: var(--Text-line-height-sm, 22px); /* 157.143% */
512515

513516
&:disabled,
@@ -534,11 +537,10 @@ ngx-material-timepicker-container {
534537
cursor: pointer;
535538
border: unset;
536539

537-
/* Text/sm/Medium */
538540
font-family: var(--font-family);
539541
font-size: var(--Text-size-sm, 14px);
540542
font-style: normal;
541-
//font-weight: 600;
543+
font-weight: 600;
542544
line-height: var(--Text-line-height-sm, 22px); /* 157.143% */
543545

544546
&:disabled,
@@ -564,11 +566,10 @@ ngx-material-timepicker-container {
564566
cursor: pointer;
565567
border: unset;
566568

567-
/* Text/sm/Medium */
568569
font-family: var(--font-family);
569570
font-size: var(--Text-size-sm, 14px);
570571
font-style: normal;
571-
//font-weight: 600;
572+
font-weight: 600;
572573
line-height: var(--Text-line-height-sm, 22px); /* 157.143% */
573574

574575
&:disabled,
@@ -590,6 +591,14 @@ ngx-material-timepicker-container {
590591
align-self: stretch;
591592
border: unset!important;
592593
box-shadow: unset!important;
594+
h2{
595+
color: var(--text-header, #0F1316);
596+
font-family: var(--font-family, "Nunito Sans");
597+
font-size: var(--Header-size-md, 24px);
598+
font-style: normal;
599+
font-weight: 600;
600+
line-height: var(--Header-line-height-md, 32px); /* 133.333% */
601+
}
593602
}
594603

595604
.mat-app-background{
@@ -663,7 +672,7 @@ ngx-material-timepicker-container {
663672
font-family: var(--font-family, "Nunito Sans");
664673
font-size: var(--Text-size-sm, 14px);
665674
font-style: normal;
666-
//font-weight: 600;
675+
font-weight: 600;
667676
line-height: var(--Text-line-height-sm, 22px);
668677
}
669678

@@ -672,7 +681,7 @@ ngx-material-timepicker-container {
672681
font-family: var(--font-family, "Nunito Sans");
673682
font-size: var(--Text-size-sm, 14px);
674683
font-style: normal;
675-
//font-weight: 600;
684+
font-weight: 600;
676685
line-height: var(--Text-line-height-sm, 22px);
677686
}
678687
}
@@ -682,19 +691,94 @@ ngx-material-timepicker-container {
682691
border-right-color: var(--border) !important;
683692
}
684693

694+
.mat-mdc-cell{
695+
border-bottom-color: var(--border) !important;
696+
}
697+
.mtx-grid-toolbar{
698+
border: unset !important;
699+
}
700+
685701
.mtx-grid{
686-
outline: unset !important;
702+
border-color: var(--border) !important;
703+
border: unset !important;
704+
outline: unset!important;
705+
687706
.mat-mdc-table{
688707
background: var(--bg)!important;
708+
border-bottom: 1px solid var(--border)!important;
709+
border-color: var(--border) !important;
689710
.mat-mdc-header-row, thead{
690-
border-bottom: 1px solid var(--border);
691-
background: var(--card,);
711+
border-color: var(--border) !important;
712+
background: var(--card)!important;
713+
tr{
714+
border-color: var(--border) !important;
715+
th{
716+
border-color: var(--border) !important;
717+
color: var(--text-header, #0F1316);
718+
font-family: var(--font-family, "Nunito Sans");
719+
font-size: var(--Text-size-sm, 14px);
720+
font-style: normal;
721+
font-weight: 600;
722+
line-height: var(--Text-line-height-sm, 22px);
723+
}
724+
}
725+
}
726+
}
727+
tbody{
728+
border-color: var(--border) !important;
729+
tr{
730+
border-color: var(--border) !important;
731+
td{
732+
border-color: var(--border) !important;
733+
color: var(--text-body);
734+
font-family: var(--font-family, "Nunito Sans");
735+
font-size: var(--Text-size-sm, 14px);
736+
font-style: normal;
737+
font-weight: 500;
738+
line-height: var(--Text-line-height-sm, 22px);
739+
}
740+
//&:last-child {
741+
// border-bottom: 1px solid var(--border)!important;
742+
//}
692743
}
744+
}
745+
746+
}
747+
748+
.mat-mdc-paginator-outer-container, .mat-mdc-paginator-outer-container, .mat-mdc-paginator{
749+
background: var(--bg)!important;
750+
border: unset !important;
751+
}
752+
.mat-mdc-paginator-container, .mat-mdc-select-value-text, .mat-mdc-select-arrow svg{
753+
color: var(--text-header, #0F1316);
754+
font-family: var(--font-family, "Nunito Sans");
755+
font-size: var(--Text-size-sm, 14px);
756+
font-style: normal;
757+
font-weight: 500;
758+
line-height: var(--Text-line-height-sm, 22px);
693759

760+
.mat-mdc-form-field .mdc-text-field{
761+
border-radius: var(--rounded-full, 9999px)!important;
762+
border: 1px solid var(--border, #EBEFF2)!important;
763+
background: var(--bg, #FFF)!important;
694764
}
695-
thead{
696-
border-bottom: 1px solid var(--border);
697-
background: var(--card,);
765+
766+
.mdc-notched-outline__leading, .mdc-notched-outline__notch, .mdc-notched-outline__trailing{
767+
border: unset !important;
768+
outline: unset !important;
698769
}
770+
}
771+
772+
.mat-mdc-dialog-surface{
773+
background-color: var(--bg)!important;
774+
border-radius: var(--rounded-20, 20px);
775+
display: flex;
776+
padding: var(--832-px, 32px);
777+
//flex-direction: column;
778+
//align-items: center;
779+
gap: var(--624-px, 24px);
780+
}
699781

782+
.mat-mdc-card{
783+
box-shadow: unset !important;
700784
}

0 commit comments

Comments
 (0)