From da80013ec9f116c4559df4e6b36db8569cc6fc89 Mon Sep 17 00:00:00 2001 From: Chris Heathcote Date: Thu, 3 Dec 2015 16:01:00 +0000 Subject: [PATCH 1/2] Adding beta phase banner --- app/assets/stylesheets/app.scss | 25 +++++++++++++++++++++++++ app/templates/admin_template.html | 8 ++++++++ 2 files changed, 33 insertions(+) diff --git a/app/assets/stylesheets/app.scss b/app/assets/stylesheets/app.scss index 9ceb5468d..50c9ec702 100644 --- a/app/assets/stylesheets/app.scss +++ b/app/assets/stylesheets/app.scss @@ -19,4 +19,29 @@ font-size: 19px; line-height: 1.31579; } +} + +.phase-tag { + @include phase-tag(beta); +} + +@media (min-width: 641px) { + .phase-tag { + font-size: 16px; + line-height: 1.25; + margin-top: 7px; + + } +} + +@media (max-width: 641px) { + .phase-tag { + margin-top: 11px; + } +} + + + +#global-header #logo { + white-space: nowrap; } \ No newline at end of file diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index 5e24c7294..e31094bed 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -7,5 +7,13 @@ GOV.UK notifications admin {% block cookie_message %} {% endblock %} + {% block inside_header %} +
+ + BETA + +
+ {% endblock %} + {% set global_header_text = "GOV.UK Notify" %} From 15e5d8f1456adb0db577ef5a0798c8a6356d5e63 Mon Sep 17 00:00:00 2001 From: Chris Heathcote Date: Thu, 3 Dec 2015 16:01:21 +0000 Subject: [PATCH 2/2] Fixed flask-assets to look for css changes and rebuild --- app/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index fc5c73b8e..c0c0cd758 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -96,7 +96,8 @@ def init_asset_environment(app): assets.Bundle( 'govuk_template/govuk-template.scss', filters='scss', - output='stylesheets/govuk-template.css' + output='stylesheets/govuk-template.css', + depends='*.scss' ) )