Skip to content

Commit fc0cd26

Browse files
shawonshawon
authored andcommitted
change folder select design and added delte btn design
1 parent ebe2ba7 commit fc0cd26

File tree

8 files changed

+85
-17
lines changed

8 files changed

+85
-17
lines changed

eform-client/src/app/common/modules/eform-shared/components/eform-tree-view-picker/eform-tree-view-picker.component.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
mat-icon-button
44
*ngIf="collapsed"
55
class="collapse-button"
6+
style="margin-top: 12px !important;"
67
(click)="treeControl.expandAll(); collapsed = !collapsed"
78
>
89
<mat-icon>expand_more</mat-icon>
@@ -11,6 +12,8 @@
1112
mat-icon-button
1213
*ngIf="!collapsed"
1314
class="collapse-button"
15+
16+
style="margin-top: 12px !important;"
1417
(click)="treeControl.collapseAll(); collapsed = !collapsed"
1518
>
1619
<mat-icon>expand_less</mat-icon>

eform-client/src/app/common/modules/eform-shared/components/eform-tree-view-picker/eform-tree-view-picker.component.scss

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,24 @@
88
mat-mdc-tree-node.mat-mdc-tree-node {
99
min-height: 30px;
1010
max-height: 30px;
11+
display: inline-flex;
12+
13+
&:hover{
14+
border-radius: var(--rounded-full)!important;
15+
}
16+
&:focus{
17+
border-radius: var(--rounded-full)!important;
18+
}
19+
20+
.selected-node {
21+
background-color: var(--mdc-theme-primary) !important;
22+
color: var(--mdc-theme-on-primary) !important;
23+
border-radius: var(--rounded-full);
24+
25+
&:hover{
26+
background-color: var(--mdc-theme-primary-dark) !important;
27+
}
28+
}
1129
}
1230

1331
.collapse-button {
@@ -16,16 +34,16 @@ mat-mdc-tree-node.mat-mdc-tree-node {
1634
}
1735

1836
.selected-folder {
19-
color: mat.m2-get-color-from-palette(mat.$m2-pink-palette, 300);
37+
color: mat.m2-get-color-from-palette(mat.$m2-teal-palette, 300);
2038
}
2139

2240
.microting-uid {
23-
color: mat.m2-get-color-from-palette(mat.$m2-indigo-palette, 300);
41+
color: var(--text-header) !important;
2442
margin-left: .5rem;
2543
}
2644

2745
.folder:hover {
28-
color: mat.m2-get-color-from-palette(mat.$m2-pink-palette, 300);
46+
color: mat.m2-get-color-from-palette(mat.$m2-teal-palette, 300);
2947
transition: color .5s;
3048
}
3149

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ <h3 mat-dialog-title>{{'Delete searchable group?' | translate}}</h3>
2525
</div>
2626
</div>
2727
</div>
28-
<div mat-dialog-actions class="d-flex flex-row justify-content-end">
28+
<div mat-dialog-actions class="d-flex flex-row justify-content-end align-items-center gap-12">
2929
<button
30-
mat-raised-button
30+
class="btn-delete"
3131
color="warn"
3232
id="entitySearchDeleteDeleteBtn"
3333
(click)="deleteSelectedAdvEntitySearchableGroup()"
3434
>
3535
{{'Delete' | translate}}
3636
</button>
3737
<button
38-
mat-raised-button
38+
class="btn-cancel"
3939
id="entitySearchDeleteCancelBtn"
4040
(click)="hide()"
4141
>

eform-client/src/app/modules/advanced/components/folders/folder-delete/folder-delete.component.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,16 @@ <h3 mat-dialog-title>{{'Are you sure you want to delete the folder' | translate}
3333
</div>
3434
</div>
3535
</div>
36-
<div mat-dialog-actions class="d-flex flex-row justify-content-end">
36+
<div mat-dialog-actions class="d-flex flex-row justify-content-end align-items-center gap-12">
3737
<button
38-
mat-raised-button
39-
color="warn"
38+
class="btn-delete"
4039
id="saveDeleteBtn"
4140
(click)="deleteFolder()"
4241
>
4342
{{'Delete' | translate}}
4443
</button>
4544
<button
46-
mat-raised-button
45+
class="btn-cancel"
4746
id="cancelDeleteBtn"
4847
(click)="hide()"
4948
>

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,16 @@ <h3 mat-dialog-title>{{'Are you sure you want to delete the site? The action can
2525
</div>
2626
</div>
2727
</div>
28-
<div mat-dialog-actions class="d-flex flex-row justify-content-end">
28+
<div mat-dialog-actions class="d-flex flex-row justify-content-end align-items-center gap-12">
2929
<button
30-
mat-raised-button
31-
color="warn"
30+
class="btn-delete"
3231
id="siteDeleteDeleteBtn"
3332
(click)="deleteSingle()"
3433
>
3534
{{'Delete' | translate}}
3635
</button>
3736
<button
38-
mat-raised-button
37+
class="btn-cancel"
3938
id="siteDeleteCancelBtn"
4039
(click)="hide()"
4140
>

eform-client/src/scss/components/_text.scss

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,32 @@
11
@use 'sass:map';
22
@use '@angular/material' as mat;
33
@use '../utilities/colors' as *;
4+
body, .theme-light {
5+
--error: #{$error-light};
6+
--warning: #{$warning-light};
7+
8+
}
9+
10+
body, .theme-dark {
11+
--error: #{$error-dark};
12+
--warning: #{$warning-dark};
13+
}
414

515
a {
616
&.link-primary {
7-
color: $eform-red;
17+
color: var(--error);
818
&:hover {
919
color: $eform-red-dark;
1020
}
1121
}
1222
}
1323

1424
.text-danger {
15-
color: $eform-red;
25+
color: var(--error) ;
1626
}
1727

1828
.text-warning {
19-
color: $eform-orange;
29+
color: var(--warning) ;
2030
}
2131

2232
.text-black {

eform-client/src/scss/styles.scss

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ body, .theme-light {
6666
//--mat-card-elevated-container-color: #{$bg-light}!important;
6767
--primary: #{$primary-light};
6868
--warning: #{$warning-light};
69+
--error: #{$error-light};
70+
--btn-delete-text: #{$text-header-dark};
6971
}
7072

7173
body, .theme-dark {
@@ -81,6 +83,8 @@ body, .theme-dark {
8183
//--mat-card-elevated-container-color: #{$bg-dark}!important;
8284
--primary: #{$primary-dark};
8385
--warning: #{$warning-dark};
86+
--error: #{$error-dark};
87+
--btn-delete-text: #{$text-header-light};
8488
}
8589

8690
a {
@@ -537,3 +541,35 @@ ngx-material-timepicker-container {
537541
pointer-events: none;
538542
}
539543
}
544+
545+
.btn-delete{
546+
display: flex;
547+
height: 48px;
548+
padding: var(--312-px, 12px) var(--832-px, 32px);
549+
justify-content: center;
550+
align-items: center;
551+
gap: var(--156-px, 6px);
552+
border-radius: var(--rounded-full);
553+
background: var(--error);
554+
color: var(--btn-delete-text);
555+
cursor: pointer;
556+
border: unset;
557+
558+
/* Text/sm/Medium */
559+
font-family: var(--font-family);
560+
font-size: var(--Text-size-sm, 14px);
561+
font-style: normal;
562+
//font-weight: 600;
563+
line-height: var(--Text-line-height-sm, 22px); /* 157.143% */
564+
565+
&:disabled,
566+
&[disabled] {
567+
background-color: var(--border) !important;
568+
color: var(--tp-text) !important;
569+
opacity: 0.5;
570+
cursor: not-allowed !important;
571+
pointer-events: none;
572+
}
573+
}
574+
575+

eform-client/src/scss/utilities/_colors.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,6 @@ $bg-dark: #202122;
4444

4545
$text-header-light: #0F1316;
4646
$text-header-dark: #F3F5F7;
47+
48+
$error-light: #F44336;
49+
$error-dark: #FF8282;

0 commit comments

Comments
 (0)