Skip to content

Commit 6f46b5c

Browse files
shawonshawon
authored andcommitted
fixed xml icon, hover and click shape, added action menu design
1 parent 5c27c26 commit 6f46b5c

File tree

3 files changed

+107
-8
lines changed

3 files changed

+107
-8
lines changed

eform-client/src/app/components/navigation/navigation.component.scss

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2+
:root {
3+
--rounded-full: 9999px;;
4+
--font-family: Nunito Sans, Roboto, "Helvetica Neue", sans-serif;
5+
}
6+
17
mat-tree {
28
mat-tree-node {
39
display: inline-flex;
@@ -14,15 +20,21 @@ mat-tree {
1420
white-space: initial;
1521
line-height: 1.4em;
1622
}
23+
24+
&:hover{
25+
border-radius: var(--rounded-full)!important;
26+
background-color: var(--mdc-theme-primary-dark, #00695C) !important;
27+
color: var(--mdc-theme-on-primary) !important;
28+
}
29+
//&:focus {
30+
// background-color: var(--mdc-theme-primary-dark, #00695C) !important;
31+
// border-radius: var(--rounded-full) !important;
32+
// color: var(--mdc-theme-on-primary) !important;
33+
//}
1734
}
1835

1936

20-
&:hover{
21-
border-radius: var(--rounded-full)!important;
22-
}
23-
&:focus{
24-
border-radius: var(--rounded-full)!important;
25-
}
37+
2638

2739
.selected-node {
2840
background-color: var(--mdc-theme-primary) !important;
@@ -31,6 +43,7 @@ mat-tree {
3143

3244
&:hover{
3345
background-color: var(--mdc-theme-primary-dark) !important;
46+
color: var(--mdc-theme-on-primary) !important;
3447
}
3548
}
3649

@@ -61,16 +74,25 @@ mat-tree {
6174
}
6275

6376
mat-tree-node {
77+
.nav-link{
78+
&:hover{
79+
width: calc(100% - 20px)!important;
80+
border-radius: var(--rounded-full)!important;
81+
background-color: var(--mdc-theme-primary-dark, #00695C) !important;
82+
color: var(--mdc-theme-on-primary) !important;
83+
}
84+
}
6485
span {
6586
white-space: initial;
66-
//line-height: 1.4em;
6787
}
6888
}
6989
}
7090
}
7191
.selected-node {
7292
width: calc(100% - 20px)!important;
7393
}
94+
95+
7496
}
7597
}
7698

@@ -87,3 +109,9 @@ mat-tree {
87109
vertical-align: middle;
88110
font-size: 18px;
89111
}
112+
113+
114+
mat-tree-node a.mat-mdc-button-base.nav-link {
115+
border-radius: var(--rounded-full) !important;
116+
overflow: hidden !important;
117+
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
(click)="openNewEformModal()"
2727
class="btn-secondary btn-secondary--icon-rounded-border"
2828
>
29-
<mat-icon class="icon-secondary">text_snippet</mat-icon>
29+
<!-- <mat-icon class="icon-secondary">text_snippet</mat-icon>-->
30+
<app-icon name="xmlFile" size="20"></app-icon>
3031
</button>
3132

3233
<div class="line-vert"></div>

eform-client/src/scss/styles.scss

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -685,8 +685,14 @@ ngx-material-timepicker-container {
685685
}
686686
}
687687

688+
689+
.mat-tree{
690+
background-color: var(--bg)!important;
691+
}
692+
688693
.mat-drawer-inner-container{
689694
background: var(--bg)!important;
695+
690696
.mat-tree, .mat-expansion-panel{
691697
background: var(--bg)!important;
692698

@@ -797,8 +803,72 @@ ngx-material-timepicker-container {
797803
gap: var(--624-px, 24px);
798804
}
799805

806+
eform-new-subheader{
807+
.mat-mdc-card{
808+
box-shadow: unset !important;
809+
border: none !important;
810+
}
811+
}
812+
800813
.mat-mdc-card{
801814
box-shadow: unset !important;
802815
border: 1px solid var(--border) !important;
803816
//border-color: var(--border) !important;
804817
}
818+
819+
.mat-mdc-menu-panel{
820+
display: inline-flex;
821+
flex-direction: column;
822+
align-items: flex-start;
823+
border-radius: var(--rounded-8, 8px);
824+
border: 1px solid var(--border, #EBEFF2)!important;
825+
background: var(--bg, #FFF)!important;
826+
box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.10);
827+
828+
.mat-mdc-menu-content{
829+
display: inline-flex;
830+
padding: var(--28-px, 8px);
831+
flex-direction: column;
832+
align-items: flex-start;
833+
gap: var(--14-px, 4px);
834+
button{
835+
display: flex;
836+
height: 40px;
837+
padding: var(--28-px, 8px) var(--416-px, 16px);
838+
align-items: center;
839+
gap: var(--28-px, 8px);
840+
align-self: stretch;
841+
.mat-icon{
842+
margin: 0!important;
843+
}
844+
span{
845+
color: var(--text-header, #0F1316)!important;
846+
font-family: var(--font-family, "Nunito Sans");
847+
font-size: var(--Text-size-sm, 14px);
848+
font-style: normal;
849+
font-weight: 600;
850+
line-height: var(--Text-line-height-sm, 22px);
851+
}
852+
}
853+
854+
.mat-mdc-menu-item {
855+
display: flex;
856+
height: 40px;
857+
padding: var(--28-px, 8px) var(--416-px, 16px);
858+
align-items: flex-start;
859+
gap: var(--28-px, 8px);
860+
align-self: stretch;
861+
min-height: unset!important;
862+
.mat-mdc-menu-item-text {
863+
color: var(--text-header, #0F1316) !important;
864+
font-family: var(--font-family, "Nunito Sans");
865+
font-size: var(--Text-size-sm, 14px) !important;
866+
font-style: normal !important;
867+
font-weight: 600 !important;
868+
line-height: var(--Text-line-height-sm, 22px) !important;
869+
}
870+
}
871+
}
872+
873+
874+
}

0 commit comments

Comments
 (0)