Skip to content

Commit

Permalink
Merge pull request #165 from GSA/wwang-issue135
Browse files Browse the repository at this point in the history 
update home page links
  • Loading branch information
@weiwang-gsa
weiwang-gsa authored Jul 6, 2023
2 parents 7f82fda + 61bc620 commit f9b839f
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 38 deletions.
2 changes: 1 addition & 1 deletion public/styles/styles.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/styles/styles.css.map
View file

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion sass/_components/home.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@
}
}


.usa-nav__submenu{
width: 16rem;
}
// based on new design, h1-h3 are using Merriweather and use base darkest color
h1, h2, h3{
font-family: family('serif');
Expand Down
2 changes: 1 addition & 1 deletion src/components/Businesslines.astro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import yellowcard from "../assets/images/yellow-card.svg"
</div>
<div class="tablet:grid-col-6 align-items-center">
<div class="padding-left-1">
<a class="usa-button usa-button--outline usa-button--inverse" href="#">Learn more about business lines</a>
<a class="usa-button usa-button--outline usa-button--inverse" href={`${import.meta.env.BASE_URL}about/business-lines`}>Learn more about business lines</a>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Callout.astro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import callout_forum from '../assets/images/callout_forum.svg'
<div class="tablet:grid-col-6">
<h2 class="margin-top-0">State Tax Information</h2>
<p>Check the tax-exempt status and policies of U.S. states and territories.</p>
<p><a href="#">Go to tax information</a></p>
<p><a href={`${import.meta.env.BASE_URL}smarttax/state-tax-forms`}>Go to tax information</a></p>
</div>
</div>
<div class="grid-row grid-gap">
Expand All @@ -43,7 +43,7 @@ import callout_forum from '../assets/images/callout_forum.svg'
<span class="base-color">June 13-15, 2023</span>
<p>This three-day virtual event will feature comprehensive training covering all aspects of how to successfully manage your charge card program.
</p>
<p><a href="#">Go to event</a></p>
<p><a href={`${import.meta.env.BASE_URL}events/gsa-smartpay-forum`}>Go to event</a></p>
</div>
</div>
</div>
Expand Down
78 changes: 48 additions & 30 deletions src/components/GSAHeader.astro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,28 @@ import searchIcon from "../assets/images/usa-icons/search--white.svg"
</button>
<ul id="extended-nav-section-about" class="usa-nav__submenu">
<li class="usa-nav__submenu-item">
<a href=""><span class="margin-x-1">&lt;Navigation link&gt;</span></a>
<a href={`${import.meta.env.BASE_URL}about/`}><span class="margin-x-1">About GSA SmartPay</span></a>
</li>
<li class="usa-nav__submenu-item">
<a href=""><span class="margin-x-1">&lt;Navigation link&gt;</span></a>
<a href={`${import.meta.env.BASE_URL}about/benefits`}><span class="margin-x-1">Benefits of the Program </span></a>
</li>
<li class="usa-nav__submenu-item">
<a href={`${import.meta.env.BASE_URL}about/business-lines`}><span class="margin-x-1">Business Lines</span></a>
</li>
<li class="usa-nav__submenu-item">
<a href={`${import.meta.env.BASE_URL}about/master-contract`}><span class="margin-x-1">Master Contract</span></a>
</li>
<li class="usa-nav__submenu-item">
<a href={`${import.meta.env.BASE_URL}about/logos`}><span class="margin-x-1">Logos and Designs</span></a>
</li>
<li class="usa-nav__submenu-item">
<a href={`${import.meta.env.BASE_URL}about/refunds`}><span class="margin-x-1">Refunds</span></a>
</li>
<li class="usa-nav__submenu-item">
<a href={`${import.meta.env.BASE_URL}about/strategic-payment-solutions`}><span class="margin-x-1">Strategic Payment Solutions</span></a>
</li>
<li class="usa-nav__submenu-item">
<a href={`${import.meta.env.BASE_URL}about/statistics`}><span class="margin-x-1">Statistics and Reports</span></a>
</li>
</ul>
</li>
Expand All @@ -49,10 +67,10 @@ import searchIcon from "../assets/images/usa-icons/search--white.svg"
</button>
<ul id="extended-nav-section-how-it-works" class="usa-nav__submenu">
<li class="usa-nav__submenu-item">
<a href=""><span class="margin-x-1">&lt;Navigation link&gt;</span></a>
<a href={`${import.meta.env.BASE_URL}how-it-works/`}><span class="margin-x-1">How the Program Works</span></a>
</li>
<li class="usa-nav__submenu-item">
<a href=""><span class="margin-x-1">&lt;Navigation link&gt;</span></a>
<a href={`${import.meta.env.BASE_URL}how-it-works/eligibility`}><span class="margin-x-1">Eligibility</span></a>
</li>
</ul>
</li>
Expand All @@ -67,31 +85,19 @@ import searchIcon from "../assets/images/usa-icons/search--white.svg"
</button>
<ul id="extended-nav-section-stakeholders" class="usa-nav__submenu">
<li class="usa-nav__submenu-item">
<a href=""><span class="margin-x-1">&lt;Navigation link&gt;</span></a>
<a href={`${import.meta.env.BASE_URL}stakeholders/key-players`}><span class="margin-x-1">Key Players</span></a>
</li>
<li class="usa-nav__submenu-item">
<a href=""><span class="margin-x-1">&lt;Navigation link&gt;</span></a>
<a href={`${import.meta.env.BASE_URL}stakeholders/program-coordinators`}><span class="margin-x-1">Agency/Org Program Coordinators</span></a>
</li>
</ul>
</li>
<li class="usa-nav__primary-item">
<button
type="button"
class="usa-accordion__button usa-nav__link"
aria-expanded="false"
aria-controls="extended-nav-section-merchants"
>
<span>Merchants</span>
</button>
<ul id="extended-nav-section-merchants" class="usa-nav__submenu">
<li class="usa-nav__submenu-item">
<a href=""><span class="margin-x-1">&lt;Navigation link&gt;</span></a>
</li>
<li class="usa-nav__submenu-item">
<a href=""><span class="margin-x-1">&lt;Navigation link&gt;</span></a>
<a href={`${import.meta.env.BASE_URL}stakeholders/account-holders`}><span class="margin-x-1">Card/Account Holders</span></a>
</li>
</ul>
</li>
<li class="usa-nav__primary-item">
<a href={`${import.meta.env.BASE_URL}merchants/merchant-overview`} class="usa-nav-link"><span>Merchants</span></a>
</li>
<li class="usa-nav__primary-item">
<button
type="button"
Expand All @@ -103,10 +109,16 @@ import searchIcon from "../assets/images/usa-icons/search--white.svg"
</button>
<ul id="extended-nav-section-statetax" class="usa-nav__submenu">
<li class="usa-nav__submenu-item">
<a href=""><span class="margin-x-1">&lt;Navigation link&gt;</span></a>
<a href={`${import.meta.env.BASE_URL}smarttax/state-tax-forms`}><span class="margin-x-1">State Tax Forms</span></a>
</li>
<li class="usa-nav__submenu-item">
<a href=""><span class="margin-x-1">&lt;Navigation link&gt;</span></a>
<a href={`${import.meta.env.BASE_URL}smarttax/resources`}><span class="margin-x-1">State Tax Forms</span></a>
</li>
<li class="usa-nav__submenu-item">
<a href={`${import.meta.env.BASE_URL}smarttax/recognizing-your-account`}><span class="margin-x-1">Recognizing Charge Cards</span></a>
</li>
<li class="usa-nav__submenu-item">
<a href={`${import.meta.env.BASE_URL}smarttax/legal-history`}><span class="margin-x-1">Legal History</span></a>
</li>
</ul>
</li>
Expand All @@ -121,10 +133,13 @@ import searchIcon from "../assets/images/usa-icons/search--white.svg"
</button>
<ul id="extended-nav-section-policy" class="usa-nav__submenu">
<li class="usa-nav__submenu-item">
<a href=""><span class="margin-x-1">&lt;Navigation link&gt;</span></a>
<a href={`${import.meta.env.BASE_URL}policies-and-audits/policies`}><span class="margin-x-1">Policies</span></a>
</li>
<li class="usa-nav__submenu-item">
<a href=""><span class="margin-x-1">&lt;Navigation link&gt;</span></a>
<a href={`${import.meta.env.BASE_URL}policies-and-audits/audits`}><span class="margin-x-1">Audit Repository</span></a>
</li>
<li class="usa-nav__submenu-item">
<a href={`${import.meta.env.BASE_URL}policies-and-audits/smart-bulletins`}><span class="margin-x-1">Smart Bulletins</span></a>
</li>
</ul>
</li>
Expand All @@ -139,10 +154,13 @@ import searchIcon from "../assets/images/usa-icons/search--white.svg"
</button>
<ul id="extended-nav-section-resources" class="usa-nav__submenu">
<li class="usa-nav__submenu-item">
<a href=""><span class="margin-x-1">&lt;Navigation link&gt;</span></a>
<a href={`${import.meta.env.BASE_URL}resources/tools/section-889`}><span class="margin-x-1">889 tool</span></a>
</li>
<li class="usa-nav__submenu-item">
<a href={`${import.meta.env.BASE_URL}resources/publications/`}><span class="margin-x-1">Publications and Videos</span></a>
</li>
<li class="usa-nav__submenu-item">
<a href=""><span class="margin-x-1">&lt;Navigation link&gt;</span></a>
<a href={`${import.meta.env.BASE_URL}events/gsa-smartpay-forum`}><span class="margin-x-1">Events</span></a>
</li>
</ul>
</li>
Expand All @@ -156,12 +174,12 @@ import searchIcon from "../assets/images/usa-icons/search--white.svg"
</a>
</li>
<li class="usa-nav__secondary-item">
<a href="javascript:void(0);">
<a href={`${import.meta.env.BASE_URL}contact/`}>
Contact
</a>
</li>
<li class="usa-nav__secondary-item">
<a href="javascript:void(0);">
<a href={`${import.meta.env.BASE_URL}faq/`}>
FAQs
</a>
</li>
Expand Down
4 changes: 2 additions & 2 deletions src/pages/index.astro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import Callout from "../components/Callout.astro";
The GSA SmartPay Program is the largest government charge card and commercial payment solutions program in the world.
</span>
<div slot ="linkbutton" class="display-flex">
<a class="usa-button" href="about/">Find out more</a>
<a class="usa-button usa-button--outline" href="#">Benefits</a>
<a class="usa-button" href={`${import.meta.env.BASE_URL}about/`}>Find out more</a>
<a class="usa-button usa-button--outline" href={`${import.meta.env.BASE_URL}about/benefits`}>Benefits</a>
</div>
</Hero>
<Callout />
Expand Down

0 comments on commit f9b839f

Please sign in to comment.