Skip to content

New footer #1474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gemfarmer merged 2 commits into from
Jun 7, 2017
Merged

New footer #1474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87bc922
new footer
gemfarmer Jun 5, 2017
2a674fa
& and translation
gemfarmer Jun 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions app/assets/images/sp-logos/square-gsa-dark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions app/assets/images/sp-logos/square-gsa.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/stylesheets/components/_background.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}
3 changes: 3 additions & 0 deletions app/assets/stylesheets/components/_color.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@media #{$breakpoint-sm} {
.sm-white { color: $white; }
}
1 change: 1 addition & 0 deletions app/assets/stylesheets/components/all.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@import 'border';
@import 'btn';
@import 'card';
@import 'color';
@import 'container';
@import 'footer';
@import 'form';
Expand Down
25 changes: 17 additions & 8 deletions app/views/shared/_footer_lite.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion config/locales/links/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/locales/links/es.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down