From a103fc53da963ad7ccc9c02f3fe9b1a68bf4069c Mon Sep 17 00:00:00 2001 From: Alex Jackson Date: Thu, 1 Jul 2021 10:10:24 +0100 Subject: [PATCH 1/3] HEEDLS-542 Replace break-word with break-all --- DigitalLearningSolutions.Web/Styles/index.scss | 4 ++-- .../Styles/shared/cardWithButtons.scss | 2 +- DigitalLearningSolutions.Web/Styles/shared/centreInfo.scss | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DigitalLearningSolutions.Web/Styles/index.scss b/DigitalLearningSolutions.Web/Styles/index.scss index 04ebd28a11..9dbc149d94 100644 --- a/DigitalLearningSolutions.Web/Styles/index.scss +++ b/DigitalLearningSolutions.Web/Styles/index.scss @@ -131,7 +131,7 @@ h1#page-heading { .nhsuk-summary-list__value { @include govuk-media-query($until: tablet) { - word-break: break-word; + word-break: break-all; } } @@ -193,7 +193,7 @@ ul.no-bullets { } .word-break { - word-break: break-word; + word-break: break-all; } .vertical-align-centre { diff --git a/DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss b/DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss index 9b2b81a2d3..afa5b1953d 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss @@ -8,7 +8,7 @@ padding-bottom: 16px; padding-left: 32px; padding-right: 32px; - word-break: break-word; + word-break: break-all; } .card-with-buttons .nhsuk-expander { diff --git a/DigitalLearningSolutions.Web/Styles/shared/centreInfo.scss b/DigitalLearningSolutions.Web/Styles/shared/centreInfo.scss index 611fac653e..17ab0e32fd 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/centreInfo.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/centreInfo.scss @@ -1,3 +1,3 @@ .nhsuk-body-l { - word-break: break-word; + word-break: break-all; } From 5ae3a68c549eaec2a2c9e4be973fc4f273a913c9 Mon Sep 17 00:00:00 2001 From: Alex Jackson Date: Fri, 2 Jul 2021 15:14:29 +0100 Subject: [PATCH 2/3] HEEDLS-542 Add IE fix instead of break-all everywhere --- DigitalLearningSolutions.Web/Styles/index.scss | 7 ++++++- .../Styles/shared/cardWithButtons.scss | 1 - DigitalLearningSolutions.Web/Styles/shared/centreInfo.scss | 3 --- .../Shared/Components/CentreContactInfo/Default.cshtml | 4 +--- .../DelegateApprovals/_unapprovedDelegateExpandable.cshtml | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 DigitalLearningSolutions.Web/Styles/shared/centreInfo.scss diff --git a/DigitalLearningSolutions.Web/Styles/index.scss b/DigitalLearningSolutions.Web/Styles/index.scss index 9dbc149d94..cad57b0c4b 100644 --- a/DigitalLearningSolutions.Web/Styles/index.scss +++ b/DigitalLearningSolutions.Web/Styles/index.scss @@ -193,7 +193,12 @@ ul.no-bullets { } .word-break { - word-break: break-all; + word-break: break-word; + + // IE11 hack + @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) { + word-break: break-all; + } } .vertical-align-centre { diff --git a/DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss b/DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss index afa5b1953d..de7b7e034d 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss @@ -8,7 +8,6 @@ padding-bottom: 16px; padding-left: 32px; padding-right: 32px; - word-break: break-all; } .card-with-buttons .nhsuk-expander { diff --git a/DigitalLearningSolutions.Web/Styles/shared/centreInfo.scss b/DigitalLearningSolutions.Web/Styles/shared/centreInfo.scss deleted file mode 100644 index 17ab0e32fd..0000000000 --- a/DigitalLearningSolutions.Web/Styles/shared/centreInfo.scss +++ /dev/null @@ -1,3 +0,0 @@ -.nhsuk-body-l { - word-break: break-all; -} diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/CentreContactInfo/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/CentreContactInfo/Default.cshtml index f8ce1f2c66..8b54c30dbe 100644 --- a/DigitalLearningSolutions.Web/Views/Shared/Components/CentreContactInfo/Default.cshtml +++ b/DigitalLearningSolutions.Web/Views/Shared/Components/CentreContactInfo/Default.cshtml @@ -1,9 +1,7 @@ @using DigitalLearningSolutions.Web.ViewModels.Common @model CentreContactInfoViewModel - - @if (Model.BannerText != null) { -

@Model.BannerText

+

@Model.BannerText

} diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateApprovals/_unapprovedDelegateExpandable.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateApprovals/_unapprovedDelegateExpandable.cshtml index dfff26b56a..b4ca4050b2 100644 --- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateApprovals/_unapprovedDelegateExpandable.cshtml +++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateApprovals/_unapprovedDelegateExpandable.cshtml @@ -5,7 +5,7 @@ var emailString = !string.IsNullOrEmpty(Model.Email) ? $"({Model.Email})" : ""; } -
+
From 58e9c5fcc756b1dcb3a7cb6659f74cf2f34230d1 Mon Sep 17 00:00:00 2001 From: Alex Jackson Date: Fri, 2 Jul 2021 15:39:59 +0100 Subject: [PATCH 3/3] HEEDLS-542 Define IE fix as a mixin so it can be reused --- DigitalLearningSolutions.Web/Styles/index.scss | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/DigitalLearningSolutions.Web/Styles/index.scss b/DigitalLearningSolutions.Web/Styles/index.scss index cad57b0c4b..0e441992eb 100644 --- a/DigitalLearningSolutions.Web/Styles/index.scss +++ b/DigitalLearningSolutions.Web/Styles/index.scss @@ -1,5 +1,12 @@ @import "~nhsuk-frontend/packages/core/all"; +@mixin word-break-ie-fix { + // IE11 hack + @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) { + word-break: break-all; + } +} + ul > li > ul > li { list-style-type: circle; } @@ -131,7 +138,8 @@ h1#page-heading { .nhsuk-summary-list__value { @include govuk-media-query($until: tablet) { - word-break: break-all; + word-break: break-word; + @include word-break-ie-fix; } } @@ -194,11 +202,7 @@ ul.no-bullets { .word-break { word-break: break-word; - - // IE11 hack - @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) { - word-break: break-all; - } + @include word-break-ie-fix; } .vertical-align-centre {