Skip to content

Commit 1154821

Browse files
authored
Merge pull request #991 from sadiejay/top-rebrand
Top rebrand
2 parents 573387b + 968bf28 commit 1154821

5 files changed

Lines changed: 26 additions & 23 deletions

File tree

_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/dch/dch__filters.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
</ul>
2323
</div>
2424
<hr class="margin-top-3 margin-bottom-0 border-accent-warm">
25-
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/hero.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<a class="usa-link" href="{{ site.baseurl }}/data">All Data Kits</a>
4343
</div>
4444
<h1
45-
class="hero--heading line-height-sans-3 text-semi-bold ls-2 font-lang-13 text-white margin-top-6"
45+
class="hero--heading line-height-sans-3 text-normal ls-2 font-serif-14 text-white margin-top-6"
4646
>
4747
{{ page.title }}
4848
</h1>

_layouts/dch/datakit.html

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ <h2 class="text-top-black font-family-serif text-normal">Explore Datasets</h2>
4545
<label class="text-top-black" for="search-field">Search by keyword</label>
4646
<div class="display-flex margin-top-05">
4747
<input class="usa-input" id="search-field" type="search" name="search">
48-
<button class="usa-button bg-primary-darkest" type="submit">
48+
<button class="usa-button bg-top-black" type="submit">
4949
<span class="usa-sr-only">Search</span>
5050
</button>
5151
</div>
@@ -80,17 +80,16 @@ <h2 class="text-top-black font-family-serif text-normal">Explore Datasets</h2>
8080
{% endfor %}
8181
</ul>
8282

83-
{% include nav/pagination.html
84-
maxPages=5
85-
label="Datasets search results page"
86-
class="pagination--dark"
83+
{% include nav/pagination.html
84+
maxPages=5
85+
label="Datasets search results page"
8786
id="dch-pagination" %}
8887

8988
</section>
9089
{% assign stripped_content = content | strip_newlines %}
9190
{% if stripped_content.size > 0 %}
92-
<section class="usa-section grid-container padding-top-0 usa-dark-background font-sans-md text-white">
93-
<hr class="margin-y-3 border-accent-warm">
91+
<section class="usa-section grid-container padding-top-0 font-sans-md text-top-black">
92+
<!-- <hr class="margin-y-3 border-accent-warm"> -->
9493
{{ content }}
9594
</section>
9695
{% endif %}

css/_uswds-theme-custom-styles.scss

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,10 @@ $bg-top-primary:#0555A4;
141141
background-color: #0555A4;
142142
}
143143

144+
.bg-top-black {
145+
background-color: #3A2920;
146+
}
147+
144148
$bg-top-green: #0b9d58;
145149
.bg-top-green {
146150
background-color: #0b9d58;
@@ -1198,19 +1202,19 @@ main {
11981202
.dch-radio {
11991203
background-color: initial !important;
12001204
.dch-radio__label {
1201-
@include u-border-color('white');
1202-
@include u-bg('primary-dark');
1203-
@include u-color('white');
1205+
border-color: $text-top-black;
1206+
background-color: $bg-top-white;
1207+
color: $text-top-black;
12041208
@include u-padding-left(2);
12051209
text-indent: 0;
12061210
&::before {
12071211
display: none;
12081212
}
12091213
}
12101214
input:checked+[class$=__label] {
1211-
@include u-bg('white');
1212-
@include u-text('ink');
1213-
@include u-border-color('primary-darker');
1215+
background-color: $text-top-black;
1216+
color: $text-top-white;
1217+
box-shadow: 0px 4px 4px rgba(0, 0, 0, .25);
12141218
}
12151219
}
12161220

@@ -1248,8 +1252,8 @@ main {
12481252
.dch-card__tag {
12491253
background-color: transparent !important;
12501254
border: 1px solid;
1251-
@include u-border-color('base-lightest');
1252-
@include u-color('base-lightest', !important);
1255+
border-color: $text-top-black;
1256+
color: $text-top-black;
12531257
margin-right: .1rem;
12541258
&.usa-tag--new {
12551259
@include u-text('bold');
@@ -1464,8 +1468,8 @@ main {
14641468
.datasets__featured-banner {
14651469
border-radius: 10px 10px 0 0;
14661470
@include u-padding-x(3);
1467-
@include u-color('accent-warm');
1468-
@include u-text('italic');
1471+
color: $bg-top-green;
1472+
font-weight: 600;
14691473
@include u-margin-top(2);
14701474
}
14711475

0 commit comments

Comments
 (0)