Skip to content

Commit eed73f3

Browse files
rahul-rocketrahul-rocket
authored
Merge pull request #8738 from ever-co/fix/#8572-dark-scheme-display
[Fix] Author and Contact Field Values Not Displaying in Dark Scheme
2 parents c637575 + ff73131 commit eed73f3

2 files changed

Lines changed: 94 additions & 94 deletions

File tree

‎packages/plugins/job-proposal-ui/src/lib/proposal/components/proposal-register/proposal-register.component.html‎

Lines changed: 91 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -9,103 +9,105 @@ <h4>
99
</nb-card-header>
1010
<nb-card-body class="card-body">
1111
<form [formGroup]="form" #proposalForm="ngForm" (ngSubmit)="registerProposal()">
12-
<div class="row">
13-
<div class="col-sm-3">
14-
<div class="form-group">
15-
<label class="label">
16-
{{ 'PROPOSALS_PAGE.REGISTER.AUTHOR' | translate }}
17-
</label>
18-
<ga-employee-selector
19-
id="authorInput"
20-
class="employees"
21-
[skipGlobalChange]="true"
22-
[defaultSelected]="true"
23-
(selectionChanged)="selectionEmployee($event)"
24-
></ga-employee-selector>
12+
<div class="container">
13+
<div class="row">
14+
<div class="col-sm-3">
15+
<div class="form-group">
16+
<label class="label">
17+
{{ 'PROPOSALS_PAGE.REGISTER.AUTHOR' | translate }}
18+
</label>
19+
<ga-employee-selector
20+
id="authorInput"
21+
class="employees"
22+
[skipGlobalChange]="true"
23+
[defaultSelected]="true"
24+
(selectionChanged)="selectionEmployee($event)"
25+
></ga-employee-selector>
26+
</div>
2527
</div>
2628
</div>
27-
</div>
28-
<div class="row">
29-
<div class="col-sm-3">
30-
<div class="form-group">
31-
<label class="label"> {{ 'PROPOSALS_PAGE.REGISTER.TEMPLATE' | translate }}</label>
32-
<ngx-proposal-template-select
33-
(selectedChange)="onProposalTemplateChange($event)"
34-
[ngModelOptions]="{ standalone: true }"
35-
[(ngModel)]="proposalTemplateId"
36-
[employeeId]="selectedEmployee?.id"
37-
></ngx-proposal-template-select>
29+
<div class="row">
30+
<div class="col-sm-3">
31+
<div class="form-group">
32+
<label class="label"> {{ 'PROPOSALS_PAGE.REGISTER.TEMPLATE' | translate }}</label>
33+
<ngx-proposal-template-select
34+
(selectedChange)="onProposalTemplateChange($event)"
35+
[ngModelOptions]="{ standalone: true }"
36+
[(ngModel)]="proposalTemplateId"
37+
[employeeId]="selectedEmployee?.id"
38+
></ngx-proposal-template-select>
39+
</div>
3840
</div>
39-
</div>
40-
<div class="col-sm-3">
41-
<div class="form-group">
42-
<label class="label">{{ 'POP_UPS.CONTACT' | translate }}</label>
43-
<ga-contact-select
44-
[addTag]="true"
45-
[searchable]="true"
46-
(onChanged)="selectOrganizationContact($event)"
47-
[placeholder]="'POP_UPS.CONTACT' | translate"
48-
formControlName="organizationContact"
49-
>
50-
</ga-contact-select>
41+
<div class="col-sm-3">
42+
<div class="form-group">
43+
<label class="label">{{ 'POP_UPS.CONTACT' | translate }}</label>
44+
<ga-contact-select
45+
[addTag]="true"
46+
[searchable]="true"
47+
(onChanged)="selectOrganizationContact($event)"
48+
[placeholder]="'POP_UPS.CONTACT' | translate"
49+
formControlName="organizationContact"
50+
>
51+
</ga-contact-select>
52+
</div>
5153
</div>
5254
</div>
53-
</div>
54-
<div class="row">
55-
<div class="col-xl-6">
56-
<div class="form-group">
57-
<label class="label">{{ 'PROPOSALS_PAGE.REGISTER.JOB_POST_URL' | translate }} </label>
58-
<input
59-
nbInput
60-
fullWidth
61-
type="text"
62-
[placeholder]="'PROPOSALS_PAGE.REGISTER.JOB_POST_URL' | translate"
63-
formControlName="jobPostUrl"
64-
autocomplete="on"
65-
/>
55+
<div class="row">
56+
<div class="col-xl-6">
57+
<div class="form-group">
58+
<label class="label">{{ 'PROPOSALS_PAGE.REGISTER.JOB_POST_URL' | translate }} </label>
59+
<input
60+
nbInput
61+
fullWidth
62+
type="text"
63+
[placeholder]="'PROPOSALS_PAGE.REGISTER.JOB_POST_URL' | translate"
64+
formControlName="jobPostUrl"
65+
autocomplete="on"
66+
/>
67+
</div>
6668
</div>
67-
</div>
68-
<div class="col-sm-3">
69-
<div class="form-group">
70-
<label class="label">{{ 'PROPOSALS_PAGE.REGISTER.PROPOSAL_DATE' | translate }} </label>
71-
<input
72-
formControlName="valueDate"
73-
nbInput
74-
fullWidth
75-
[placeholder]="'PROPOSALS_PAGE.REGISTER.PROPOSAL_DATE' | translate"
76-
[nbDatepicker]="valueDatePicker"
77-
/>
78-
<nb-datepicker [min]="minDate" #valueDatePicker></nb-datepicker>
69+
<div class="col-sm-3">
70+
<div class="form-group">
71+
<label class="label">{{ 'PROPOSALS_PAGE.REGISTER.PROPOSAL_DATE' | translate }} </label>
72+
<input
73+
formControlName="valueDate"
74+
nbInput
75+
fullWidth
76+
[placeholder]="'PROPOSALS_PAGE.REGISTER.PROPOSAL_DATE' | translate"
77+
[nbDatepicker]="valueDatePicker"
78+
/>
79+
<nb-datepicker [min]="minDate" #valueDatePicker></nb-datepicker>
80+
</div>
81+
</div>
82+
<div class="col-sm-3">
83+
<ga-tags-color-input
84+
[selectedTags]="form.get('tags').value"
85+
(selectedTagsEvent)="selectedTagsEvent($event)"
86+
[isOrgLevel]="true"
87+
></ga-tags-color-input>
7988
</div>
8089
</div>
81-
<div class="col-sm-3">
82-
<ga-tags-color-input
83-
[selectedTags]="form.get('tags').value"
84-
(selectedTagsEvent)="selectedTagsEvent($event)"
85-
[isOrgLevel]="true"
86-
></ga-tags-color-input>
87-
</div>
88-
</div>
89-
<div class="row">
90-
<div class="col-xl-6">
91-
<nb-card>
92-
<nb-card-header>
93-
{{ 'PROPOSALS_PAGE.REGISTER.JOB_POST_CONTENT' | translate }}
94-
</nb-card-header>
95-
<nb-card-body>
96-
<ckeditor formControlName="jobPostContent" [config]="ckConfig"></ckeditor>
97-
</nb-card-body>
98-
</nb-card>
99-
</div>
100-
<div div class="col-xl-6">
101-
<nb-card>
102-
<nb-card-header>
103-
{{ 'PROPOSALS_PAGE.REGISTER.PROPOSALS_CONTENT' | translate }}
104-
</nb-card-header>
105-
<nb-card-body>
106-
<ckeditor formControlName="proposalContent" [config]="ckConfig"></ckeditor>
107-
</nb-card-body>
108-
</nb-card>
90+
<div class="row">
91+
<div class="col-xl-6">
92+
<nb-card>
93+
<nb-card-header>
94+
{{ 'PROPOSALS_PAGE.REGISTER.JOB_POST_CONTENT' | translate }}
95+
</nb-card-header>
96+
<nb-card-body>
97+
<ckeditor formControlName="jobPostContent" [config]="ckConfig"></ckeditor>
98+
</nb-card-body>
99+
</nb-card>
100+
</div>
101+
<div div class="col-xl-6">
102+
<nb-card>
103+
<nb-card-header>
104+
{{ 'PROPOSALS_PAGE.REGISTER.PROPOSALS_CONTENT' | translate }}
105+
</nb-card-header>
106+
<nb-card-body>
107+
<ckeditor formControlName="proposalContent" [config]="ckConfig"></ckeditor>
108+
</nb-card-body>
109+
</nb-card>
110+
</div>
109111
</div>
110112
</div>
111113
</form>

‎packages/plugins/job-proposal-ui/src/lib/proposal/components/proposal-register/proposal-register.component.scss‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@import 'gauzy/_gauzy-cards';
2+
@import 'gauzy/_gauzy-overrides';
23

34
.register-btn {
45
margin: 20px;
@@ -56,13 +57,10 @@
5657
@include nb-rtl(margin, 3px 0 0 0 !important);
5758
}
5859
}
59-
@include card-overrides(
60-
overlay,
61-
calc($default-card-height + 1.5rem),
62-
$default-radius
63-
);
60+
@include card-overrides(overlay, calc($default-card-height + 1.5rem), $default-radius);
6461
.card,
6562
.card-body {
6663
background: var(--gauzy-card-2);
6764
}
65+
@include input-appearance(42px, var(--gauzy-card-1));
6866
}

0 commit comments

Comments
 (0)