From 397ad05db93273b3445369c3b5c0bd7268e7d6f5 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 22 Nov 2016 17:15:31 +0000 Subject: [PATCH 01/13] Make a full width base template We need this because the top section of the new product page will be going full-bleed. --- app/templates/admin_template.html | 4 +--- app/templates/fullwidth_template.html | 7 +++++++ app/templates/views/signedout.html | 2 +- app/templates/withnav_template.html | 28 ++++++++++++++------------ app/templates/withoutnav_template.html | 10 +++++---- 5 files changed, 30 insertions(+), 21 deletions(-) create mode 100644 app/templates/fullwidth_template.html diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index ebc1d29cc..6c2e71f13 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -71,9 +71,7 @@ {% set homepage_url = url_for('main.show_all_services_or_dashboard') %} {% block content %} -
- {% block fullwidth_content %}{% endblock %} -
+ {% block fullwidth_content %}{% endblock %} {% endblock %} {% block footer_top %} diff --git a/app/templates/fullwidth_template.html b/app/templates/fullwidth_template.html new file mode 100644 index 000000000..137088d1d --- /dev/null +++ b/app/templates/fullwidth_template.html @@ -0,0 +1,7 @@ +{% extends "admin_template.html" %} + +{% block fullwidth_content %} +
+ {% block maincolumn_content %}{% endblock %} +
+{% endblock %} diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html index 44e784b89..b23dfbd82 100644 --- a/app/templates/views/signedout.html +++ b/app/templates/views/signedout.html @@ -1,7 +1,7 @@ {% from "components/banner.html" import banner_wrapper %} {% from "components/phone.html" import phone %} -{% extends "withoutnav_template.html" %} +{% extends "fullwidth_template.html" %} {% block page_title %} GOV.UK Notify diff --git a/app/templates/withnav_template.html b/app/templates/withnav_template.html index b72d1f6b7..7c4c44223 100644 --- a/app/templates/withnav_template.html +++ b/app/templates/withnav_template.html @@ -1,19 +1,21 @@ {% extends "admin_template.html" %} {% block fullwidth_content %} -
-

- {{ current_service.name }} -

- Switch service -
-
-
- {% include "main_nav.html" %} +
+
+

+ {{ current_service.name }} +

+ Switch service +
+
+
+ {% include "main_nav.html" %} +
+
+ {% include 'flash_messages.html' %} + {% block maincolumn_content %}{% endblock %} +
-
- {% include 'flash_messages.html' %} - {% block maincolumn_content %}{% endblock %} -
{% endblock %} diff --git a/app/templates/withoutnav_template.html b/app/templates/withoutnav_template.html index fad322c73..2da0812e6 100644 --- a/app/templates/withoutnav_template.html +++ b/app/templates/withoutnav_template.html @@ -1,8 +1,10 @@ {% extends "admin_template.html" %} {% block fullwidth_content %} -
- {% include 'flash_messages.html' %} - {% block maincolumn_content %}{% endblock %} -
+
+
+ {% include 'flash_messages.html' %} + {% block maincolumn_content %}{% endblock %} +
+
{% endblock %} From 92ad308fca965d83600e02c5d8b41ead0702f0e5 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 22 Nov 2016 17:21:12 +0000 Subject: [PATCH 02/13] Replace beta banner with beta badge MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is part of the new header style that Tim, Stephen et al have been working on. This means that we lose the feedback link, so I’m trying out having it in the top right. --- app/assets/stylesheets/app.scss | 29 +++++++++++++++++++++++++---- app/templates/admin_template.html | 2 ++ app/templates/views/signedout.html | 7 ------- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/app.scss b/app/assets/stylesheets/app.scss index 00c79977b..b58d74b3f 100644 --- a/app/assets/stylesheets/app.scss +++ b/app/assets/stylesheets/app.scss @@ -4,7 +4,8 @@ background-color: $govuk-blue; } -#global-header { +#global-header, +#global-header.with-proposition { #logo { @@ -18,19 +19,39 @@ } + .header-wrapper { + .header-global { + .header-logo { + + @include media(desktop) { + width: auto; + } + + &:after { + display: none; + } + + } + } + } + .header-proposition { #proposition-links { li { padding: 0 0 0 15px; } } - #proposition-menu { - margin-top: 9px; - } } } +.beta-badge { + @include phase-tag(beta); + background: $govuk-blue; + margin: 10px 0 0 0; +} + + @include media(desktop) { #proposition-menu { float: right; diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index 6c2e71f13..89d2ce2c7 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -31,6 +31,7 @@ {% endblock %} {% block inside_header %} + Beta {% endblock %} {% block header_class %}with-proposition{% endblock %} {% block proposition_header %} @@ -39,6 +40,7 @@ Menu