Skip to content

Commit 44afb68

Browse files
shawonshawon
authored andcommitted
added some styles to folder select
1 parent 86e7999 commit 44afb68

File tree

4 files changed

+37
-15
lines changed

4 files changed

+37
-15
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
matTreeNodePadding=""
2727
[ngClass]="{'children': getLevel(node) > 0}">
2828
<div
29-
style="padding-left: 2px;"
3029
[ngClass]="{'folder': !lockSelectedNode, 'no-drop': lockSelectedNode,
3130
'selected-folder': selectedFolderIds.includes(node.id)}"
3231
(click)="selected(node.id)"

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

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,30 @@ mat-mdc-tree-node.mat-mdc-tree-node {
4242
margin-left: .5rem;
4343
}
4444

45-
.folder:hover {
46-
color: mat.m2-get-color-from-palette(mat.$m2-teal-palette, 300);
47-
transition: color .5s;
48-
}
49-
5045
.cursor {
5146
cursor: pointer;
5247
&.no-drop{
5348
cursor: no-drop;
5449
}
5550
}
51+
52+
53+
mat-tree-node.children {
54+
padding-left: 56px !important;
55+
}
56+
mat-tree-node{
57+
display: flex;
58+
height: 40px;
59+
padding: var(--28-px, 8px) var(--28-px, 8px) var(--28-px, 8px) var(--832-px, 32px)!important;
60+
align-items: center;
61+
gap: var(--156-px, 6px);
62+
align-self: stretch;
63+
background: var(--bg)!important;
64+
&:hover, &:active{
65+
color: var(--primary);
66+
background: var(--primary-light, #F5FCFC)!important;
67+
transition: color .5s;
68+
}
69+
//&[aria-expanded="true"]
70+
71+
}

eform-client/src/app/common/modules/eform-shared/components/entity-edit-create/entity-edit-create.component.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<eform-new-subheader [title]="title | translate" [forceStaticTitle]="true">
2+
<div class="d-flex flex-row align-items-center gap-12">
23
<button
34
*ngIf="edit"
45
class="btn-primary btn-primary--icon-left"
@@ -24,6 +25,7 @@
2425
>
2526
{{ 'Cancel' | translate }}
2627
</button>
28+
</div>
2729
</eform-new-subheader>
2830

2931
<mat-card>
@@ -48,18 +50,18 @@
4850
type="text">
4951
</mat-form-field>
5052

51-
<div class="d-flex justify-content-end">
53+
<div class="d-flex justify-content-end align-items-center gap-12 mb-4">
5254
<button
5355
id="editEntitySearchImportBtn"
54-
mat-icon-button
56+
class="btn-secondary btn-secondary--icon-rounded-border"
5557
[disabled]="entityGroupEditModel.isLocked && !entityGroupEditModel.isEditable"
5658
(click)="openImportEntityGroup()"
5759
>
5860
<mat-icon>format_list_bulleted</mat-icon>
5961
</button>
6062
<button
6163
id="addSingleEntitySelectableItem"
62-
mat-icon-button
64+
class="btn-secondary btn-secondary--icon-rounded-border"
6365
(click)="addNewEntityItem()"
6466
[disabled]="entityGroupEditModel.isLocked && !entityGroupEditModel.isEditable"
6567
>

eform-client/src/scss/styles.scss

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ body, .theme-light {
6565
--text-header: #{$text-header-light};
6666
//--mat-card-elevated-container-color: #{$bg-light}!important;
6767
--primary: #{$primary-light};
68+
--primary-light: #{$primary-light-light-mode};
6869
--warning: #{$warning-light};
6970
--error: #{$error-light};
7071
--btn-delete-text: #{$text-header-dark};
@@ -86,6 +87,7 @@ body, .theme-dark {
8687
--text-header: #{$text-header-dark};
8788
//--mat-card-elevated-container-color: #{$bg-dark}!important;
8889
--primary: #{$primary-dark};
90+
--primary-light: #{$primary-light-dark-mode};
8991
--warning: #{$warning-dark};
9092
--error: #{$error-dark};
9193
--btn-delete-text: #{$text-header-light};
@@ -641,14 +643,19 @@ ngx-material-timepicker-container {
641643

642644
body.theme-dark .NgxEditor, body.theme-light .NgxEditor{
643645
background: var(--bg)!important;
644-
border-bottom: unset!important;
645-
border: 1px solid var(--border)!important;
646+
//border-bottom: unset!important;
647+
border: none!important;
646648
color: var(--tp-text) !important;
647-
.NgxEditor__MenuBar{
648-
background: var(--bg)!important;
649+
&__MenuBar{
650+
background: var(--card) !important;
649651
}
650652
}
651653

654+
formatting-text-editor{
655+
border: 1px solid var(--border)!important;
656+
border-radius: 4px!important;
657+
}
658+
652659
.ng-dropdown-panel{
653660
background: var(--bg)!important;
654661
border: 1px solid var(--border)!important;
@@ -954,6 +961,4 @@ eform-new-subheader{
954961
}
955962
}
956963
}
957-
958-
959964
}

0 commit comments

Comments
 (0)