Skip to content

Commit a97b36f

Browse files
tombyetombye
authored
Merge pull request #1243 from alphagov/update-govuk-logo-to-new-brand
Update GOVUK logo to new brand (behind a flag)
2 parents 8b39f00 + f126ddf commit a97b36f

File tree

4 files changed

+91
-8
lines changed

4 files changed

+91
-8
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
# CHANGELOG
22

3+
## 99.8.0
4+
5+
* Add new version of GOV.UK brand to email template, behind a flag
6+
37
## 99.7.0
48

59
* Update economy letter transit dates to max 8 days
610

7-
811
## 99.6.0
912

10-
* Improve celery json logging. Include beat with separate log level options and testing.
13+
* Improve celery json logging. Include beat with separate log level options and testing
1114

1215
## 99.5.2
1316

‎notifications_utils/jinja_templates/email_template.jinja2‎

Lines changed: 82 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@
1313
.content {
1414
width: 580px !important;
1515
}
16+
}
17+
@media only print {
18+
.logo__crown { display: none !important; }
19+
.logo__text, .logo__dot { color: #000000 !important; }
20+
.brand__banner {
21+
border-bottom: solid 1pt #000000 !important;
22+
background-color: unset !important;
23+
}
1624
}
1725
body { margin:0 !important; }
1826
div[style*="margin: 16px 0"] { margin:0 !important; }
@@ -38,30 +46,96 @@
3846
{% if govuk_banner %}
3947
<table role="presentation" width="100%" style="border-collapse: collapse;min-width: 100%;width: 100% !important;" cellpadding="0" cellspacing="0" border="0">
4048
<tr>
41-
<td width="100%" height="53" bgcolor="#0b0c0c">
49+
<td width="100%" height="{% if rebrand %}60{% else %}53{% endif %}" bgcolor="{% if rebrand %}#1d70b8{% else %}#0b0c0c{% endif %}" class="brand__banner">
4250
<!--[if (gte mso 9)|(IE)]>
4351
<table role="presentation" width="580" align="center" cellpadding="0" cellspacing="0" border="0" style="border-collapse: collapse;width: 580px;">
4452
<tr>
4553
<td>
4654
<![endif]-->
4755
<table role="presentation" width="100%" style="border-collapse: collapse;max-width: 580px;" cellpadding="0" cellspacing="0" border="0" align="center">
4856
<tr>
49-
<td width="70" bgcolor="#0b0c0c" valign="middle">
57+
{% if rebrand %}
58+
<!--[if mso]>
59+
<td width="70" valign="middle">
5060
<a href="https://www.gov.uk" title="Go to the GOV.UK homepage" style="text-decoration: none;">
5161
<table role="presentation" cellpadding="0" cellspacing="0" border="0" style="border-collapse: collapse;">
5262
<tr>
5363
<td style="padding-left: 10px">
64+
<img src="https://static.notifications.service.gov.uk/images/govuk-logotype-tudor-crown.png" alt="" height="32" border="0" style="Margin-top: 2px;">
65+
</td>
66+
<td style="font-size: 28px; line-height: 1.315789474; padding-left: 8px; padding-bottom: 8px">
67+
<span style="
68+
font-family: Helvetica, Arial, sans-serif;
69+
font-weight: 700;
70+
color: #ffffff;
71+
text-decoration: none;
72+
vertical-align:middle;
73+
display: inline-block"
74+
>GOV<span style="
75+
color: #00ffe0;
76+
font-family: Georgia, Times New Roman, sans-serif;
77+
font-size: 32px;
78+
mso-text-raise:7px">.</span>UK</span>
79+
</td>
80+
</tr>
81+
</table>
82+
</a>
83+
</td>
84+
<![endif]-->
85+
<!--[if !mso]><!-->
86+
<td width="70" valign="bottom">
87+
<a href="https://www.gov.uk" title="Go to the GOV.UK homepage" style="text-decoration: none;color: #fff">
88+
<table role="presentation" cellpadding="0" cellspacing="0" border="0" style="border-collapse: collapse;">
89+
<tr>
90+
<td style="font-size: 28px; line-height: 2; padding-left: 10px" valign="bottom" height="60" class="logo__crown">
5491
<img
5592
src="https://static.notifications.service.gov.uk/images/govuk-logotype-tudor-crown.png"
5693
alt=""
5794
height="32"
5895
border="0"
59-
style="Margin-top: 2px;"
96+
style="Margin-top: 2px; max-height: 32px"
97+
aria-hidden="true"
6098
>
6199
</td>
62-
<td style="font-size: 28px; line-height: 1.315789474; Margin-top: 4px; padding-left: 8px;">
100+
<td style="font-size: 28px; line-height: 2.1428571429; padding-left: 8px;" valign="bottom" height="60" class="logo__text">
101+
<span aria-label="GOV.UK" style="
102+
font-family: Helvetica, Arial, 'Noto Sans', sans-serif;
103+
font-weight: 700;
104+
text-decoration: none;
105+
vertical-align:middle;
106+
display: inline-block;
107+
">GOV<span style="
108+
font-family: Georgia, Times New Roman, Times, sans-serif;
109+
color: #00ffe0;
110+
display: inline-block;
111+
text-indent: 0.04em;
112+
font-size: 32px;
113+
line-height: 1.35;
114+
vertical-align: top;
115+
margin-right: 0.05em;" class="logo__dot">.</span>UK</span>
116+
</td>
117+
</tr>
118+
</table>
119+
</a>
120+
</td>
121+
<!--<![endif]-->
122+
{% else %}
123+
<td width="70" valign="middle">
124+
<a href="https://www.gov.uk" title="Go to the GOV.UK homepage" style="text-decoration: none">
125+
<table role="presentation" cellpadding="0" cellspacing="0" border="0" style="border-collapse: collapse;">
126+
<tr>
127+
<td style="padding-left: 10px" class="logo__crown">
128+
<img
129+
src="https://static.notifications.service.gov.uk/images/govuk-logotype-tudor-crown.png"
130+
alt=""
131+
height="32"
132+
border="0"
133+
style="Margin-top: 2px; max-height: 32px"
134+
>
135+
</td>
136+
<td style="font-size: 28px; line-height: 1.315789474; Margin-top: 4px; padding-left: 8px;" class="logo__text">
63137
<span style="
64-
font-family: Helvetica, Arial, sans-serif;
138+
font-family: Helvetica, Arial, 'Noto Sans', sans-serif;
65139
font-weight: 700;
66140
color: #ffffff;
67141
text-decoration: none;
@@ -73,6 +147,7 @@
73147
</table>
74148
</a>
75149
</td>
150+
{% endif %}
76151
</tr>
77152
</table>
78153
<!--[if (gte mso 9)|(IE)]>
@@ -83,6 +158,7 @@
83158
</td>
84159
</tr>
85160
</table>
161+
{% if not rebrand %}
86162
<table
87163
role="presentation"
88164
class="content"
@@ -115,6 +191,7 @@
115191
<td width="10" valign="middle" height="10"></td>
116192
</tr>
117193
</table>
194+
{% endif %}
118195
{% endif %}
119196
{% if brand_banner %}
120197
{% set brand_colour = brand_colour if brand_colour else '#0b0c0c' %}

‎notifications_utils/template.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,7 @@ def __init__(
515515
brand_colour=None,
516516
brand_banner=False,
517517
brand_alt_text=None,
518+
rebrand=False,
518519
**kwargs,
519520
):
520521
super().__init__(template, values, **kwargs)
@@ -525,6 +526,7 @@ def __init__(
525526
self.brand_colour = brand_colour
526527
self.brand_banner = brand_banner
527528
self.brand_alt_text = brand_alt_text
529+
self.rebrand = rebrand
528530

529531
@property
530532
def preheader(self):
@@ -558,6 +560,7 @@ def __str__(self):
558560
"brand_colour": self.brand_colour,
559561
"brand_banner": self.brand_banner,
560562
"brand_alt_text": self.brand_alt_text,
563+
"rebrand": self.rebrand,
561564
}
562565
)
563566

‎notifications_utils/version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# - `make version-minor` for new features
66
# - `make version-patch` for bug fixes
77

8-
__version__ = "99.7.0" # 9d83e45af263673302c720b7f57ce01b
8+
__version__ = "99.8.0" # 235b3e3580b24d464e4924064ac808f2

0 commit comments

Comments
 (0)