Skip to content

Commit 8c96028

Browse files
sadiejaysadiejay
authored
Merge pull request #975 from uscensusbureau/top-rebrand
Top rebrand
2 parents b50dd69 + 7f8ee67 commit 8c96028

38 files changed

Lines changed: 574 additions & 289 deletions

‎_data/messages.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ sprints:
3030

3131
problem-statement:
3232
problem-statement:
33-
en: Problem Statement
34-
esp: Planteamiento del Problema
33+
en: Sprint Topic
34+
esp: Tema del Sprint
3535
agency:
3636
en: Agency
3737
esp: Agencia

‎_datakits/2020-census.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ data-experts:
4040
{% for contact in group.contacts %}
4141
<li>
4242
{{contact.name}},
43-
<a class="usa-link" href="mailto:{{contact.email}}">{{contact.email}}</a>
43+
<a class="usa-link text-top-black" href="mailto:{{contact.email}}">{{contact.email}}</a>
4444
</li>
4545
{% endfor %}
4646
</ul>

‎_includes/cards/pdf-card.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<a href="{{ site.baseurl }}/assets/files/{{ include.content.pdf }}" target="_blank"
88
class="text-no-underline">
9-
<div class="card-header">
9+
<div class="card-header bg-top-black">
1010
<h3 class="text-sans-1 text-ls-1 display-flex flex-align-center">
1111
<img class="maxh-3 margin-right-1" src="{{ site.baseurl }}/assets/img/icons/pdf_icon_white.svg" alt="an icon of a computer document"/>
1212
View PDF

‎_includes/cards/problem-statement-prod-card.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
{% if card.link %}
1313
<a href="{{ card.link }}" class="product-link">
1414
{% endif %}
15-
<div class="card-header {%if isInverse %}bg-white{% endif %}">
16-
<h3 class="text-sans-1 text-ls-1 {% unless isInverse %}{% if card.link %}text-primary-lighter{% endif %}{% endunless %} {%if card.link%}text-underline{% endif %}">
15+
<div class="{% unless isInverse %}bg-top-lblue{% endunless %} {%if isInverse %}bg-top-white{% endif %} card-header">
16+
<h3 class="text-sans-1 text-ls-1 {% unless isInverse %}{% if card.link %}text-top-black{% endif %}{% endunless %} {%if card.link%}text-underline{% endif %}">
1717
{% if isInverse %}
1818
{{ card.tech_team_text }}
19-
{% else %}
19+
{% else %}
2020
{{ card.title }}
2121
{% endif %}
2222
</h3>

‎_includes/dch/datakit-card.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
style="background-image: url('{{ kit.image | relative_url }}')">
1717

1818
{% if kit.upcoming %}
19-
<h2 class="z-200 text-no-underline" id="{{kit-id}}">{{ titleText }}</h2>
19+
<h2 class="z-200 text-no-underline font-family-serif text-normal text-top-white" id="{{kit-id}}">{{ titleText }}</h2>
2020
{% else %}
21-
<h2 class="z-200" id="{{kit-id}}"><a href="{{ kit-href }}">{{ titleText }}</a></h2>
21+
<h2 class="z-200 font-family-serif text-normal text-top-white" id="{{kit-id}}"><a href="{{ kit-href }}">{{ titleText }}</a></h2>
2222
{% endif %}
2323
{% include 1px-transparent.html alt=kit.image-alt %}
2424
<p class="z-200">{{kit.lead}}</p>

‎_includes/dch/dataset-card.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
{% endfor %}
88

99
<li id="data-set-card-{{item.name | slugify}}" class="desktop:grid-col-4 tablet:grid-col-4 usa-card__dataset margin-bottom-2 data-set-card" name="data-set-card">
10-
<div class="usa-card__container datasets__card bg-primary-darker">
10+
<div class="usa-card__container datasets__card bg-top-white">
1111
{% if item.featuredDataset %}
1212
<div class="datasets__featured-banner">
1313
<span>Recommended</span>
1414
</div>
1515
{% endif %}
1616
<header class="usa-card__header usa-dark-background">
17-
<h2 class="usa-card__heading text-white font-sans-md" value="{{data.name | slugify}}">
17+
<h2 class="usa-card__heading text-top-black text-top-important font-serif-md text-normal" value="{{data.name | slugify}}">
1818
{% unless item.hasMultipleLinks %}
1919
<a href="{{item.link}}" target="_blank"
20-
class="usa-link" aria-label="{{ item.name }}">
20+
class="usa-link text-top-black text-top-important" aria-label="{{ item.name }}">
2121
{{ item.name }}
2222
</a>
2323
{% else %}
@@ -43,10 +43,10 @@ <h2 class="usa-card__heading text-white font-sans-md" value="{{data.name | slugi
4343
<span class="pc-inactive dataset__ps">
4444
{% for filter in filters %}{{ filter | slugify }} {% endfor %}
4545
</span>
46-
<p class="dataset__org font-mono-xs text-white">by {{ item.organization_text | upcase }}</p>
46+
<p class="dataset__org font-mono-md text-top-black text-top-important">by {{ item.organization_text | upcase }}</p>
4747
</header>
4848
<div class="usa-card__body usa-dark-background margin-bottom-4">
49-
<p class="font-sans-xs text-white">{{ item.description}}</p>
49+
<p class="font-sans-sm text-top-black text-top-important">{{ item.description}}</p>
5050
{% if item.hasMultipleLinks %}
5151
<p>There are mutiple links associated with this data set. Please refer to the list below: </p>
5252
{% assign listed-links = item.link | split: "- " | slice: 1, 100 %}
@@ -79,7 +79,7 @@ <h2 class="usa-card__heading text-white font-sans-md" value="{{data.name | slugi
7979
{% assign isContactPage = true %}
8080
{% endif %}
8181

82-
<h3 class="text-medium text-white margin-bottom-05">
82+
<h3 class="text-medium text-top-black text-top-important font-family-serif margin-bottom-05">
8383
{% if isContactPage %}
8484
Contact Page:
8585
{% else %}
@@ -95,16 +95,16 @@ <h3 class="text-medium text-white margin-bottom-05">
9595
{% assign isContactPage = true %}
9696
{% endif %}
9797
<li
98-
class="{%unless forloop.last%}margin-bottom-1{%endunless%} bg-gray-5 radius-md padding-x-1 padding-y-05"
98+
class="{%unless forloop.last%}margin-bottom-1{%endunless%} radius-md padding-x-1 padding-y-05"
9999
>
100100
{% if isContactPage %}
101101
<a href="{{ steward.email }}" class="usa-link">
102102
{{ steward.name | strip }}
103103
</a>
104104
{% else %}
105-
<span class="text-primary-darker">{{ steward.name | strip }},</span>
105+
<span class="text-top-black font-sans-sm">{{ steward.name | strip }},</span>
106106
<a href="mailto:{{ steward.email }}?subject=Regarding The Opportunity Project Dataset: {{steward.name}}"
107-
class="usa-link dch-card__steward-link">
107+
class="usa-link dch-card__steward-link text-top-black font-sans-sm">
108108
{{ steward.email }}
109109
</a>
110110
{% endif %}

‎_includes/dch/dch__filters.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
{% endfor %}
2222
</ul>
2323
</div>
24-
<hr class="margin-top-3 margin-bottom-0 border-accent-warm">
25-
24+
<!-- <hr class="margin-top-3 margin-bottom-0 border-accent-warm"> -->
25+
2626
{% else %}
27-
27+
2828
<div class="grid-row grid-gap text-white margin-top-3">
2929
{% assign breakpoint = "tablet" %}
3030
<div class="{{breakpoint}}:grid-col-5">
3131
<fieldset class="usa-fieldset">
32-
<legend class="usa-legend">Filter by category</legend>
32+
<legend class="usa-legend text-top-black">Filter by category</legend>
3333
{% assign categoryHalf = data-topics.size | divided_by: 2.0 | ceil %}
3434
<div class="grid-container grid-row grid-gap padding-x-0">
3535
<div class="grid-col-6 padding-left-0">
@@ -57,7 +57,7 @@
5757
{% assign options = options | uniq | sort: "order" %}
5858
{% assign optionMidpoint = options.size | divided_by: 2.0 | ceil %}
5959
<fieldset class="usa-form dch__checkbox-group maxw-none" name="{{group}}">
60-
<legend class="usa-legend">Filter by available {{group}}</legend>
60+
<legend class="usa-legend text-top-black">Filter by available {{group}}</legend>
6161
<div class="grid-container grid-row grid-gap padding-x-0">
6262
<div class="grid-col-6 padding-left-0">
6363
{% for option in options limit:optionMidpoint %}

‎_includes/faq-glossary.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
{% for category in categories %}
44
<div class="usa-accordion usa-accordion--multiselectable padding-top-2 padding-bottom-5" data-allow-multiple>
55
{% for term in category.terms %}
6-
<h4 class="usa-accordion__heading">
7-
<button type="button" class="usa-accordion__button light bg-{{ category.color }} text-white"
6+
<h4 class="usa-accordion__heading font-family-serif">
7+
<button type="button" class="usa-accordion__button light bg-{{ category.color }} text-white text-normal"
88
aria-expanded="true" aria-controls="m-a{{ term.num }}">
99
{{term.term}}
1010
</button>
1111
</h4>
1212

13-
<div id="m-a{{ term.num }}" class="usa-accordion__content usa-prose">
13+
<div id="m-a{{ term.num }}" class="usa-accordion__content usa-prose border-top-dashed">
1414
<p class="grid-container padding-y-5 overflow-hidden">
1515
{{ term.definition | markdownify | remove: "<p>" | remove: "</p>" }}
1616
</p>

‎_includes/featured-speakers.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{% assign data = include.data %}
22
<div class="grid-container padding-x-8 tablet:padding-x-7">
3-
<h2 class="text-center">Featured Past Speakers</h2>
3+
<h2 class="text-center font-family-serif text-normal">Featured Past Speakers</h2>
44
<div
5-
class="featured-speakers-container grid-row flex-justify-center text-base-darkest flex-align-center flex-row margin-top-4 tablet:margin-top-5 desktop:margin-top-15">
5+
class="featured-speakers-container grid-row flex-justify-center text-base-darkest flex-align-center flex-row margin-top-4 tablet:margin-top-5 desktop:margin-top-10">
66
{% for speaker in page.speakers %}
77
<div
88
class="featured-speaker-individual tablet:grid-col-3 display-flex flex-column flex-justify-start flex-align-center margin-bottom-3 tablet:margin-bottom-1 tablet:margin-x-0 tablet:padding-x-1">

‎_includes/footer.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<footer class="usa-footer site-footer bg-base-darkest" role="contentinfo">
2-
<div class="usa-footer__secondary-section bg-base-darkest">
1+
<footer class="usa-footer site-footer" role="contentinfo">
2+
<div class="usa-footer__secondary-section">
33
<div class="grid-container footer-content padding-left-4 padding-right-3">
44

55

66
<div class="grid-row">
77
{% for section in site.data.nav.footer %}
8-
<div class="usa-media-block__footer text-white tablet:grid-col-2">
9-
<h3 class="padding-top-4 tablet:padding-y-4 desktop:padding-y-5 text-uppercase">
8+
<div class="usa-media-block__footer tablet:grid-col-2">
9+
<h3 class="padding-top-4 tablet:padding-y-4 desktop:padding-y-5 font-family-serif text-normal">
1010
{% if section.subsection.href %}
1111
<a href="{{ section.subsection.href }}" class="text-underline">{{ section.subsection.title }}</a>
1212
{% else %}
@@ -26,11 +26,11 @@ <h3 class="padding-top-4 tablet:padding-y-4 desktop:padding-y-5 text-uppercase">
2626
{% endfor %}
2727

2828
<div class="usa-media-block__footer display-none tablet:display-block tablet:grid-col-2 subsection-subscribe">
29-
<h3 class=" text-bold text-white padding-top-4 text-uppercase">Subscribe</h3>
30-
<p class=" text-white margin-0">
29+
<h3 class="padding-top-4 desktop:padding-top-5 font-family-serif text-normal">Subscribe</h3>
30+
<p class="margin-0 padding-top-2">
3131
Sign up to our email list to be notified of<br> news and opportunities.
3232
</p>
33-
<a href="{{ site.contacts.mailing-list }}" class="usa-button usa-button--secondary site-button site-cta width-full">
33+
<a href="{{ site.contacts.mailing-list }}" class="usa-button usa-button--secondary site-button site-cta width-full text-bold">
3434
SIGN UP
3535
</a>
3636
<!-- check mobile button -->
@@ -41,12 +41,12 @@ <h3 class=" text-bold text-white padding-top-4 text-uppercase">Subscribe</h3>
4141
<div class="grid-row margin-top-2 tablet:display-none">
4242
<div class="tablet:order-last tablet:padding-left-3">
4343
<div class="usa-media-block__footer">
44-
<p class="text-white">
44+
<p class="text-top-black">
4545
Sign up to our email list <br> to be notified of news<br> and opportunities.
4646
</p>
4747
<a href="{{ site.contacts.mailing-list }}"
48-
class="usa-button usa-button--secondary site-button site-cta">
49-
SUBSCRIBE
48+
class="usa-button usa-button--secondary site-button site-cta text-bold">
49+
SIGN UP
5050
</a>
5151
</div>
5252
<!-- check tablet/desktop button -->
@@ -56,7 +56,7 @@ <h3 class=" text-bold text-white padding-top-4 text-uppercase">Subscribe</h3>
5656
</div>
5757
</div>
5858

59-
<div class="footer-section-bottom usa-media-block__footer grid-row display-flex flex-align-center text-white opacity-80 margin-top-5 tablet:margin-top-1 padding-bottom-5">
59+
<div class="footer-section-bottom usa-media-block__footer grid-row display-flex flex-align-center opacity-80 margin-top-5 tablet:margin-top-1 padding-bottom-5">
6060
{% for bottomLink in site.data.nav.footer-bottom %}
6161
<a href="{% unless bottomLink.isExternal %}{{ site.baseurl }}/{% endunless %}{{ bottomLink.href }}" class="border-base-dark
6262
{% unless forloop.first %} border-left padding-left-2 {% endunless %}

0 commit comments

Comments
 (0)