Skip to content

Commit

Permalink
Merge pull request #177 from GSA-TTS/JB-ui-tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
natashapl authored May 31, 2024
2 parents 289944d + cea65b2 commit b8d5f58
Show file tree
Hide file tree
Showing 5 changed files with 75 additions and 13 deletions.
66 changes: 62 additions & 4 deletions _data/assetPaths.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"check_circle.svg": "/assets/assets/check_circle-FKYRF36F.svg",
"checkbox-indeterminate.svg": "/assets/assets/checkbox-indeterminate-HJACJSU3.svg",
"checkbox-indeterminate-alt.svg": "/assets/assets/checkbox-indeterminate-alt-SXGAHOOI.svg",
"close.svg": "/assets/assets/close-D6X4FKTZ.svg",
"close.svg": "/assets/images/close-x.svg",
"correct8.svg": "/assets/assets/correct8-BW6WT7U2.svg",
"correct8-alt.svg": "/assets/assets/correct8-alt-M4H3GT6Q.svg",
"delna.webp": "/assets/assets/delna-Y7FFIQ4T.webp",
Expand All @@ -37,7 +37,7 @@
"frank.webp": "/assets/assets/frank-WEGTXKFN.webp",
"header-bottom-border.webp": "/assets/assets/header-bottom-border-K2INIIYM.webp",
"hero.jpg": "/assets/assets/hero-OXUBFI7L.jpg",
"homepage-gradient-bg.jpg": "/assets/assets/homepage-gradient-bg-L552LDA4.jpg",
"homepage-gradient-bg.jpg": "/assets/images/homepage-gradient-bg-mobile.jpg",
"homepage-gradient-bg-mobile.jpg": "/assets/assets/homepage-gradient-bg-mobile-7NX7I3DV.jpg",
"impact-report_pdf-icon.webp": "/assets/assets/impact-report_pdf-icon-ARH2FAXH.webp",
"info.svg": "/assets/assets/info-TBKQSD4V.svg",
Expand Down Expand Up @@ -83,8 +83,66 @@
"tts-inclusive-grid-map.svg": "/assets/assets/tts-inclusive-grid-map-D5DPHQNA.svg",
"unfold_more.svg": "/assets/assets/unfold_more-WL443JWS.svg",
"warning.svg": "/assets/assets/warning-5OR6W6GJ.svg",
"merriweathe": "/assets/fonts/merriweather",
"poppin": "/assets/fonts/poppins",
"public": "/assets/fonts/public-sans",
"roboto": "/assets/fonts/roboto-mono",
"source-sans": "/assets/fonts/source-sans-pro",
"10x.png": "/assets/images/10x-logo.png",
"10x.webp": "/assets/images/10x-logo.webp",
"10x_og_imag.png": "/assets/images/10x_og_image.png",
"access-to-data.png": "/assets/images/access-to-data-icon.png",
"access-to-data.webp": "/assets/images/access-to-data-icon.webp",
"benefits-eligibility.png": "/assets/images/benefits-eligibility-icon.png",
"benefits-eligibility.webp": "/assets/images/benefits-eligibility-icon.webp",
"cloud_go.png": "/assets/images/cloud_gov.png",
"current-report-icon.png": "/assets/images/current-report-icon-solid.png",
"current-report-icon.svg": "/assets/images/current-report-icon-floated.svg",
"current-report.svg": "/assets/images/current-report-icon.svg",
"customer-experience.png": "/assets/images/customer-experience-icon.png",
"customer-experience.webp": "/assets/images/customer-experience-icon.webp",
"digitalgov.png": "/assets/images/digitalgov-logo.png",
"equity-project.png": "/assets/images/equity-project-icon.png",
"equity-project.webp": "/assets/images/equity-project-icon.webp",
"external-link.svg": "/assets/images/external-link-icon.svg",
"gradient.png": "/assets/images/gradient-bg.png",
"gradient_her.png": "/assets/images/gradient_hero.png",
"gsa.svg": "/assets/images/gsa-logo.svg",
"header-bottom.png": "/assets/images/header-bottom-border.png",
"header-bottom.webp": "/assets/images/header-bottom-border.webp",
"homepage-gradient.jpg": "/assets/images/homepage-gradient-bg.jpg",
"homepage-gradient.png": "/assets/images/homepage-gradient-bg.png",
"impact": "/assets/images/impact-reports",
"left.svg": "/assets/images/left-arrow.svg",
"logo.png": "/assets/images/logo-alt.png",
"logo.svg": "/assets/images/logo-alt.svg",
"log.svg": "/assets/images/logo.svg",
"menu-close.png": "/assets/images/menu-close-X.png",
"menu-close.webp": "/assets/images/menu-close-X.webp",
"menu.svg": "/assets/images/menu-icon.svg",
"optimal-digital-experience.png": "/assets/images/optimal-digital-experience-icon.png",
"optimal-digital-experience.webp": "/assets/images/optimal-digital-experience-icon.webp",
"placeholder.png": "/assets/images/placeholder-icon.png",
"placeholder.svg": "/assets/images/placeholder-icon.svg",
"public-service.png": "/assets/images/public-service-icon.png",
"public-service.webp": "/assets/images/public-service-icon.webp",
"purple.svg": "/assets/images/purple-US.svg",
"science-medicine.png": "/assets/images/science-medicine-icon.png",
"science-medicine.webp": "/assets/images/science-medicine-icon.webp",
"section2-purple.png": "/assets/images/section2-purple-bg.png",
"section2-purple.svg": "/assets/images/section2-purple-bg.svg",
"section2-purple.webp": "/assets/images/section2-purple-bg.webp",
"security-project.png": "/assets/images/security-project-icon.png",
"security-project.webp": "/assets/images/security-project-icon.webp",
"sewer": "/assets/images/sewer-spills",
"sprit.svg": "/assets/images/sprite.svg",
"technology.svg": "/assets/images/technology-services.svg",
"tts-inclusive-grid.png": "/assets/images/tts-inclusive-grid-map.png",
"tts-inclusive-grid.svg": "/assets/images/tts-inclusive-grid-map.svg",
"uswd": "/assets/images/uswds",
"app.js": "/assets/js/app-EDZES2YK.js",
"app.map": "/assets/js/app-EDZES2YK.js.map",
"index.css": "/assets/styles/index-NDSW7KAQ.css",
"index.map": "/assets/styles/index-NDSW7KAQ.css.map"
"index.css": "/assets/styles/index-RAJAX37S.css",
"index.map": "/assets/styles/index-RAJAX37S.css.map",
"j": "/assets/uswds/js"
}
2 changes: 1 addition & 1 deletion _includes/components/reports-list.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ul class="usa-card-group grid-row grid-gap-2">
<ul class="usa-card-group grid-row grid-gap-4">
{%- for report in collections.reports -%}
{%- if report.data.pdf -%}
{%- assign reportLink = report.data.reportUrl | url -%}
Expand Down
2 changes: 1 addition & 1 deletion _includes/layouts/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ <h2 class="margin-bottom-7">{{ section_2_static_content.title }}</h2>
<div class="grid-container">
<div class="grid-row grid-gap">
<h2 class="margin-top-1 margin-bottom-5">{{ section_3_content.title }}</h2>
<ul class="usa-card-group grid-row grid-gap-2">
<ul class="usa-card-group grid-row grid-gap-4">
{% for card in section_3_content.cards %}
{% assign isExternal = card.button_link contains "http" %}
<li class="usa-card grid-col-12 desktop:grid-col-6 tablet-lg:grid-col-6 widescreen:grid-col-4">
Expand Down
17 changes: 10 additions & 7 deletions _includes/theme/styles/_templates.scss
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,11 @@ h2,
font-weight: 500;
}

.usa-identifier__required-links-list {
column-count: 5;
-moz-column-count: 5;
}

.usa-identifier__container,
.usa-identifier__identity-domain,
.usa-identifier__required-link,
Expand Down Expand Up @@ -148,6 +153,10 @@ h2,

.usa-card {
display: inline-flex;
&__container {
margin-left: 0;
margin-right: 0;
}
}

.usa-breadcrumb__list-item {
Expand All @@ -172,7 +181,7 @@ h2,
.usa-hero {
background: white;
background-image: none;
padding: units(3);
padding: units(3) units(5);

h2, h3 {
color: color("violet-90");
Expand Down Expand Up @@ -1420,9 +1429,3 @@ input[type="search"]::-webkit-search-cancel-button {
background-image: url(../images/menu-close-X.webp);
cursor: pointer;
}

.usa-footer {
.grid-container {
max-width: 64rem;
}
}
1 change: 1 addition & 0 deletions _includes/theme/styles/_theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
$theme-image-path: '@uswds/uswds/img',
$theme-grid-container-max-width: "desktop-lg",
$theme-banner-max-width: "desktop-lg",
$theme-footer-max-width: "desktop-lg",
$output-these-utilities: default,

$theme-typeface-tokens: (
Expand Down

0 comments on commit b8d5f58

Please sign in to comment.