diff --git a/app/assets/images/sp-logos/square-gsa-dark.svg b/app/assets/images/sp-logos/square-gsa-dark.svg new file mode 100644 index 00000000000..9d5656f6831 --- /dev/null +++ b/app/assets/images/sp-logos/square-gsa-dark.svg @@ -0,0 +1,23 @@ + + + + GSA-logo + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/app/assets/images/sp-logos/square-gsa.svg b/app/assets/images/sp-logos/square-gsa.svg new file mode 100644 index 00000000000..c70b85589f4 --- /dev/null +++ b/app/assets/images/sp-logos/square-gsa.svg @@ -0,0 +1,19 @@ + + + + square-gsa + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/stylesheets/components/_background.scss b/app/assets/stylesheets/components/_background.scss index 9e5a1bf3719..9c26230e10c 100644 --- a/app/assets/stylesheets/components/_background.scss +++ b/app/assets/stylesheets/components/_background.scss @@ -5,4 +5,5 @@ @media #{$breakpoint-sm} { .sm-bg-light-blue { background-color: $blue-light; } .sm-bg-none { background-color: transparent; } + .sm-bg-navy { background-color: $navy; } } diff --git a/app/assets/stylesheets/components/_color.scss b/app/assets/stylesheets/components/_color.scss new file mode 100644 index 00000000000..572de70adf1 --- /dev/null +++ b/app/assets/stylesheets/components/_color.scss @@ -0,0 +1,3 @@ +@media #{$breakpoint-sm} { + .sm-white { color: $white; } +} diff --git a/app/assets/stylesheets/components/all.scss b/app/assets/stylesheets/components/all.scss index 7b5dcd79dad..8937fd95861 100644 --- a/app/assets/stylesheets/components/all.scss +++ b/app/assets/stylesheets/components/all.scss @@ -4,6 +4,7 @@ @import 'border'; @import 'btn'; @import 'card'; +@import 'color'; @import 'container'; @import 'footer'; @import 'form'; diff --git a/app/views/shared/_footer_lite.html.slim b/app/views/shared/_footer_lite.html.slim index a95553a160a..ca77f40ade4 100644 --- a/app/views/shared/_footer_lite.html.slim +++ b/app/views/shared/_footer_lite.html.slim @@ -1,12 +1,21 @@ -footer.footer.bg-navy.white - .container.py2.h6 +footer.footer.bg-light-blue.sm-bg-navy + .container.h6.py1.px2.lg-px0 .clearfix - .sm-col-right.caps.pt1.pb2.sm-pt0.sm-pb0.center.caps + .col-right.caps = link_to t('links.help'), MarketingSite.help_url, - class: 'white text-decoration-none mr3', target: '_blank' + class: 'gray sm-white text-decoration-none mr3', target: '_blank' = link_to t('links.contact'), MarketingSite.contact_url, - class: 'white text-decoration-none mr3', target: '_blank' + class: 'gray sm-white text-decoration-none mr3', target: '_blank' = link_to t('links.privacy_policy'), MarketingSite.privacy_url, - class: 'white text-decoration-none', target: '_blank' - .sm-col.pt2.sm-pt0.center.border-top.sm-border-none.border-blue - = t('shared.footer_lite.gsa') + class: 'gray sm-white text-decoration-none', target: '_blank' + .col + = link_to('https://gsa.gov', + class: 'flex flex-center text-decoration-none white', + target: '_blank') do + = image_tag asset_url('sp-logos/square-gsa.svg'), + width: 20, class: 'mr1 sm-show', alt: 'GSA homepage' + = image_tag asset_url('sp-logos/square-gsa-dark.svg'), + width: 20, class: 'mr1 sm-hide', alt: 'GSA homepage' + span.sm-show + = t('shared.footer_lite.gsa') + end diff --git a/config/locales/links/en.yml b/config/locales/links/en.yml index be0a5af5ebc..9ac5c7482cf 100644 --- a/config/locales/links/en.yml +++ b/config/locales/links/en.yml @@ -17,7 +17,7 @@ en: auth_app_fallback_html: ' or %{link}.' fallback_to_sms_html: Send me a text message with the code instead fallback_to_voice_html: If you can't get text message right now, you can get a security code via %{link} - privacy_policy: Privacy and security + privacy_policy: Privacy & security remove: Remove resend: Resend email sign_in: Sign in diff --git a/config/locales/links/es.yml b/config/locales/links/es.yml index 4e6f377c099..82e7ddbfe50 100644 --- a/config/locales/links/es.yml +++ b/config/locales/links/es.yml @@ -17,7 +17,7 @@ es: auth_app_fallback_html: NOT TRANSLATED YET fallback_to_sms_html: Envíame un mensaje de texto con el código en su lugar fallback_to_voice_html: Llámame con el código en su lugar - privacy_policy: Política de privacidad + privacy_policy: Privacidad y seguridad remove: NOT TRANSLATED YET resend: Enviar de nuevo sign_in: Iniciar sesión