Skip to content
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.

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

Sender name updates, minor styling and mobile responsiveness fixes #78

Merged
merged 57 commits into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
78ee6d8
Merge pull request #2 from NHSDigital/main
mark-r-bjss Oct 10, 2024
1bf442b
Added mention of 'message cascades' in routing plan content for 'para…
jakecosgrove Oct 10, 2024
99dd075
'or' replaced with 'and'
jakecosgrove Oct 11, 2024
fab3891
Merge pull request #8 from NHSDigital/routing-plans-content-changes
jakecosgrove Oct 11, 2024
abf8c0a
Message status page created
jakecosgrove Oct 14, 2024
dc21528
Emma 2i requested changes
jakecosgrove Oct 15, 2024
9378e54
Merge pull request #9 from NHSDigital/message-status-content
jakecosgrove Oct 15, 2024
4c473d4
Added /using-nhs-notify/nhs-app-templates, /using-nhs-notify/email-te…
emmagifford Oct 16, 2024
e58b908
Merge pull request #10 from NHSDigital/Creating-templates-and-persona…
jakecosgrove Oct 17, 2024
ca7e65e
Removed mention of bank holidays from emails and text message deliver…
jakecosgrove Oct 22, 2024
640d617
Merge pull request #11 from NHSDigital/delivery-times-and-links
jakecosgrove Oct 22, 2024
df7581d
Removed unnecessary bullets and headings anchor links in Text message…
emmagifford Oct 23, 2024
1a516af
Fixed typo in /text-message-templates. Removed 'Creating...' from lin…
emmagifford Oct 23, 2024
cd938e8
Updated names of Word docs to replace spaces with hyphens and make al…
emmagifford Oct 23, 2024
019e3b6
Removed unnecessary space from line 26 on docs/pages/using-nhs-notify…
emmagifford Oct 24, 2024
2bbf678
Merge pull request #12 from NHSDigital/Changes-following-Jake's-review
jakecosgrove Oct 24, 2024
d58cb55
Update accept.txt
jakecosgrove Oct 28, 2024
a1763dd
Merge pull request #14 from NHSDigital/jakecosgrove-language-usage-pa…
jakecosgrove Oct 28, 2024
7f8fb85
In /using-nhs-notify/delivery-times#letters, replaced the sentence 'O…
emmagifford Nov 4, 2024
c5e0fbf
Merge pull request #16 from NHSDigital/Letter-delivery-times-update
jakecosgrove Nov 4, 2024
fa9592a
Added content on what users need to do in order to use recipient cont…
jakecosgrove Nov 5, 2024
d099cf4
Emma recommendations
jakecosgrove Nov 5, 2024
eff75cd
Merge pull request #17 from NHSDigital/PDS-override-content
jakecosgrove Nov 5, 2024
f1798de
Merge remote-tracking branch 'upstream/main' into update-from-upstream
RossBugginsNHS Nov 5, 2024
4a1ba6f
Merge pull request #19 from NHSDigital/update-from-upstream
RossBugginsNHS Nov 5, 2024
dba7c44
Removed address_line_x, clientRef, recipientContactValue and template…
emmagifford Nov 11, 2024
0229360
In /workspaces/nhs-notify-web-cms-dev/docs/_sass/_nhsnotify.scss I ad…
emmagifford Nov 11, 2024
1c54ab4
Merge pull request #22 from NHSDigital/PDS-personalisation-fields-update
jakecosgrove Nov 22, 2024
c328369
Removed mentions of date of birth from failed message status descript…
jakecosgrove Dec 3, 2024
2f7854a
Added link to NHS Notify MESH documentation in /using-nhs-notify/mesh
jakecosgrove Dec 3, 2024
4b271f9
Squashed commit of the following:
RossBugginsNHS Dec 3, 2024
f6b4bf8
Changed first subheading to a h2 from h3
jakecosgrove Dec 3, 2024
5df29ed
Merge pull request #24 from NHSDigital/CCM-7534-CMS-Phase-1-rb-002
jakecosgrove Dec 6, 2024
28fe20e
Removed other phase-banner tests
jakecosgrove Dec 13, 2024
6495c3d
Removed the other phase banners from Ross' test
jakecosgrove Dec 13, 2024
c80fe0a
Merge pull request #25 from NHSDigital/Phase-banner-quick-fix
jakecosgrove Dec 13, 2024
49ec18d
Merge remote-tracking branch 'upstream/main'
RossBugginsNHS Dec 13, 2024
a4b2378
Merge pull request #26 from NHSDigital/robu6/2024-12-13/merge-in-upst…
RossBugginsNHS Dec 13, 2024
57b803c
removed phase banner includes due to component not being tested or re…
jakecosgrove Dec 16, 2024
bd1c4aa
Merge pull request #27 from NHSDigital/hide-phase-banner
jakecosgrove Dec 16, 2024
e3b58e1
Merge branch 'main' of https://github.com/NHSDigital/nhs-notify-web-cms
alexcolbeck1 Dec 18, 2024
ed6e500
Update personalisation.md
alexcolbeck1 Dec 18, 2024
8cc737d
Merge pull request #29 from NHSDigital/fix-branch
alexcolbeck1 Dec 18, 2024
19239b1
Merge pull request #30 from NHSDigital/main
alexcolbeck1 Dec 18, 2024
f66061f
First draft updated guidance
jakecosgrove Dec 20, 2024
66255e5
Requested changes
jakecosgrove Dec 20, 2024
316f5b8
Changes from Alex's review:
jakecosgrove Dec 30, 2024
be0285f
Merge pull request #31 from NHSDigital/Sender-name-updates
jakecosgrove Dec 30, 2024
a023420
Romy suggested that we use screenshots to show where the sender names…
jakecosgrove Dec 30, 2024
74a5ac3
This commit includes:
jakecosgrove Dec 31, 2024
55ae9ea
Added content about sending text message sender names for approval wi…
jakecosgrove Jan 2, 2025
826380a
Merge pull request #34 from NHSDigital/Styling-fixes
jakecosgrove Jan 2, 2025
7ee5d08
Merge branch 'main' of https://github.com/NHSDigital/nhs-notify-web-c…
jakecosgrove Jan 2, 2025
69df1f9
Use new image-with-text.html includes
jakecosgrove Jan 2, 2025
74b5309
Content changes following Emma's 2i
jakecosgrove Jan 2, 2025
8303471
Added 'new' to text message sender names
jakecosgrove Jan 3, 2025
027bc5d
Merge pull request #35 from NHSDigital/Sender-name-updates
jakecosgrove Jan 3, 2025
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
13 changes: 13 additions & 0 deletions docs/_includes/components/image-with-caption.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<figure class="nhsuk-image-with-caption {{ include.class | xml_escape }}">
{% assign src = '/assets/images/' | prepend: site.baseurl | append: include.src %}
{% if include.src contains 'https://' %}
<img class="nhsuk-image__img" src='{{ include.src | uri_escape }}' alt='{{ include.alt | xml_escape }}' />
{% else %}
<img class="nhsuk-image__img" src='{{ src }}' alt='{{ include.alt | xml_escape }}' />
{% endif %}
{% if include.caption %}
<figcaption class="nhsuk-image__caption">
{{ include.caption }}
</figcaption>
{% endif %}
</figure>
2 changes: 1 addition & 1 deletion docs/_includes/components/inset-text.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="nhsuk-inset-text">
<div class="nhsuk-inset-text-override">
<span class="nhsuk-u-visually-hidden">Information:</span>
{{ include.text | markdownify }}
</div>
65 changes: 54 additions & 11 deletions docs/_sass/_nhsnotify-side-nav.scss
Original file line number Diff line number Diff line change
@@ -1,35 +1,62 @@
.nhsnotify-pane {
display: flex;
display: -webkit-box;
display: -ms-flexbox; // sass-lint:disable-line no-duplicate-properties
display: flex; // sass-lint:disable-line no-duplicate-properties
min-height: 0;
overflow: inherit;
position: relative;
}

.nhsnotify-pane__side-bar {
-ms-flex: 0 0 auto;
-webkit-box-flex: 0;
flex: 0 0 auto;
width: 280px;
padding: 0;
width: 220px;

@include mq($until: desktop) {
display: none;
}
}

.nhsnotify-pane__main-content {
display: flex;
-ms-flex: 1 1 100%; // sass-lint:disable-line no-duplicate-properties
-ms-flex-direction: column;
-webkit-box-direction: normal;
-webkit-box-flex: 1;
-webkit-box-orient: vertical;
display: -webkit-box;
display: -ms-flexbox; // sass-lint:disable-line no-duplicate-properties
display: flex; // sass-lint:disable-line no-duplicate-properties
flex: 1 1 100%;
flex-direction: column;
min-width: 0;

@include mq($from: desktop) {
padding-left: nhsuk-spacing(9);
}

}

.nhsnotify-side-nav__list {
font-size: 1em;
line-height: 1.3;
@include nhsuk-font(16, $line-height: 1.3);
margin-bottom: 0;

@include mq($until: desktop) {
@include nhsuk-font(19, $line-height: 1.3);
margin-bottom: nhsuk-spacing(2);
}
}

.nhsnotify-side-nav__list-section {
@extend .nhsuk-u-font-weight-bold;
color: #4c6272;
margin-bottom: 8px;
padding-bottom: 4px;
font-size: 1em;
@include nhsuk-font(19, $line-height: 1.25, $weight: bold);
color: $nhsuk-secondary-text-color;
margin-bottom: 12px;
padding-top: 4px;

@include mq($until: desktop) {
@include nhsuk-font(24, $line-height: 1.25, $weight: bold);
color: $nhsuk-text-color;
}
}

.nhsnotify-side-nav__item {
Expand All @@ -55,6 +82,10 @@
.nhsnotify-side-nav__link {
text-decoration: none;

@include mq($until: desktop) {
text-decoration: underline;
}

&:visited {
color: $blue-000;
}
Expand All @@ -68,3 +99,15 @@
color: #212b32;
}
}

// Hide content on desktop
.nhsnotify-u-hide-desktop {
@include mq($from: desktop) {
display: none;
}
}

// Mobile navigation
.nhsnotify-index-navigation {
@include nhsuk-responsive-padding(4, 'top');
}
38 changes: 38 additions & 0 deletions docs/_sass/_nhsnotify.scss
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,41 @@
line-height: 1.25;
padding-left: 0.5em;
}

.nhsuk-inset-text-override {
@include top-and-bottom(); /* [1] */
@include reading-width(); /* [2] */

@include nhsuk-responsive-margin(7, "bottom");
@include nhsuk-responsive-margin(4, "top");
@include nhsuk-responsive-padding(4);

border-left: $nhsuk-border-width-inset-text solid $color_nhsuk-blue;

@include mq($media-type: print) {
border-color: $nhsuk-print-text-color;
}
}

.nhsuk-image-with-caption {
background-color: $color_nhsuk-white;
border-bottom: 1px solid $color_nhsuk-grey-4;

margin-left: 0; /* [1] */
margin-right: 0; /* [1] */

@include nhsuk-responsive-margin(6, "bottom");
@include nhsuk-responsive-margin(3, "top");

@include mq($from: desktop) {
width: 100%; /* [2] */
}

@include mq($media-type: print) {
width: 50%; /* [3] */
}

& + .nhsuk-image {
@include nhsuk-responsive-margin(0, "top"); /* [4] */
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/pages/features/emails.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ section: Message channels

Use NHS Notify to send free unlimited emails to patients and members of the public, in bulk and individually.

{% include components/image.html
{% include components/image-with-caption.html
src="nhs-notify-email-example.svg"
alt="A screenshot of an email sent by NHS Notify."
caption="An example of an email sent by NHS Notify."
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/features/letters.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ section: Message channels

You can use NHS Notify to print and send letters to patients and members of the public with addresses in the UK. You can do this in bulk and individually.

{% include components/image.html
{% include components/image-with-caption.html
src="nhs-notify-letter-two-sides-example.svg"
alt="An image showing both sides of a letter sent by NHS Notify"
caption="An example of a black and white double-sided letter sent by NHS Notify."
Expand Down
6 changes: 3 additions & 3 deletions docs/pages/features/nhs-app-messages.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ section: Message channels

Send free messages of up to 1,000 characters to patients and members of the public who have the NHS App.

{% include components/image.html
{% include components/image-with-caption.html
src="nhs-notify-nhs-app-example-2.svg"
alt="A screenshot of an opened message in the NHS App inbox."
caption="An example of a message sent with the NHS App."
Expand Down Expand Up @@ -43,7 +43,7 @@ When a user selects the banner notification, this opens their message in the NHS

To protect recipients, banner notifications pushed by the NHS App do not include any of your message content.

{% include components/image.html
{% include components/image-with-caption.html
src="nhs-notify-nhs-app-banner-notification.svg"
alt="An image of 2 mobile devices side by side showing an example banner notification for both iPhone and Android devices pushed by the NHS App."
caption="An example of a banner notification pushed to an iPhone and an Android device by the NHS App."
Expand All @@ -53,7 +53,7 @@ To protect recipients, banner notifications pushed by the NHS App do not include

When a recipient receives a NHS App message, a badge notification will appear on the NHS App icon. Badges let NHS App users know that there’s an unopened message or notification for them in the app.

{% include components/image.html
{% include components/image-with-caption.html
src="nhs-notify-nhs-app-badge-notification.svg"
alt="A screenshot of the NHS App icon with a red badge showing 1 notification."
caption="An example of a badge notification pushed by the NHS App when a message is sent to a recipient’s NHS App inbox."
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/features/text-messages.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ section: Message channels

Use NHS Notify to send text messages such as invitations, alerts, notifications or reminders to your audiences. You can do this in bulk and individually.

{% include components/image.html
{% include components/image-with-caption.html
src="nhs-notify-iphone-android-sms-example.svg"
alt="An image of 2 mobile devices side by side showing a received text message, one displayed on iPhone and the other displayed on an Android device."
caption="An example of a text message (SMS) sent by NHS Notify to an iPhone or Android mobile device."
Expand Down
Loading
Loading