Skip to content

Commit

Permalink
Merge branch 'main' into update-ivc-readme
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelclement authored Jan 6, 2025
2 parents 245fce3 + 770092b commit 02f767c
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
16 changes: 8 additions & 8 deletions src/applications/gi/components/profile/InstitutionProfile.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,13 @@ export default function InstitutionProfile({
jumpToId="calculate-your-benefits"
/>
)}
{institution.yr === true &&
toggleValue && (
<JumpLink
label="Yellow Ribbon Program information"
jumpToId="yellow-ribbon-program-information"
/>
)}
<JumpLink
label="Getting started with benefits"
jumpToId="getting-started-with-benefits"
Expand All @@ -167,13 +174,6 @@ export default function InstitutionProfile({
label="Contact information"
jumpToId="contact-information"
/>
{institution.yr === true &&
toggleValue && (
<JumpLink
label="Yellow Ribbon Program information"
jumpToId="yellow-ribbon-program-information"
/>
)}
</div>
</div>
{showSchoolContentBasedOnType(type) &&
Expand Down Expand Up @@ -214,7 +214,7 @@ export default function InstitutionProfile({
of higher learning (IHL). Schools that choose to participate in
the Yellow Ribbon program will contribute up to a certain dollar
amount toward the extra tuition. VA will match the participating
school’s contribution{' '}
school’s contribution
{type === 'FOREIGN' && `${` `}in United States Dollars (USD)`}, up
to the total cost of the tuition and fees. To confirm the number
of students eligible for funding, contact the individual school.
Expand Down
5 changes: 5 additions & 0 deletions src/applications/gi/sass/gi.scss
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,7 @@
height: auto;
display: flex;
width: 100%;
max-width: 305px;
.degree-level-card {
flex: 1;
width: 100%;
Expand All @@ -441,6 +442,10 @@
@media screen and (max-width: $medium-screen) {
.degree-level-results {
flex-direction: column;
.degree-item {
width: 100%;
max-width: 100%;
}
}
}
}
4 changes: 4 additions & 0 deletions src/applications/ivc-champva/10-10D/containers/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ const breadcrumbList = [
href: `/family-and-caregiver-benefits/health-and-disability/champva`,
label: `CHAMPVA benefits`,
},
{
href: `#content`,
label: `Apply for CHAMPVA benefits`,
},
];

export default function App({ location, children }) {
Expand Down
2 changes: 1 addition & 1 deletion src/applications/verify-your-enrollment/actions/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ export const verifyEnrollmentAction = verifications => {
verifiedThroughDate: lastVerification?.verificationEndDate,
verificationMethod: 'VYE',
appCommunication: {
responseype: 'Y',
responseType: 'Y',
},
};
})()
Expand Down
9 changes: 0 additions & 9 deletions src/platform/site-wide/user-nav/sass/user-nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -218,15 +218,6 @@
}

.login.login-modal {
// temporary solution until DST can fix va-modal large property
margin-left: -1rem;
margin-right: 4rem;

@include media($medium-screen) {
margin-left: unset;
margin-right: unset;
}

.downtime-notification.row {
margin: 0 0 1em;
}
Expand Down

0 comments on commit 02f767c

Please sign in to comment.