govuk_tech_docs 5.2.2 → 6.0.0.beta

data/node_modules/govuk-frontend/dist/govuk/settings/_typography-responsive.scss

@@ -16,151 +16,20 @@
 
 $govuk-root-font-size: 16px !default;
 
-/// Feature flag for new typography scale
-///
-/// When set to true, $govuk-typography-scale will use the new font map instead
-/// of the current/old one as well as apply changes in components to account
-/// for the updated scale.
-///
-/// Should be removed in 6.0.
+/// Responsive typography font map
 ///
-/// @type Boolean
-/// @access public
-
-$govuk-new-typography-scale: false !default;
-
-/// The font map for the old typography scale
+/// This is used to generate responsive typography that adapts according to the
+/// breakpoints.
 ///
-/// @type Map
+/// Font size and font weight can be defined for each breakpoint. You can define
+/// different behaviour on tablet and desktop. The 'null' breakpoint is for
+/// mobile.
 ///
-/// @prop {Number} $point.$breakpoint.font-size - Font size for `$point` at `$breakpoint`
-/// @prop {Number} $point.$breakpoint.line-height - Line height for `$point` at `$breakpoint`
-/// @prop {Number} $point.print.font-size - Font size for `$point` when printing
-/// @prop {Number} $point.print.line-height - Line height for `$point` when printing
+/// Line-heights will automatically be converted from pixel measurements into
+/// relative values. For example, with a font-size of 16px and a line-height of
+/// 24px, the line-height will be converted to 1.5 before output.
 ///
-/// @access private
-
-$_govuk-typography-scale-legacy: (
-  80: (
-    null: (
-      font-size: 53px,
-      line-height: 55px
-    ),
-    tablet: (
-      font-size: 80px,
-      line-height: 80px
-    ),
-    print: (
-      font-size: 53pt,
-      line-height: 1.1
-    )
-  ),
-  48: (
-    null: (
-      font-size: 32px,
-      line-height: 35px
-    ),
-    tablet: (
-      font-size: 48px,
-      line-height: 50px
-    ),
-    print: (
-      font-size: 32pt,
-      line-height: 1.15
-    )
-  ),
-  36: (
-    null: (
-      font-size: 24px,
-      line-height: 25px
-    ),
-    tablet: (
-      font-size: 36px,
-      line-height: 40px
-    ),
-    print: (
-      font-size: 24pt,
-      line-height: 1.05
-    )
-  ),
-  27: (
-    null: (
-      font-size: 18px,
-      line-height: 20px
-    ),
-    tablet: (
-      font-size: 27px,
-      line-height: 30px
-    ),
-    print: (
-      font-size: 18pt,
-      line-height: 1.15
-    )
-  ),
-  24: (
-    null: (
-      font-size: 18px,
-      line-height: 20px
-    ),
-    tablet: (
-      font-size: 24px,
-      line-height: 30px
-    ),
-    print: (
-      font-size: 18pt,
-      line-height: 1.15
-    )
-  ),
-  19: (
-    null: (
-      font-size: 16px,
-      line-height: 20px
-    ),
-    tablet: (
-      font-size: 19px,
-      line-height: 25px
-    ),
-    print: (
-      font-size: 14pt,
-      line-height: 1.15
-    )
-  ),
-  16: (
-    null: (
-      font-size: 14px,
-      line-height: 16px
-    ),
-    tablet: (
-      font-size: 16px,
-      line-height: 20px
-    ),
-    print: (
-      font-size: 14pt,
-      line-height: 1.2
-    )
-  ),
-  14: (
-    null: (
-      font-size: 12px,
-      line-height: 15px
-    ),
-    tablet: (
-      font-size: 14px,
-      line-height: 20px
-    ),
-    print: (
-      font-size: 12pt,
-      line-height: 1.2
-    ),
-    deprecation: (
-      key: "govuk-typography-scale-14",
-      message: "14 on the type scale is deprecated and will be removed as " +
-        "a possible option in the next major version."
-    )
-  )
-);
-
-/// The font map for the new typography scale
+/// You can also specify a separate font size and line height for print media.
 ///
 /// @type Map
 ///
@@ -169,9 +38,9 @@ $_govuk-typography-scale-legacy: (
 /// @prop {Number} $point.print.font-size - Font size for `$point` when printing
 /// @prop {Number} $point.print.line-height - Line height for `$point` when printing
 ///
-/// @access private
+/// @access public
 
-$_govuk-typography-scale-modern: (
+$govuk-typography-scale: (
   80: (
     null: (
       font-size: 53px,
@@ -265,53 +134,7 @@ $_govuk-typography-scale-modern: (
       font-size: 14pt,
       line-height: 1.2
     )
-  ),
-  14: (
-    // Stay at 14/20 at all sizes (consider deprecating this size)
-    null: (
-        font-size: 14px,
-        line-height: 20px
-      ),
-    print: (
-      font-size: 12pt,
-      line-height: 1.2
-    ),
-    deprecation: (
-      key: "govuk-typography-scale-14",
-      message: "14 on the type scale is deprecated and will be removed as " +
-        "a possible option in the next major version."
-    )
   )
-);
-
-/// Responsive typography font map
-///
-/// This is used to generate responsive typography that adapts according to the
-/// breakpoints.
-///
-/// Font size and font weight can be defined for each breakpoint. You can define
-/// different behaviour on tablet and desktop. The 'null' breakpoint is for
-/// mobile.
-///
-/// Line-heights will automatically be converted from pixel measurements into
-/// relative values. For example, with a font-size of 16px and a line-height of
-/// 24px, the line-height will be converted to 1.5 before output.
-///
-/// You can also specify a separate font size and line height for print media.
-///
-/// @type Map
-///
-/// @prop {Number} $point.$breakpoint.font-size - Font size for `$point` at `$breakpoint`
-/// @prop {Number} $point.$breakpoint.line-height - Line height for `$point` at `$breakpoint`
-/// @prop {Number} $point.print.font-size - Font size for `$point` when printing
-/// @prop {Number} $point.print.line-height - Line height for `$point` when printing
-///
-/// @access public
-
-$govuk-typography-scale: if(
-  $govuk-new-typography-scale,
-  $_govuk-typography-scale-modern,
-  $_govuk-typography-scale-legacy
 ) !default;
 
 /*# sourceMappingURL=_typography-responsive.scss.map */

data/node_modules/govuk-frontend/dist/govuk/tools/_index.scss

@@ -3,6 +3,5 @@
 @import "image-url";
 @import "px-to-em";
 @import "px-to-rem";
-@import "rebrand";
 
 /*# sourceMappingURL=_index.scss.map */

data/node_modules/govuk-frontend/dist/govuk/tools/_px-to-em.scss

@@ -2,14 +2,16 @@
 /// @group tools/unit-conversion
 ////
 
+@import "../settings/typography-responsive";
+
 /// Convert pixels to em
 ///
 /// @param {Number} $value - Length in pixels
-/// @param {Number} $context-font-size - Font size of element
+/// @param {Number} $context-font-size [$govuk-root-font-size] - Font size of element
 /// @return {Number} Length in ems
 /// @access public
 
-@function govuk-em($value, $context-font-size) {
+@function govuk-em($value, $context-font-size: $govuk-root-font-size) {
   @if unitless($value) {
     $value: $value * 1px;
   }

data/node_modules/govuk-frontend/dist/govuk/tools/_px-to-rem.scss

@@ -2,6 +2,8 @@
 /// @group tools/unit-conversion
 ////
 
+@import "../settings/typography-responsive";
+
 /// Convert pixels to rem
 ///
 /// The $govuk-root-font-size (defined in settings/_typography-responsive.scss)