From f5807d939a433fdb6d6146da715b2334bcbed635 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Fri, 5 Feb 2016 09:55:27 +0000 Subject: [PATCH] Add secondary link pattern to page footer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit brings back the ‘link under the green button’ bit of the page footer component. Previous it had been changed to be a grey button. But there are use cases for both, maybe even simultaneously. --- app/assets/stylesheets/components/page-footer.scss | 4 ++++ app/templates/components/page-footer.html | 5 +++++ app/templates/views/styleguide.html | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/app/assets/stylesheets/components/page-footer.scss b/app/assets/stylesheets/components/page-footer.scss index 4aea437c4..2a5e07613 100644 --- a/app/assets/stylesheets/components/page-footer.scss +++ b/app/assets/stylesheets/components/page-footer.scss @@ -28,6 +28,10 @@ } + &-secondary-link { + display: block; + margin-top: $gutter; + } .button {} diff --git a/app/templates/components/page-footer.html b/app/templates/components/page-footer.html index 1ea1dae64..7c0153d58 100644 --- a/app/templates/components/page-footer.html +++ b/app/templates/components/page-footer.html @@ -3,6 +3,8 @@ destructive=False, back_link=False, back_link_text="Back", + secondary_link=False, + secondary_link_text=None, delete_link=False, delete_link_text="delete" ) %} @@ -19,5 +21,8 @@ {% if back_link %} {{ back_link_text }} {% endif %} + {% if secondary_link and secondary_link_text %} + {{ secondary_link_text }} + {% endif %} {% endmacro %} diff --git a/app/templates/views/styleguide.html b/app/templates/views/styleguide.html index a27dbe7f9..6455a0ff5 100644 --- a/app/templates/views/styleguide.html +++ b/app/templates/views/styleguide.html @@ -117,6 +117,10 @@ button_text='Send', back_link='http://example.com', back_link_text="Back to dashboard" ) }} + {{ page_footer( + button_text='Sign in', secondary_link='http://example.com', secondary_link_text="I’ve forgotten my password" + ) }} +

SMS message

Used to show, preview or choose an SMS message.