Skip to content

Commit

Permalink
Merge pull request #8738 from ever-co/fix/#8572-dark-scheme-display
Browse files Browse the repository at this point in the history 
[Fix] Author and Contact Field Values Not Displaying in Dark Scheme
  • Loading branch information
@rahul-rocket
rahul-rocket authored Jan 21, 2025
2 parents c637575 + ff73131 commit eed73f3
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 94 deletions.
180 changes: 91 additions & 89 deletions ...roposal-ui/src/lib/proposal/components/proposal-register/proposal-register.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,103 +9,105 @@ <h4>
</nb-card-header>
<nb-card-body class="card-body">
<form [formGroup]="form" #proposalForm="ngForm" (ngSubmit)="registerProposal()">
<div class="row">
<div class="col-sm-3">
<div class="form-group">
<label class="label">
{{ 'PROPOSALS_PAGE.REGISTER.AUTHOR' | translate }}
</label>
<ga-employee-selector
id="authorInput"
class="employees"
[skipGlobalChange]="true"
[defaultSelected]="true"
(selectionChanged)="selectionEmployee($event)"
></ga-employee-selector>
<div class="container">
<div class="row">
<div class="col-sm-3">
<div class="form-group">
<label class="label">
{{ 'PROPOSALS_PAGE.REGISTER.AUTHOR' | translate }}
</label>
<ga-employee-selector
id="authorInput"
class="employees"
[skipGlobalChange]="true"
[defaultSelected]="true"
(selectionChanged)="selectionEmployee($event)"
></ga-employee-selector>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-3">
<div class="form-group">
<label class="label"> {{ 'PROPOSALS_PAGE.REGISTER.TEMPLATE' | translate }}</label>
<ngx-proposal-template-select
(selectedChange)="onProposalTemplateChange($event)"
[ngModelOptions]="{ standalone: true }"
[(ngModel)]="proposalTemplateId"
[employeeId]="selectedEmployee?.id"
></ngx-proposal-template-select>
<div class="row">
<div class="col-sm-3">
<div class="form-group">
<label class="label"> {{ 'PROPOSALS_PAGE.REGISTER.TEMPLATE' | translate }}</label>
<ngx-proposal-template-select
(selectedChange)="onProposalTemplateChange($event)"
[ngModelOptions]="{ standalone: true }"
[(ngModel)]="proposalTemplateId"
[employeeId]="selectedEmployee?.id"
></ngx-proposal-template-select>
</div>
</div>
</div>
<div class="col-sm-3">
<div class="form-group">
<label class="label">{{ 'POP_UPS.CONTACT' | translate }}</label>
<ga-contact-select
[addTag]="true"
[searchable]="true"
(onChanged)="selectOrganizationContact($event)"
[placeholder]="'POP_UPS.CONTACT' | translate"
formControlName="organizationContact"
>
</ga-contact-select>
<div class="col-sm-3">
<div class="form-group">
<label class="label">{{ 'POP_UPS.CONTACT' | translate }}</label>
<ga-contact-select
[addTag]="true"
[searchable]="true"
(onChanged)="selectOrganizationContact($event)"
[placeholder]="'POP_UPS.CONTACT' | translate"
formControlName="organizationContact"
>
</ga-contact-select>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-xl-6">
<div class="form-group">
<label class="label">{{ 'PROPOSALS_PAGE.REGISTER.JOB_POST_URL' | translate }} </label>
<input
nbInput
fullWidth
type="text"
[placeholder]="'PROPOSALS_PAGE.REGISTER.JOB_POST_URL' | translate"
formControlName="jobPostUrl"
autocomplete="on"
/>
<div class="row">
<div class="col-xl-6">
<div class="form-group">
<label class="label">{{ 'PROPOSALS_PAGE.REGISTER.JOB_POST_URL' | translate }} </label>
<input
nbInput
fullWidth
type="text"
[placeholder]="'PROPOSALS_PAGE.REGISTER.JOB_POST_URL' | translate"
formControlName="jobPostUrl"
autocomplete="on"
/>
</div>
</div>
</div>
<div class="col-sm-3">
<div class="form-group">
<label class="label">{{ 'PROPOSALS_PAGE.REGISTER.PROPOSAL_DATE' | translate }} </label>
<input
formControlName="valueDate"
nbInput
fullWidth
[placeholder]="'PROPOSALS_PAGE.REGISTER.PROPOSAL_DATE' | translate"
[nbDatepicker]="valueDatePicker"
/>
<nb-datepicker [min]="minDate" #valueDatePicker></nb-datepicker>
<div class="col-sm-3">
<div class="form-group">
<label class="label">{{ 'PROPOSALS_PAGE.REGISTER.PROPOSAL_DATE' | translate }} </label>
<input
formControlName="valueDate"
nbInput
fullWidth
[placeholder]="'PROPOSALS_PAGE.REGISTER.PROPOSAL_DATE' | translate"
[nbDatepicker]="valueDatePicker"
/>
<nb-datepicker [min]="minDate" #valueDatePicker></nb-datepicker>
</div>
</div>
<div class="col-sm-3">
<ga-tags-color-input
[selectedTags]="form.get('tags').value"
(selectedTagsEvent)="selectedTagsEvent($event)"
[isOrgLevel]="true"
></ga-tags-color-input>
</div>
</div>
<div class="col-sm-3">
<ga-tags-color-input
[selectedTags]="form.get('tags').value"
(selectedTagsEvent)="selectedTagsEvent($event)"
[isOrgLevel]="true"
></ga-tags-color-input>
</div>
</div>
<div class="row">
<div class="col-xl-6">
<nb-card>
<nb-card-header>
{{ 'PROPOSALS_PAGE.REGISTER.JOB_POST_CONTENT' | translate }}
</nb-card-header>
<nb-card-body>
<ckeditor formControlName="jobPostContent" [config]="ckConfig"></ckeditor>
</nb-card-body>
</nb-card>
</div>
<div div class="col-xl-6">
<nb-card>
<nb-card-header>
{{ 'PROPOSALS_PAGE.REGISTER.PROPOSALS_CONTENT' | translate }}
</nb-card-header>
<nb-card-body>
<ckeditor formControlName="proposalContent" [config]="ckConfig"></ckeditor>
</nb-card-body>
</nb-card>
<div class="row">
<div class="col-xl-6">
<nb-card>
<nb-card-header>
{{ 'PROPOSALS_PAGE.REGISTER.JOB_POST_CONTENT' | translate }}
</nb-card-header>
<nb-card-body>
<ckeditor formControlName="jobPostContent" [config]="ckConfig"></ckeditor>
</nb-card-body>
</nb-card>
</div>
<div div class="col-xl-6">
<nb-card>
<nb-card-header>
{{ 'PROPOSALS_PAGE.REGISTER.PROPOSALS_CONTENT' | translate }}
</nb-card-header>
<nb-card-body>
<ckeditor formControlName="proposalContent" [config]="ckConfig"></ckeditor>
</nb-card-body>
</nb-card>
</div>
</div>
</div>
</form>
Expand Down
8 changes: 3 additions & 5 deletions ...roposal-ui/src/lib/proposal/components/proposal-register/proposal-register.component.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import 'gauzy/_gauzy-cards';
@import 'gauzy/_gauzy-overrides';

.register-btn {
margin: 20px;
Expand Down Expand Up @@ -56,13 +57,10 @@
@include nb-rtl(margin, 3px 0 0 0 !important);
}
}
@include card-overrides(
overlay,
calc($default-card-height + 1.5rem),
$default-radius
);
@include card-overrides(overlay, calc($default-card-height + 1.5rem), $default-radius);
.card,
.card-body {
background: var(--gauzy-card-2);
}
@include input-appearance(42px, var(--gauzy-card-1));
}

0 comments on commit eed73f3

Please sign in to comment.