diff --git a/packages/components/pagination/_pagination.scss b/packages/components/pagination/_pagination.scss index 5d4021aef..f40144b2a 100644 --- a/packages/components/pagination/_pagination.scss +++ b/packages/components/pagination/_pagination.scss @@ -114,7 +114,7 @@ } .nhsuk-pagination__title { - @include nhsuk-typography-responsive(24); + @include nhsuk-typography-responsive(26); display: block; diff --git a/packages/components/panel/_panel.scss b/packages/components/panel/_panel.scss index 05aa6a17a..a351a447b 100644 --- a/packages/components/panel/_panel.scss +++ b/packages/components/panel/_panel.scss @@ -22,7 +22,7 @@ $nhsuk-border-width-panel: nhsuk-spacing(1); .nhsuk-panel { - @include nhsuk-typography-responsive(24); + @include nhsuk-typography-responsive(26); @include nhsuk-responsive-margin(4, "bottom"); background: $color_nhsuk-green; diff --git a/packages/core/settings/_typography.scss b/packages/core/settings/_typography.scss index c866cf152..1f6d3dcda 100644 --- a/packages/core/settings/_typography.scss +++ b/packages/core/settings/_typography.scss @@ -83,20 +83,6 @@ $nhsuk-typography-scale: ( line-height: 1.25 ) ), - 24: ( - null: ( - font-size: 20px, - line-height: 28px - ), - tablet: ( - font-size: 24px, - line-height: 31px - ), - print: ( - font-size: 16pt, - line-height: 1.25 - ) - ), 22: ( null: ( font-size: 19px, diff --git a/packages/core/styles/_typography.scss b/packages/core/styles/_typography.scss index 8bd21b08a..8f861175f 100644 --- a/packages/core/styles/_typography.scss +++ b/packages/core/styles/_typography.scss @@ -139,7 +139,7 @@ h6, /// Body (paragraphs) %nhsuk-body-l { - @include nhsuk-typography-responsive(24); + @include nhsuk-typography-responsive(26); display: block; margin-top: 0; @@ -191,13 +191,13 @@ address { /// 2. Reduces the spacing between the page heading and the lede text .nhsuk-lede-text { - @include nhsuk-font(24); + @include nhsuk-font(26); @include nhsuk-responsive-margin(7, "bottom"); // [1] p, ul { - @include nhsuk-font(24); + @include nhsuk-font(26); } } diff --git a/packages/core/tools/_mixins.scss b/packages/core/tools/_mixins.scss index 7b95dc531..b61a2411d 100644 --- a/packages/core/tools/_mixins.scss +++ b/packages/core/tools/_mixins.scss @@ -162,7 +162,7 @@ /// @include heading-label($color_nhsuk-blue, $color_nhsuk-white); @mixin heading-label($heading-background-color, $heading-text-color) { - @include nhsuk-typography-responsive(24); + @include nhsuk-typography-responsive(26); background-color: $heading-background-color; // [1] color: $heading-text-color; // [2] diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Do__Dont_list_0_document_0_iPhone_5_SE.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Do__Dont_list_0_document_0_iPhone_5_SE.png index 9a2d2cb6f..6411fca4e 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Do__Dont_list_0_document_0_iPhone_5_SE.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Do__Dont_list_0_document_0_iPhone_5_SE.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Do__Dont_list_0_document_1_iPhone_6-8.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Do__Dont_list_0_document_1_iPhone_6-8.png index be6afbedf..7b3c015e6 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Do__Dont_list_0_document_1_iPhone_6-8.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Do__Dont_list_0_document_1_iPhone_6-8.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Do__Dont_list_0_document_2_iPad.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Do__Dont_list_0_document_2_iPad.png index e13b253f8..22af19a64 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Do__Dont_list_0_document_2_iPad.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Do__Dont_list_0_document_2_iPad.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Do__Dont_list_0_document_3_Surface_iPad_Pro.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Do__Dont_list_0_document_3_Surface_iPad_Pro.png index 5ea8f1e39..22004070d 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Do__Dont_list_0_document_3_Surface_iPad_Pro.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Do__Dont_list_0_document_3_Surface_iPad_Pro.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_0_document_0_iPhone_5_SE.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_0_document_0_iPhone_5_SE.png index ac8dbb963..ca23f36de 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_0_document_0_iPhone_5_SE.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_0_document_0_iPhone_5_SE.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_0_document_1_iPhone_6-8.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_0_document_1_iPhone_6-8.png index 068583093..0638dcf5d 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_0_document_1_iPhone_6-8.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_0_document_1_iPhone_6-8.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_0_document_2_iPad.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_0_document_2_iPad.png index 528714bbc..e85525ee7 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_0_document_2_iPad.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_0_document_2_iPad.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_0_document_3_Surface_iPad_Pro.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_0_document_3_Surface_iPad_Pro.png index 6fb69add2..3451f625b 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_0_document_3_Surface_iPad_Pro.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_0_document_3_Surface_iPad_Pro.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_with_image_and_content_0_document_0_iPhone_5_SE.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_with_image_and_content_0_document_0_iPhone_5_SE.png index 43d47c63c..391e09e53 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_with_image_and_content_0_document_0_iPhone_5_SE.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_with_image_and_content_0_document_0_iPhone_5_SE.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_with_image_and_content_0_document_1_iPhone_6-8.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_with_image_and_content_0_document_1_iPhone_6-8.png index 4139b8817..27435dc9c 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_with_image_and_content_0_document_1_iPhone_6-8.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_with_image_and_content_0_document_1_iPhone_6-8.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_with_image_and_content_0_document_2_iPad.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_with_image_and_content_0_document_2_iPad.png index 76c8aeb67..c008b9705 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_with_image_and_content_0_document_2_iPad.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_with_image_and_content_0_document_2_iPad.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_with_image_and_content_0_document_3_Surface_iPad_Pro.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_with_image_and_content_0_document_3_Surface_iPad_Pro.png index 69631d0b1..05463f2df 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_with_image_and_content_0_document_3_Surface_iPad_Pro.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Hero_with_image_and_content_0_document_3_Surface_iPad_Pro.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Pagination_0_document_0_iPhone_5_SE.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Pagination_0_document_0_iPhone_5_SE.png index fcde1ea89..943bed6bb 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Pagination_0_document_0_iPhone_5_SE.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Pagination_0_document_0_iPhone_5_SE.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Pagination_0_document_1_iPhone_6-8.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Pagination_0_document_1_iPhone_6-8.png index 34518ff64..df6d92e1c 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Pagination_0_document_1_iPhone_6-8.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Pagination_0_document_1_iPhone_6-8.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Pagination_0_document_2_iPad.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Pagination_0_document_2_iPad.png index 7d5862495..4feaaa39b 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Pagination_0_document_2_iPad.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Pagination_0_document_2_iPad.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Pagination_0_document_3_Surface_iPad_Pro.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Pagination_0_document_3_Surface_iPad_Pro.png index deb213b8b..19a7e6cd9 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Pagination_0_document_3_Surface_iPad_Pro.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Pagination_0_document_3_Surface_iPad_Pro.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Panel_0_document_0_iPhone_5_SE.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Panel_0_document_0_iPhone_5_SE.png index 7b76ca326..54c243a50 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Panel_0_document_0_iPhone_5_SE.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Panel_0_document_0_iPhone_5_SE.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Panel_0_document_1_iPhone_6-8.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Panel_0_document_1_iPhone_6-8.png index 0af96fa5d..8d749dad6 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Panel_0_document_1_iPhone_6-8.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Panel_0_document_1_iPhone_6-8.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Panel_0_document_2_iPad.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Panel_0_document_2_iPad.png index 991060475..061591286 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Panel_0_document_2_iPad.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Panel_0_document_2_iPad.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Panel_0_document_3_Surface_iPad_Pro.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Panel_0_document_3_Surface_iPad_Pro.png index c7f8b9e4e..3e91ca30a 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Panel_0_document_3_Surface_iPad_Pro.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Panel_0_document_3_Surface_iPad_Pro.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Table_as_panel_0_document_0_iPhone_5_SE.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Table_as_panel_0_document_0_iPhone_5_SE.png index f44841e6f..36277b2a8 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Table_as_panel_0_document_0_iPhone_5_SE.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Table_as_panel_0_document_0_iPhone_5_SE.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Table_as_panel_0_document_1_iPhone_6-8.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Table_as_panel_0_document_1_iPhone_6-8.png index 84b0f4960..f5d2af89e 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Table_as_panel_0_document_1_iPhone_6-8.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Table_as_panel_0_document_1_iPhone_6-8.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Table_as_panel_0_document_2_iPad.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Table_as_panel_0_document_2_iPad.png index e5733036a..3f57ac677 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Table_as_panel_0_document_2_iPad.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Table_as_panel_0_document_2_iPad.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Table_as_panel_0_document_3_Surface_iPad_Pro.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Table_as_panel_0_document_3_Surface_iPad_Pro.png index 06912461c..62b969925 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Table_as_panel_0_document_3_Surface_iPad_Pro.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Table_as_panel_0_document_3_Surface_iPad_Pro.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_0_document_0_iPhone_5_SE.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_0_document_0_iPhone_5_SE.png index 0cd50e16c..ef8cc4009 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_0_document_0_iPhone_5_SE.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_0_document_0_iPhone_5_SE.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_0_document_1_iPhone_6-8.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_0_document_1_iPhone_6-8.png index 35a37b189..f34980a21 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_0_document_1_iPhone_6-8.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_0_document_1_iPhone_6-8.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_0_document_2_iPad.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_0_document_2_iPad.png index a5eaeb179..93d8a1479 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_0_document_2_iPad.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_0_document_2_iPad.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_0_document_3_Surface_iPad_Pro.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_0_document_3_Surface_iPad_Pro.png index 658f574a5..4802ab8c7 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_0_document_3_Surface_iPad_Pro.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_0_document_3_Surface_iPad_Pro.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_with_custom_heading_0_document_0_iPhone_5_SE.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_with_custom_heading_0_document_0_iPhone_5_SE.png index c0155270a..1588f251f 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_with_custom_heading_0_document_0_iPhone_5_SE.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_with_custom_heading_0_document_0_iPhone_5_SE.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_with_custom_heading_0_document_1_iPhone_6-8.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_with_custom_heading_0_document_1_iPhone_6-8.png index 40acad96e..6f6ad2987 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_with_custom_heading_0_document_1_iPhone_6-8.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_with_custom_heading_0_document_1_iPhone_6-8.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_with_custom_heading_0_document_2_iPad.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_with_custom_heading_0_document_2_iPad.png index 2df031636..bae304292 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_with_custom_heading_0_document_2_iPad.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_with_custom_heading_0_document_2_iPad.png differ diff --git a/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_with_custom_heading_0_document_3_Surface_iPad_Pro.png b/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_with_custom_heading_0_document_3_Surface_iPad_Pro.png index efc1ba1e5..ca1bb5953 100644 Binary files a/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_with_custom_heading_0_document_3_Surface_iPad_Pro.png and b/tests/backstop/bitmaps_reference/nhsuk-frontend_Warning_callout_with_custom_heading_0_document_3_Surface_iPad_Pro.png differ