Skip to content

Commit

Permalink
Merge pull request #398 from NHSLeadership/release-fix-2.3.1.4
Browse files Browse the repository at this point in the history
Release patch fix for 2.3.1.4
  • Loading branch information
marcinca authored Mar 3, 2021
2 parents 7f537e2 + 18a855e commit 995b295
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 7 deletions.
5 changes: 4 additions & 1 deletion assets/scss/events-calendar-styling.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
}
}
}
span.nhsuk-action-link__text {
margin-left: nhsuk-spacing(6);
}
}


Expand Down Expand Up @@ -369,4 +372,4 @@ html.js { // only hit embedded content. Wordpress doesnt make this easy to filte
/* Event datetime header */
.tribe-events-schedule__datetime * {
color : $color_nhsuk-dark-grey;
}
}
6 changes: 6 additions & 0 deletions assets/scss/header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -203,4 +203,10 @@ button#toggle-search {
font-size : 13.3333px;
}

@media (min-width: 48.0625em) {
.nhsuk-header--organisation .nhsuk-header__link {
max-width: 500px;
float: left;
}
}
/* end of header.scss include */
11 changes: 6 additions & 5 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Requires PHP: 5.6
License: GPL v3 or later
License URI: https://www.gnu.org/licenses/gpl-3.0.en.html
Theme URI: https://digital.leadershipacademy.nhs.uk/digital-capabilities/websites/nightingale-theme-user-guide/
Version: 2.3.1.3
Stable tag: 2.3.1.3
Version: 2.3.1.4
Stable tag: 2.3.1.4


== Description ==
Expand Down Expand Up @@ -46,14 +46,15 @@ one level only. To show further levels, we recommend using the right (or left) h
= 2.3.1.4 =
* bugfix release:
* Fixed pagination in learndash content (added new nonce value to ensure correct form submission)
* fixed php warning on all_fields template (related to original styles array which is no longer used)
* tested against WordPress 5.7
* Fixed php warning on all_fields template (related to original styles array which is no longer used)
* Fixed action links in calendar context
* Tweak to Nhsuk header width
* Tested against WordPress 5.7

= 2.3.1.3 =
* bugfix release:
* minor change to gravity forms summary (all_fields) view to prevent markup error that blocked submission.


= 2.3.1.2 =
* bugfix release:
* removed various warnings triggered by unchecked values
Expand Down
11 changes: 11 additions & 0 deletions style.css
Original file line number Diff line number Diff line change
Expand Up @@ -11248,6 +11248,13 @@ button#toggle-search {
font-size: 13.3333px;
}

@media (min-width: 48.0625em) {
.nhsuk-header--organisation .nhsuk-header__link {
max-width: 500px;
float: left;
}
}

/* end of header.scss include */
/*
// variations to styling required for gutenberg native blocks
Expand Down Expand Up @@ -12939,6 +12946,10 @@ nav.learndash-pager ul li a.nhsuk-tag.nhsuk-tag--white, nav.learndash-pager ul l
padding: 8px 16px 4px 56px;
}

.tribe-common span.nhsuk-action-link__text {
margin-left: 40px;
}

.tribe-common .nhsuk-card-group div.nhsuk-grid-column-one-third, .tribe-common .ld-course-list-items div.nhsuk-grid-column-one-third {
margin-bottom: 24px;
}
Expand Down
2 changes: 1 addition & 1 deletion style.min.css

Large diffs are not rendered by default.

0 comments on commit 995b295

Please sign in to comment.