Remove internal use of govuk-typography-responsive

colinrotherham · colinrotherham · commit dfc6415a8257 · 2025-05-09T17:06:41.000+01:00
diff --git a/packages/components/back-link/_back-link.scss b/packages/components/back-link/_back-link.scss
@@ -28,7 +28,7 @@
   text-decoration: none;
 
   @include nhsuk-link-style-default;
-  @include nhsuk-typography-responsive(16);
+  @include nhsuk-font-size(16);
 
   .nhsuk-icon__chevron-left {
     height: 24px;
diff --git a/packages/components/details/_details.scss b/packages/components/details/_details.scss
@@ -17,7 +17,7 @@
 .nhsuk-details {
   display: block;
   @include nhsuk-text-color;
-  @include nhsuk-typography-responsive(19);
+  @include nhsuk-font-size(19);
   @include nhsuk-responsive-margin(4, "bottom");
 }
 
diff --git a/packages/components/images/_images.scss b/packages/components/images/_images.scss
@@ -42,5 +42,5 @@
 .nhsuk-image__caption {
   padding: nhsuk-spacing(3);
 
-  @include nhsuk-typography-responsive(16);
+  @include nhsuk-font-size(16);
 }
diff --git a/packages/components/label/_label.scss b/packages/components/label/_label.scss
@@ -21,22 +21,22 @@
 }
 
 .nhsuk-label--xl {
-  @include nhsuk-typography-responsive(48);
+  @include nhsuk-font-size(48);
 }
 
 .nhsuk-label--l {
-  @include nhsuk-typography-responsive(36);
+  @include nhsuk-font-size(36);
 }
 
 .nhsuk-label--m {
-  @include nhsuk-typography-responsive(26);
+  @include nhsuk-font-size(26);
 }
 
 .nhsuk-label--s {
   font-weight: $nhsuk-font-bold;
   margin-top: 0;
 
-  @include nhsuk-typography-responsive(19);
+  @include nhsuk-font-size(19);
 }
 
 // When the label is nested inside a heading, override the heading so that it
diff --git a/packages/components/pagination/_pagination.scss b/packages/components/pagination/_pagination.scss
@@ -116,7 +116,7 @@
 .nhsuk-pagination__title {
   display: block;
 
-  @include nhsuk-typography-responsive(24);
+  @include nhsuk-font-size(24);
 
   @include nhsuk-media-query($media-type: print) {
     &::after {
@@ -129,5 +129,5 @@
   display: block;
   text-decoration: underline;
 
-  @include nhsuk-typography-responsive(16);
+  @include nhsuk-font-size(16);
 }
diff --git a/packages/components/panel/_panel.scss b/packages/components/panel/_panel.scss
@@ -27,7 +27,7 @@ $nhsuk-border-width-panel: nhsuk-spacing(1);
   color: $color_nhsuk-white;
   padding: nhsuk-spacing(5) - $nhsuk-border-width-panel; /* [2] */
 
-  @include nhsuk-typography-responsive(24);
+  @include nhsuk-font-size(24);
   @include nhsuk-responsive-margin(4, "bottom");
 
   @include nhsuk-media-query($until: tablet) {
@@ -45,7 +45,7 @@ $nhsuk-border-width-panel: nhsuk-spacing(1);
 .nhsuk-panel__title {
   margin-top: 0;
 
-  @include nhsuk-typography-responsive(48);
+  @include nhsuk-font-size(48);
   @include nhsuk-responsive-margin(5, "bottom");
 }
 
diff --git a/packages/components/tables/_tables.scss b/packages/components/tables/_tables.scss
@@ -36,19 +36,19 @@
 }
 
 .nhsuk-table__caption--xl {
-  @include nhsuk-typography-responsive(48);
+  @include nhsuk-font-size(48);
 }
 
 .nhsuk-table__caption--l {
-  @include nhsuk-typography-responsive(36);
+  @include nhsuk-font-size(36);
 }
 
 .nhsuk-table__caption--m {
-  @include nhsuk-typography-responsive(26);
+  @include nhsuk-font-size(26);
 }
 
 .nhsuk-table__caption--s {
-  @include nhsuk-typography-responsive(22);
+  @include nhsuk-font-size(22);
 }
 
 // [2]
diff --git a/packages/core/elements/_table.scss b/packages/core/elements/_table.scss
@@ -39,7 +39,7 @@ td {
   text-align: left;
   vertical-align: top;
 
-  @include nhsuk-typography-responsive(19);
+  @include nhsuk-font-size(19);
   @include nhsuk-responsive-padding(3, "bottom");
   @include nhsuk-responsive-padding(4, "right");
   @include nhsuk-responsive-padding(3, "top");
diff --git a/packages/core/styles/_lists.scss b/packages/core/styles/_lists.scss
@@ -21,7 +21,7 @@
   margin-top: 0;
   padding-left: 0;
 
-  @include nhsuk-typography-responsive(19);
+  @include nhsuk-font-size(19);
   @include nhsuk-responsive-margin(4, "bottom");
 
   // Add a top margin and remove bottom margin for nested lists
diff --git a/packages/core/styles/_typography.scss b/packages/core/styles/_typography.scss
@@ -21,7 +21,7 @@
   font-weight: $nhsuk-font-bold;
   margin-top: 0;
 
-  @include nhsuk-typography-responsive(48);
+  @include nhsuk-font-size(48);
   @include nhsuk-responsive-margin(7, "bottom");
 }
 
@@ -35,7 +35,7 @@ h1,
   font-weight: $nhsuk-font-bold;
   margin-top: 0;
 
-  @include nhsuk-typography-responsive(36);
+  @include nhsuk-font-size(36);
   @include nhsuk-responsive-margin(4, "bottom");
 }
 
@@ -49,7 +49,7 @@ h2,
   font-weight: $nhsuk-font-bold;
   margin-top: 0;
 
-  @include nhsuk-typography-responsive(26);
+  @include nhsuk-font-size(26);
   @include nhsuk-responsive-margin(4, "bottom");
 }
 
@@ -63,7 +63,7 @@ h3,
   font-weight: $nhsuk-font-bold;
   margin-top: 0;
 
-  @include nhsuk-typography-responsive(22);
+  @include nhsuk-font-size(22);
   @include nhsuk-responsive-margin(4, "bottom");
 }
 
@@ -77,7 +77,7 @@ h4,
   font-weight: $nhsuk-font-bold;
   margin-top: 0;
 
-  @include nhsuk-typography-responsive(19);
+  @include nhsuk-font-size(19);
   @include nhsuk-responsive-margin(4, "bottom");
 }
 
@@ -91,7 +91,7 @@ h5,
   font-weight: $nhsuk-font-bold;
   margin-top: 0;
 
-  @include nhsuk-typography-responsive(19);
+  @include nhsuk-font-size(19);
   @include nhsuk-responsive-margin(4, "bottom");
 }
 
@@ -136,7 +136,7 @@ h6,
   display: block;
   margin-top: 0;
 
-  @include nhsuk-typography-responsive(24);
+  @include nhsuk-font-size(24);
   @include nhsuk-responsive-margin(5, "bottom");
 }
 
@@ -148,7 +148,7 @@ h6,
   display: block;
   margin-top: 0;
 
-  @include nhsuk-typography-responsive(19);
+  @include nhsuk-font-size(19);
   @include nhsuk-responsive-margin(4, "bottom");
 }
 
@@ -162,7 +162,7 @@ p,
   display: block;
   margin-top: 0;
 
-  @include nhsuk-typography-responsive(16);
+  @include nhsuk-font-size(16);
   @include nhsuk-responsive-margin(4, "bottom");
 }
 
diff --git a/packages/core/tools/_mixins.scss b/packages/core/tools/_mixins.scss
@@ -225,7 +225,7 @@
   position: relative;
   top: -16px; // [5]
 
-  @include nhsuk-typography-responsive(24);
+  @include nhsuk-font-size(24);
 
   @include nhsuk-media-query($until: tablet) {
     margin-left: -25px;
diff --git a/packages/core/utilities/_typography.scss b/packages/core/utilities/_typography.scss
@@ -18,7 +18,7 @@
 
 @each $size in map.keys($nhsuk-typography-scale) {
   .nhsuk-u-font-size-#{$size} {
-    @include nhsuk-typography-responsive($size, $important: true);
+    @include nhsuk-font-size($size, $important: true);
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`.nhsuk-details {`
`18`	`18`	`display: block;`
`19`	`19`	`@include nhsuk-text-color;`
`20`		`- @include nhsuk-typography-responsive(19);`
	`20`	`+ @include nhsuk-font-size(19);`
`21`	`21`	`@include nhsuk-responsive-margin(4, "bottom");`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -42,5 +42,5 @@`
`42`	`42`	`.nhsuk-image__caption {`
`43`	`43`	`padding: nhsuk-spacing(3);`
`44`	`44`
`45`		`- @include nhsuk-typography-responsive(16);`
	`45`	`+ @include nhsuk-font-size(16);`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,22 +21,22 @@`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`.nhsuk-label--xl {`
`24`		`- @include nhsuk-typography-responsive(48);`
	`24`	`+ @include nhsuk-font-size(48);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`.nhsuk-label--l {`
`28`		`- @include nhsuk-typography-responsive(36);`
	`28`	`+ @include nhsuk-font-size(36);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`.nhsuk-label--m {`
`32`		`- @include nhsuk-typography-responsive(26);`
	`32`	`+ @include nhsuk-font-size(26);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`.nhsuk-label--s {`
`36`	`36`	`font-weight: $nhsuk-font-bold;`
`37`	`37`	`margin-top: 0;`
`38`	`38`
`39`		`- @include nhsuk-typography-responsive(19);`
	`39`	`+ @include nhsuk-font-size(19);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`// When the label is nested inside a heading, override the heading so that it`
Original file line number	Diff line number	Diff line change
`@@ -36,19 +36,19 @@`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`.nhsuk-table__caption--xl {`
`39`		`- @include nhsuk-typography-responsive(48);`
	`39`	`+ @include nhsuk-font-size(48);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`.nhsuk-table__caption--l {`
`43`		`- @include nhsuk-typography-responsive(36);`
	`43`	`+ @include nhsuk-font-size(36);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`.nhsuk-table__caption--m {`
`47`		`- @include nhsuk-typography-responsive(26);`
	`47`	`+ @include nhsuk-font-size(26);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`.nhsuk-table__caption--s {`
`51`		`- @include nhsuk-typography-responsive(22);`
	`51`	`+ @include nhsuk-font-size(22);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`// [2]`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`@each $size in map.keys($nhsuk-typography-scale) {`
`20`	`20`	`.nhsuk-u-font-size-#{$size} {`
`21`		`- @include nhsuk-typography-responsive($size, $important: true);`
	`21`	`+ @include nhsuk-font-size($size, $important: true);`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`