Skip to content

Commit

Permalink
merge with main
Browse files Browse the repository at this point in the history
  • Loading branch information
nfpappas-oddball committed Oct 2, 2024
2 parents 63ce7a4 + 670f796 commit 075731c
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 22 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/content-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,6 @@ jobs:
touch sitemap-nb.xml
fi
- name: setup bucket descriptor
id: bucket-descriptor
run: |
Expand Down
2 changes: 1 addition & 1 deletion src/templates/components/personProfile/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ export const StaffNewsProfile = ({
}: PersonProfileTeaserProps): JSX.Element => {
return (
<div className="vads-u-font-size--sm vads-u-margin-bottom--2p5">
<div className="authored-by-line vads-u-margin-bottom--0p5 vads-u-font-weight--bold">
<div className="vads-u-margin-bottom--0p5 vads-u-font-weight--bold">
By {title}
{description ? `, ${description}` : null}
</div>
Expand Down
3 changes: 1 addition & 2 deletions src/templates/components/wysiwyg/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ export function WysiwygField({ className, html }: FormattedWysiwygField) {
export function Wysiwyg({
entityId,
html,
className = 'processed-content',
}: ParagraphComponent<FormattedWysiwyg>) {
if (!isValidData(html)) return

Expand All @@ -38,7 +37,7 @@ export function Wysiwyg({
data-paragraph-type="paragraph--wysiwyg"
data-next-component="templates/components/wysiwyg"
>
<WysiwygField html={html} className={className} />
<WysiwygField html={html} />
</div>
)
}
1 change: 0 additions & 1 deletion src/templates/layouts/event/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,6 @@ export const Event = ({
</p>
<va-link
calendar
className="recurrent-event"
data-description={description}
data-end={dateRange?.endValue}
data-location={directionsString}
Expand Down
6 changes: 1 addition & 5 deletions src/templates/layouts/eventListing/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,7 @@ export function EventListing({

<h1 id="article-heading">{title}</h1>
<div className="va-introtext">
{introText && (
<p className="events-show" id="office-events-description">
{introText}
</p>
)}
{introText && <p id="office-events-description">{introText}</p>}
</div>
</div>

Expand Down
4 changes: 2 additions & 2 deletions src/templates/layouts/newsStory/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const NewsStory = ({
{caption}
</div>
{author && <StaffNewsProfile {...author} />}
<div className="created-line vads-u-margin-bottom--2p5">
<div className="vads-u-margin-bottom--2p5">
<time dateTime={formatDate(date)}>{formatDate(date)}</time>
</div>

Expand All @@ -57,7 +57,7 @@ export const NewsStory = ({
<p>{introText}</p>
</div>
<div
className="full-story"
className=""
dangerouslySetInnerHTML={{
__html: bodyContent,
}}
Expand Down
6 changes: 1 addition & 5 deletions src/templates/layouts/pressReleaseListing/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,7 @@ export function PressReleaseListing({
<h1 id="article-heading">{title}</h1>
<div className="vads-l-grid-container--full">
<div className="va-introtext">
{introText && (
<p className="events-show" id="office-events-description">
{introText}
</p>
)}
{introText && <p id="office-events-description">{introText}</p>}
</div>
<ul className="usa-unstyled-list">{pressReleaseTeasers}</ul>
{totalPages > 1 && (
Expand Down
2 changes: 1 addition & 1 deletion src/templates/layouts/storyListing/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export function StoryListing({
<h1>{title}</h1>
<div className="vads-l-grid-container--full">
<div className="va-introtext">
{introText && <p className="events-show">{introText}</p>}
{introText && <p>{introText}</p>}
</div>
<div className="vads-l-grid-container--full">
<ul className="usa-unstyled-list">{storyTeasers}</ul>
Expand Down
4 changes: 1 addition & 3 deletions src/templates/layouts/vetCenter/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,7 @@ export function VetCenter({
<>
<h1 aria-describedby="vet-center-title">{title}</h1>
{officialName && title !== officialName && (
<p id="vet-center-title" className="field-official-name">
Also called the {officialName}
</p>
<p id="vet-center-title">Also called the {officialName}</p>
)}
</>
)}
Expand Down

0 comments on commit 075731c

Please sign in to comment.