Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nisha | Stage | Linked account design is not correct on integration > payment page #14034

Open
wants to merge 4 commits into
base: beta-stage
Choose a base branch
from
Open

Nisha | Stage | Linked account design is not correct on integration > payment page #14034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5777874
linked account design changes
nisha-walkover Oct 4, 2024
0e4b51e
input & dropdown field background color add
nisha-walkover Oct 5, 2024
15dfb84
dropdown field hover change
nisha-walkover Oct 5, 2024
761c928
input field global change color
nisha-walkover Oct 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions apps/web-giddh/src/app/settings/integration/setting.integration.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ <h3 class="mb-1">{{localeData?.payment?.permission_message}}</h3>
class="account-wrapper"
*ngFor="let bankAccount of connectedBankAccounts; trackBy: trackByAccountUniqueName"
>
<div class="account-info-background width-100 font-15 row align-items-end">
<div class="account-info-background width-100 font-15 row align-items-center">
<div class="col-md-4">
<span class="field-label">{{ bankAccount?.bankName }}</span
><br />
Expand Down Expand Up @@ -493,7 +493,7 @@ <h3 class="mb-1">{{localeData?.payment?.permission_message}}</h3>
"
></dropdown-field>
</div>
<span class="mr-l1 action-div" *ngIf="!isIciciBankSupportedCountry">
<ng-container *ngIf="!isIciciBankSupportedCountry">
<a
*ngIf="!isGocardlessSupportedCountry && hasIntegrationScope"
href="javascript:;"
Expand All @@ -503,7 +503,7 @@ <h3 class="mb-1">{{localeData?.payment?.permission_message}}</h3>
<i
*ngIf="isGocardlessSupportedCountry && hasIntegrationScope"
(click)="deleteBankAccount(bankAccount)"
class="icon-trash ml-1 mr-r2 cursor-pointer"
class="icon-trash cursor-pointer"
></i>
<ng-container *ngIf="bankAccount.reLoginRequired">
<button
Expand All @@ -524,7 +524,7 @@ <h3 class="mb-1">{{localeData?.payment?.permission_message}}</h3>
</button>
</mat-menu>
</ng-container>
</span>
</ng-container>
<div class="col-md-4 d-flex flex-column" *ngIf="isIciciBankSupportedCountry">
<span class="field-label"
>{{ localeData?.payment?.payment_updates }}<br
Expand Down
4 changes: 0 additions & 4 deletions apps/web-giddh/src/assets/css/global/add-company.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
.mat-mdc-form-field {
background-color: var(--color-primary-input-bar-background) !important;
}

.dropdown-bg {
background-color: transparent !important;
}
}
.create-company {
.options-line {
Expand Down
42 changes: 21 additions & 21 deletions apps/web-giddh/src/assets/css/global/input-dropdown-field.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ report-filters,
}

.mat-mdc-form-field {
background-color: var(--color-white) !important;
border-radius: 4px;

.mat-mdc-text-field-wrapper {
.mat-form-field-underline {
display: block !important;
Expand Down Expand Up @@ -233,16 +236,8 @@ report-filters,
}

.mat-mdc-form-field {
&.mat-focused {
background-color: transparent;

.mat-text-field--focused {
background-color: transparent;
}
}

&:hover {
background-color: transparent;

.mat-mdc-form-field-focus-overlay {
opacity: 0;
Expand Down Expand Up @@ -294,12 +289,6 @@ giddh-datepicker,
}
}

.mdc-text-field--filled {
&:not(.mdc-text-field--disabled) {
background-color: transparent !important;
}
}

.mat-mdc-form-field-subscript-wrapper {
display: none;
}
Expand Down Expand Up @@ -393,13 +382,13 @@ add-company {
}
}

.mat-mdc-option {
&:focus {
&.mdc-list-item {
background-color: transparent !important;
}
}
}
// .mat-mdc-option {
// &:focus {
// &.mdc-list-item {
// background-color: transparent !important;
// }
// }
// }

ngx-mat-select-search {
.mat-select-search-inner {
Expand Down Expand Up @@ -656,4 +645,15 @@ input-field {
}
}
}
}

.readonly-field {
.dropdown-bg {
display: none !important;
}

.mat-mdc-form-field,
.mat-mdc-form-field input{
background-color: var(--color-primary-input-bar-background) !important;
}
}
13 changes: 0 additions & 13 deletions apps/web-giddh/src/assets/css/style-2.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13400,19 +13400,6 @@ voucher-component {
.custom-btn {
color: var(--color-black);
}
.readonly-field {
.dropdown-bg {
display: none !important;
}

.mat-mdc-form-field {
background-color: var(--color-primary-input-bar-background) !important;
}

.dropdown-bg {
background-color: transparent !important;
}
}

.new-branch-transfer-page {
.cdk-overlay-container {
Expand Down
Loading