Skip to content

Commit

Permalink
Fixing Kondo issues with Gift Entry
Browse files Browse the repository at this point in the history
  • Loading branch information
lparrott committed Jan 7, 2025
1 parent e66e565 commit 6e24019
Show file tree
Hide file tree
Showing 11 changed files with 70 additions and 70 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
class="slds-p-top_small"
padding="horizontal-small">
<div>
<h1 class="slds-text-title_bold">{tableTitle}</h1>
<h1 class="slds-card__header-title">{tableTitle}</h1>
</div>
</lightning-layout-item>
<lightning-layout-item size=2
Expand Down Expand Up @@ -54,8 +54,7 @@ <h1 class="slds-text-title_bold">{tableTitle}</h1>
</c-util-progress-bar>
</lightning-layout-item>
</lightning-layout>

<div style="height: 20rem;">
<div style="height: 20rem;" class="slds-p-top_small">
<template if:true={isLoading}>
<lightning-spinner alternative-text={CUSTOM_LABELS.geAssistiveSpinner}
variant='brand'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<lightning-spinner alternative-text={CUSTOM_LABELS.geAssistiveSpinner}></lightning-spinner>
</template>

<lightning-layout-item class="slds-p-horizontal_small"
<lightning-layout-item class="slds-p-around_small"
size="12">
<p class="slds-text-body_regular">
{CUSTOM_LABELS.geBodyMatchingSelectRecord}
<button class="slds-button slds-p-left_xx-small"
<a class="slds-p-left_xx-small"
onclick={handleNewOpportunity}
data-qa-locator={qaLocatorNewOpportunity}>
{CUSTOM_LABELS.geButtonMatchingNewOpportunity}
</button>
</a>
</p>
</lightning-layout-item>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
text-align: center;
vertical-align: middle;
justify-content: center;
border: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-border-1, var(--lwc-colorBorder, rgb(221, 219, 218)));
/* border: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-border-1, var(--lwc-colorBorder, rgb(221, 219, 218))); */
transition: border .15s linear;
border-color: var(--slds-g-color-border-1, var(--lwc-colorBorder, rgb(221, 219, 218)));
/* border-color: var(--slds-g-color-border-1, var(--lwc-colorBorder, rgb(221, 219, 218))); */
background-color: var(--slds-g-color-surface-container-1, var(--lwc-colorBackgroundAlt, rgb(255, 255, 255)));
}

Expand All @@ -42,6 +42,12 @@
margin: 0;
padding-top: 0.25rem;
padding-bottom: 0.25rem;
border-radius: inherit;
}

.bottom-button {
border-bottom-left-radius: var(--slds-c-card-radius-border,var(--slds-s-container-radius-border, var(--slds-g-radius-border-2)));
border-bottom-right-radius: var(--slds-c-card-radius-border,var(--slds-s-container-radius-border, var(--slds-g-radius-border-2)));
}

.slds-border_extension-bottom {
Expand All @@ -52,4 +58,8 @@
background-color: var(--slds-g-color-surface-container-1, var(--lwc-colorBackgroundAlt, rgb(255, 255, 255)));
color: var(--slds-g-color-neutral-base-90, rgb(221, 219, 218));
cursor: default;
}

.slds-card.slds-card_boundary {
border-color: var(--slds-g-color-border-1, var(--lwc-colorBorder, rgb(221, 219, 218)));
}
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
{CUSTOM_LABELS.geButtonMatchingNewPayment}
</button>
<button slot="footer"
class="slds-button slds-button_neutral slds-button_extension"
class="slds-button slds-button_neutral slds-button_extension bottom-button"
onclick={handleUpdateOpportunity}
data-id={opportunity.Name}
data-qa-locator={qaLocatorUpdateOpportunity}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,10 @@
padding-top: 0.25rem;
padding-bottom: 0.25rem;
border: none;
border-radius: var(--slds-g-radius-border-2, 0.25rem);
border-bottom-left-radius: var(--slds-c-card-radius-border,var(--slds-s-container-radius-border, var(--slds-g-radius-border-2)));
border-bottom-right-radius: var(--slds-c-card-radius-border,var(--slds-s-container-radius-border, var(--slds-g-radius-border-2)));
}

.slds-border_extension-bottom {
border-bottom: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-border-1, var(--lwc-colorBorder, rgb(221, 219, 218)));
.slds-card.slds-card_boundary {
border-color: var(--slds-g-color-border-1, var(--lwc-colorBorder, rgb(221, 219, 218)));
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
.slds-box_extension {
padding: 1rem;
}

.slds-box_extension-2 {
padding: 1rem;
padding-bottom: 0.5rem;
}

.slds-button_margin-extension {
margin-left: 1.75rem;
}
.slds-button_extension {
border-radius: initial;
}
66 changes: 33 additions & 33 deletions force-app/main/default/lwc/geReviewDonations/geReviewDonations.html
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
<template>
<template if:false={giftInViewHasSchedule}>
<template if:true={hasPendingDonations}>
<article class={reviewDonationsComputedClass}>
<lightning-layout vertical-align="center"
multiple-rows="true">
<lightning-layout-item size="12">
<span class="slds-text-body_regular"
role="alert">
<lightning-icon class="slds-m-right_small"
icon-name="utility:info"
size="x-small">
</lightning-icon>
{reviewDonationsMessage}
<template if:true={showDonorLink}>
<button class="slds-button slds-m-left_xx-small"
onclick={navigateToRecord}
data-qa-locator={qaLocatorSelectedDonation}>
{selectedDonation.Name}
</button>
</template>
</span>
<lightning-layout vertical-align="center"
multiple-rows="true">
<lightning-layout-item size="12"
class="slds-scoped-notification slds-media slds-media_center slds-theme_info slds-m-bottom_small">
<div class="slds-media__figure"
role="alert">
<lightning-icon icon-name="utility:info"
size="x-small">
</lightning-icon>
</div>
<div class="slds-media__body">
{reviewDonationsMessage}
<template if:true={showDonorLink}>
<a class="slds-m-left_xx-small"
onclick={navigateToRecord}
data-qa-locator={qaLocatorSelectedDonation}>
{selectedDonation.Name}
</a>
</template>
<template if:false={hasSelectedDonation}>
<span>
<button class="slds-button slds-m-left_xx-small"
<a class="slds-m-left_xx-small"
onclick={openReviewDonationsModal}
data-qa-locator={qaLocatorReviewDonations}>
{CUSTOM_LABELS.geButtonMatchingReviewDonations}
</button>
</a>
</span>
</template>
</lightning-layout-item>
<template if:true={hasSelectedDonation}>
<lightning-layout-item size="12">
<button class="slds-button slds-button_margin-extension"
onclick={openReviewDonationsModal}
data-qa-locator={qaLocatorDifferentSelection}>
{CUSTOM_LABELS.geButtonMatchingUpdateDonationSelection}
</button>
</lightning-layout-item>
</template>
</lightning-layout>
</article>
<template if:true={hasSelectedDonation}>
<div class="slds-p-top_small">
<a class=""
onclick={openReviewDonationsModal}
data-qa-locator={qaLocatorDifferentSelection}>
{CUSTOM_LABELS.geButtonMatchingUpdateDonationSelection}
</a>
</div>
</template>
</div>
</lightning-layout-item>
</lightning-layout>
</template>
</template>
</template>
12 changes: 0 additions & 12 deletions force-app/main/default/lwc/geReviewDonations/geReviewDonations.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,6 @@ export default class geReviewDonations extends NavigationMixin(LightningElement)
return this.opportunities && this.opportunities.length > 0;
}

get reviewDonationsComputedClass() {
let baseClass = ['slds-box', 'slds-theme_shade', 'slds-m-bottom_small'];

if (this.hasSelectedDonation) {
baseClass.push('slds-box_extension-2');
} else {
baseClass.push('slds-box_extension');
}

return baseClass.join(' ');
}

get isUpdatingPayment() {
return this._donationType === PAYMENT.objectApiName;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ <h3 class="slds-section__title slds-theme_shade">
class="slds-section__content">
<template if:true={hasRequiredFields}>
<c-util-page-level-message title={CUSTOM_LABELS.geWarningFormFieldsModalDeleteSection}
variant="warning">
variant="warning"
icon-size="small"
icon-name="utility:warning">
</c-util-page-level-message>
</template>
<template if:false={hasRequiredFields}>
Expand Down
4 changes: 2 additions & 2 deletions force-app/main/default/lwc/gseuTrailhead/gseuTrailhead.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ p {
margin-right: 70px;
margin-top: 13px;
margin-bottom: 16px;
font-size: 16px;
font-size: var(--slds-g-font-scale-2, 16px);
}

.button {
width: calc(100% - 60px);
height: 3rem;
margin-left: 30px;
margin-right: 30px;
font-size: 17px;
font-size: var(--slds-g-font-scale-2, 16px);
}
8 changes: 7 additions & 1 deletion force-app/main/default/lwc/utilCard/utilCard.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
.slds-card_extension_active {
.slds-card.slds-card_boundary.slds-card_extension_active {
border: var(--slds-g-radius-border-1, 2px) solid var(--slds-g-color-brand-base-60, #1589ee);
}
.slds-card.slds-card_boundary {
border-color: var(--slds-g-color-border-1, var(--lwc-colorBorder, rgb(221, 219, 218)));
}
.slds-card__footer {
display: block;
}

0 comments on commit 6e24019

Please sign in to comment.