Skip to content

HEEDLS-542 Replace break-word with break-all #462

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jul 2, 2021
Merged

HEEDLS-542 Replace break-word with break-all #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a103fc5
HEEDLS-542 Replace break-word with break-all
AlexJacksonDS Jul 1, 2021
5ae3a68
HEEDLS-542 Add IE fix instead of break-all everywhere
AlexJacksonDS Jul 2, 2021
58e9c5f
HEEDLS-542 Define IE fix as a mixin so it can be reused
AlexJacksonDS Jul 2, 2021
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
9 changes: 9 additions & 0 deletions DigitalLearningSolutions.Web/Styles/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
Expand Down Expand Up @@ -132,6 +139,7 @@ h1#page-heading {
.nhsuk-summary-list__value {
@include govuk-media-query($until: tablet) {
word-break: break-word;
@include word-break-ie-fix;
}
}

Expand Down Expand Up @@ -194,6 +202,7 @@ ul.no-bullets {

.word-break {
word-break: break-word;
@include word-break-ie-fix;
}

.vertical-align-centre {
Expand Down
1 change: 0 additions & 1 deletion DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
padding-bottom: 16px;
padding-left: 32px;
padding-right: 32px;
word-break: break-word;
}

.card-with-buttons .nhsuk-expander {
Expand Down
3 changes: 0 additions & 3 deletions DigitalLearningSolutions.Web/Styles/shared/centreInfo.scss
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions DigitalLearningSolutions.Web/Views/Shared/Components/CentreContactInfo/Default.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
@using DigitalLearningSolutions.Web.ViewModels.Common
@model CentreContactInfoViewModel

<link rel="stylesheet" href="@Url.Content("~/css/shared/centreInfo.css")" asp-append-version="true">

@if (Model.BannerText != null) {
<p class="nhsuk-body-l">@Model.BannerText</p>
<p class="nhsuk-body-l word-break">@Model.BannerText</p>
}
<vc:action-link asp-controller="FindYourCentre" asp-action="Index" asp-all-route-data="@Model.Routes" link-text="View centre contact information" />
2 changes: 1 addition & 1 deletion ...Web/Views/TrackingSystem/Delegates/DelegateApprovals/_unapprovedDelegateExpandable.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
var emailString = !string.IsNullOrEmpty(Model.Email) ? $"({Model.Email})" : "";
}

<div class="card-with-buttons nhsuk-panel" id="@Model.Id-card">
<div class="card-with-buttons word-break nhsuk-panel" id="@Model.Id-card">
<details class="nhsuk-details nhsuk-expander nhsuk-u-margin-bottom-0">
<summary class="nhsuk-details__summary nhsuk-u-padding-top-0 nhsuk-u-padding-left-0">
<span class="nhsuk-details__summary-text">
Expand Down