diff --git a/package-lock.json b/package-lock.json index d7e2d1b454..7799f9c13e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6777,7 +6777,8 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", @@ -6920,7 +6921,8 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -6934,6 +6936,7 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7073,7 +7076,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -7087,6 +7091,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -7224,6 +7229,7 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/src/components/07-form/controls/validation.njk b/src/components/07-form/controls/validation.njk index 98f6a624a5..bc548327b2 100644 --- a/src/components/07-form/controls/validation.njk +++ b/src/components/07-form/controls/validation.njk @@ -1,6 +1,6 @@
- Enter a code + Enter a code

Code requirements

diff --git a/src/components/07-form/templates/password-reset-form.njk b/src/components/07-form/templates/password-reset-form.njk index 11afaa6a30..264875919d 100755 --- a/src/components/07-form/templates/password-reset-form.njk +++ b/src/components/07-form/templates/password-reset-form.njk @@ -1,6 +1,6 @@
- Reset password + Reset password Please enter your new password
diff --git a/src/components/07-form/templates/sign-in-form.njk b/src/components/07-form/templates/sign-in-form.njk index 179afbd4de..108d17adfb 100755 --- a/src/components/07-form/templates/sign-in-form.njk +++ b/src/components/07-form/templates/sign-in-form.njk @@ -1,6 +1,6 @@
- Sign in + Sign in or create an account diff --git a/src/components/08-navigation/_nav-primary.njk b/src/components/08-navigation/_nav-primary.njk index 951207ddaa..fdc8cc6ee0 100755 --- a/src/components/08-navigation/_nav-primary.njk +++ b/src/components/08-navigation/_nav-primary.njk @@ -1,13 +1,9 @@ - +
    {%- for link in nav.links -%}
  • - {%- if link.links -%} - + {% if link.links -%} + <{% if nav.mega %}div{% else %}ul{% endif %} id="{{ nav.id_prefix }}{{ link.id }}" class="usa-nav-submenu{% if nav.mega %} usa-megamenu{% endif %}"> {%- if nav.id_prefix == "basic-" or nav.id_prefix == "extended-" -%} {%- for child in link.links -%} @@ -34,10 +30,8 @@ {%- endif -%} {%- else -%} - - {{ link.text }} - - {%- endif -%} + {{ link.text }} + {% endif -%}
    • {%- endfor -%}
diff --git a/src/components/08-navigation/_nav-secondary.njk b/src/components/08-navigation/_nav-secondary.njk index 9d6b48949f..5da5b458e1 100755 --- a/src/components/08-navigation/_nav-secondary.njk +++ b/src/components/08-navigation/_nav-secondary.njk @@ -1,14 +1,12 @@
- {% if nav.search %} + {%- if nav.search -%} {% render '@search--header', {search: nav.search, search_js: false, id_prefix: id_prefix} %} - {% endif %} + {%- endif -%}
diff --git a/src/components/08-navigation/sidenav--compare.njk b/src/components/08-navigation/sidenav--compare.njk index 6e896e44fd..68761f8294 100755 --- a/src/components/08-navigation/sidenav--compare.njk +++ b/src/components/08-navigation/sidenav--compare.njk @@ -1,10 +1,10 @@
- {% for nav in sidenavs %} + {%- for nav in sidenavs -%}
{{ nav.title }}
- {% render '@sidenav--default', {sidenav: nav} %} + {%- render '@sidenav--default', {sidenav: nav} -%}
- {% endfor %} + {%- endfor -%}
diff --git a/src/components/08-navigation/sidenav.njk b/src/components/08-navigation/sidenav.njk index 3f98e59160..f4569ab1bb 100755 --- a/src/components/08-navigation/sidenav.njk +++ b/src/components/08-navigation/sidenav.njk @@ -1,17 +1,15 @@ -{% macro nav_list(links, subclass) %} - {% for item in links %} +{%- macro nav_list(links, subclass) -%} + {%- for item in links -%}
  • - - {{ item.text }} - - {% if item.links %} + {{ item.text }} + {%- if item.links -%}
      {{ nav_list(item.links, subclass) }}
    - {% endif %} + {%- endif %}
    • - {% endfor %} -{% endmacro %} + {%- endfor -%} +{%- endmacro -%}

    Agency Contact Center

    -
    +
    -
    - (800) CALL-GOVT -
    + (800) CALL-GOVT
    -
    - info@agency.gov -
    + info@agency.gov
    diff --git a/src/components/10-footer/footer.njk b/src/components/10-footer/footer.njk index 7463e1f73e..40da3824fa 100755 --- a/src/components/10-footer/footer.njk +++ b/src/components/10-footer/footer.njk @@ -60,16 +60,12 @@

    Agency Contact Center

    -
    +
    -
    - (800) CALL-GOVT -
    + (800) CALL-GOVT
    -
    - info@agency.gov -
    + info@agency.gov
    diff --git a/src/components/hero/hero.njk b/src/components/hero/hero.njk index 01cd356711..d83650c80a 100755 --- a/src/components/hero/hero.njk +++ b/src/components/hero/hero.njk @@ -2,19 +2,17 @@

    - {% if hero.callout %} + {%- if hero.callout -%} {{ hero.callout }} - {% endif %} + {%- endif -%} {{ hero.title }}

    - - {% if hero.paragraph %} + {%- if hero.paragraph -%}

    {{ hero.paragraph }}

    - {% endif %} - - {% if hero.button %} + {%- endif -%} + {%- if hero.button -%} {{ hero.button.text }} - {% endif %} + {%- endif %}
    diff --git a/src/components/search/search--header.njk b/src/components/search/search--header.njk index 91d61b99a5..56788ab9f6 100755 --- a/src/components/search/search--header.njk +++ b/src/components/search/search--header.njk @@ -2,8 +2,6 @@
    - +
    diff --git a/src/components/site-title/site-title.njk b/src/components/site-title/site-title.njk index 95cc380e4a..7194b53246 100755 --- a/src/components/site-title/site-title.njk +++ b/src/components/site-title/site-title.njk @@ -1,12 +1,6 @@
    diff --git a/src/components/test/shadows.njk b/src/components/test/shadows.njk deleted file mode 100644 index 53a5aba4fc..0000000000 --- a/src/components/test/shadows.njk +++ /dev/null @@ -1,19 +0,0 @@ -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    diff --git a/src/data/colors/gray-cool.json b/src/data/colors/gray-cool.json index adde8dea82..706ca73738 100644 --- a/src/data/colors/gray-cool.json +++ b/src/data/colors/gray-cool.json @@ -6,20 +6,20 @@ { "name": "gray-cool", "value": [ - { "name": "1", "value": "#fcfcfb" }, - { "name": "2", "value": "#f9f9f7" }, - { "name": "3", "value": "#f6f6f2" }, - { "name": "4", "value": "#f5f5f0" }, - { "name": "5", "value": "#f0f0ec" }, - { "name": "10", "value": "#e6e6e2" }, - { "name": "20", "value": "#cac9c0" }, - { "name": "30", "value": "#afaea2" }, - { "name": "40", "value": "#929285" }, - { "name": "50", "value": "#76766a" }, - { "name": "60", "value": "#5d5d52" }, - { "name": "70", "value": "#454540" }, - { "name": "80", "value": "#2e2e2a" }, - { "name": "90", "value": "#171716" } + { "name": "1", "value": "#fbfcfd" }, + { "name": "2", "value": "#f7f9fa" }, + { "name": "3", "value": "#f5f6f7" }, + { "name": "4", "value": "#f1f3f6" }, + { "name": "5", "value": "#edeff0" }, + { "name": "10", "value": "#dbdee1" }, + { "name": "20", "value": "#c6cace" }, + { "name": "30", "value": "#a9aeb1" }, + { "name": "40", "value": "#8d9297" }, + { "name": "50", "value": "#71767a" }, + { "name": "60", "value": "#585c62" }, + { "name": "70", "value": "#424549" }, + { "name": "80", "value": "#2d2e2f" }, + { "name": "90", "value": "#1c1d1f" } ] } ], diff --git a/src/data/colors/gray-warm.json b/src/data/colors/gray-warm.json index c2d8f22691..636efec410 100644 --- a/src/data/colors/gray-warm.json +++ b/src/data/colors/gray-warm.json @@ -6,20 +6,20 @@ { "name": "gray-warm", "value": [ - { "name": "1", "value": "#fbfcfd" }, - { "name": "2", "value": "#f7f9fa" }, - { "name": "3", "value": "#f5f6f7" }, - { "name": "4", "value": "#f1f3f6" }, - { "name": "5", "value": "#edeff0" }, - { "name": "10", "value": "#dbdee1" }, - { "name": "20", "value": "#c6cace" }, - { "name": "30", "value": "#a9aeb1" }, - { "name": "40", "value": "#8d9297" }, - { "name": "50", "value": "#71767a" }, - { "name": "60", "value": "#585c62" }, - { "name": "70", "value": "#424549" }, - { "name": "80", "value": "#2d2e2f" }, - { "name": "90", "value": "#1c1d1f" } + { "name": "1", "value": "#fcfcfb" }, + { "name": "2", "value": "#f9f9f7" }, + { "name": "3", "value": "#f6f6f2" }, + { "name": "4", "value": "#f5f5f0" }, + { "name": "5", "value": "#f0f0ec" }, + { "name": "10", "value": "#e6e6e2" }, + { "name": "20", "value": "#cac9c0" }, + { "name": "30", "value": "#afaea2" }, + { "name": "40", "value": "#929285" }, + { "name": "50", "value": "#76766a" }, + { "name": "60", "value": "#5d5d52" }, + { "name": "70", "value": "#454540" }, + { "name": "80", "value": "#2e2e2a" }, + { "name": "90", "value": "#171716" } ] } ], diff --git a/src/stylesheets/components/_footer.scss b/src/stylesheets/components/_footer.scss index 8971bca299..560c846be5 100644 --- a/src/stylesheets/components/_footer.scss +++ b/src/stylesheets/components/_footer.scss @@ -80,6 +80,11 @@ &:hover { text-decoration: underline; } + + @include at-media('mobile-lg') { + @include u-flex('justify-end'); + margin-top: units(1); + } } .usa-footer-primary-content { @@ -230,6 +235,7 @@ .usa-footer-contact_info { @include at-media('mobile-lg') { @include u-padding-y(units(2)); + margin-top: 0; } } } diff --git a/src/stylesheets/core/system-tokens/_gray-cool.scss b/src/stylesheets/core/system-tokens/_gray-cool.scss index f8c8a001aa..a03eb45c3d 100644 --- a/src/stylesheets/core/system-tokens/_gray-cool.scss +++ b/src/stylesheets/core/system-tokens/_gray-cool.scss @@ -1,18 +1,18 @@ $system-color-gray-cool: ( 'gray-cool': ( - 1: #fcfcfb, - 2: #f9f9f7, - 3: #f6f6f2, - 4: #f5f5f0, - 5: #f0f0ec, - 10: #e6e6e2, - 20: #cac9c0, - 30: #afaea2, - 40: #929285, - 50: #76766a, - 60: #5d5d52, - 70: #454540, - 80: #2e2e2a, - 90: #171716, + 1: #fbfcfd, + 2: #f7f9fa, + 3: #f5f6f7, + 4: #f1f3f6, + 5: #edeff0, + 10: #dbdee1, + 20: #c6cace, + 30: #a9aeb1, + 40: #8d9297, + 50: #71767a, + 60: #585c62, + 70: #424549, + 80: #2d2e2f, + 90: #1c1d1f, ), ); \ No newline at end of file diff --git a/src/stylesheets/core/system-tokens/_gray-warm.scss b/src/stylesheets/core/system-tokens/_gray-warm.scss index e6376fc3ce..4e135784c4 100644 --- a/src/stylesheets/core/system-tokens/_gray-warm.scss +++ b/src/stylesheets/core/system-tokens/_gray-warm.scss @@ -1,18 +1,18 @@ $system-color-gray-warm: ( 'gray-warm': ( - 1: #fbfcfd, - 2: #f7f9fa, - 3: #f5f6f7, - 4: #f1f3f6, - 5: #edeff0, - 10: #dbdee1, - 20: #c6cace, - 30: #a9aeb1, - 40: #8d9297, - 50: #71767a, - 60: #585c62, - 70: #424549, - 80: #2d2e2f, - 90: #1c1d1f, + 1: #fcfcfb, + 2: #f9f9f7, + 3: #f6f6f2, + 4: #f5f5f0, + 5: #f0f0ec, + 10: #e6e6e2, + 20: #cac9c0, + 30: #afaea2, + 40: #929285, + 50: #76766a, + 60: #5d5d52, + 70: #454540, + 80: #2e2e2a, + 90: #171716, ), ); \ No newline at end of file