RubyGems - defra_ruby_template - Versions diffs - 3.15.0 → 5.4.0 - Mend

defra_ruby_template 3.15.0 → 5.4.0

Files changed (1304) hide show

data/vendor/assets/stylesheets/settings/_typography-font.scss CHANGED Viewed

@@ -1,29 +1,7 @@
-@import "compatibility";
-@import "typography-font-families";
 ////
 /// @group settings/typography
 ////
-/// Use 'legacy' fonts
-///
-/// Whether or not to use v1 nta font from GOV.UK Elements / Frontend
-/// Toolkit, for teams that are migrating to GOV.UK Frontend and may be using
-/// components from both places in a single application.
-///
-/// @type Boolean
-/// @access public
-$govuk-use-legacy-font: if(
-  (
-    $govuk-compatibility-govukfrontendtoolkit or
-    $govuk-compatibility-govuktemplate or
-    $govuk-compatibility-govukelements
-  ),
-  true,
-  false
-) !default;
 // =========================================================
 // Font families
 // =========================================================
@@ -33,22 +11,7 @@ $govuk-use-legacy-font: if(
 /// @type List
 /// @access public
-$govuk-font-family: if(
-  $govuk-use-legacy-font,
-  $govuk-font-family-nta,
-  $govuk-font-family-gds-transport
-) !default;
-/// Font families to use when displaying tabular numbers
-///
-/// @type List
-/// @access public
-$govuk-font-family-tabular: if(
-  $govuk-use-legacy-font,
-  $govuk-font-family-nta-tabular,
-  false
-) !default;
+$govuk-font-family: "GDS Transport", arial, sans-serif !default;
 /// Font families to use for print media
 ///
@@ -62,15 +25,13 @@ $govuk-font-family-print: sans-serif !default;
 /// Include the default @font-face declarations
 ///
-/// If you have set $govuk-font-family to something other than
-/// `$govuk-font-family-gds-transport` this option is disabled by default.
+/// Defaults to true if "GDS Transport" appears in the $govuk-font-family
+/// setting.
 ///
 /// @type Boolean
 /// @access public
-$govuk-include-default-font-face: (
-  $govuk-font-family == $govuk-font-family-gds-transport
-) !default;
+$govuk-include-default-font-face: if(index($govuk-font-family, "GDS Transport"), true, false) !default;
 // =========================================================
 // Font weights
@@ -87,3 +48,5 @@ $govuk-font-weight-regular: 400 !default;
 /// @type Number
 /// @access public
 $govuk-font-weight-bold: 700 !default;
+/*# sourceMappingURL=_typography-font.scss.map */

data/vendor/assets/stylesheets/settings/_typography-responsive.scss CHANGED Viewed

@@ -1,29 +1,7 @@
-@import "compatibility";
 ////
 /// @group settings/typography
 ////
-/// Whether or not to define font sizes in rem, improving accessibility by
-/// allowing users to adjust the base font-size. This is enabled by default,
-/// unless any of the compatibility mode settings are enabled.
-///
-/// You should make sure that $govuk-root-font-size is set correctly for your
-/// project.
-///
-/// @type Boolean
-/// @access public
-$govuk-typography-use-rem: if(
-  (
-    $govuk-compatibility-govukfrontendtoolkit or
-    $govuk-compatibility-govuktemplate or
-    $govuk-compatibility-govukelements
-  ),
-  false,
-  true
-) !default;
 /// Root font size
 ///
 /// This is used to calculate rem sizes for the typography, and should match the
@@ -33,30 +11,25 @@ $govuk-typography-use-rem: if(
 /// in order to allow it to scale with user-preference, in which case this
 /// should be set to 16px.
 ///
-/// If you are integrating Frontend into an existing project that also uses
-/// alphagov/govuk_template and you wish to enable `$govuk-typography-use-rem`
-/// then you should set this to 10px to match the 62.5% (10px) base font size
-/// that govuk_template sets on the <html> element.
-///
 /// @type Number
 /// @access public
 $govuk-root-font-size: 16px !default;
-/// Responsive typography font map
+/// Feature flag for new typography scale
 ///
-/// This is used to generate responsive typography that adapts according to the
-/// breakpoints.
+/// 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.
 ///
-/// 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.
+/// Should be removed in 6.0.
 ///
-/// You can also specify a separate font size and line height for print media.
+/// @type Boolean
+/// @access public
+$govuk-new-typography-scale: false !default;
+/// The font map for the old typography scale
 ///
 /// @type Map
 ///
@@ -65,9 +38,9 @@ $govuk-root-font-size: 16px !default;
 /// @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
+/// @access private
-$govuk-typography-scale: (
+$_govuk-typography-scale-legacy: (
   80: (
     null: (
       font-size: 53px,
@@ -178,6 +151,172 @@ $govuk-typography-scale: (
     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
+///
+/// @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 private
+$_govuk-typography-scale-modern: (
+  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: 27px,
+      line-height: 30px
+    ),
+    tablet: (
+      font-size: 36px,
+      line-height: 40px
+    ),
+    print: (
+      font-size: 24pt,
+      line-height: 1.05
+    )
+  ),
+  27: (
+    // Made same as 24 on mobile (consider deprecating this size)
+    null:
+      (
+        font-size: 21px,
+        line-height: 25px
+      ),
+    tablet: (
+      font-size: 27px,
+      line-height: 30px
+    ),
+    print: (
+      font-size: 18pt,
+      line-height: 1.15
+    )
+  ),
+  24: (
+    // Bump up mobile size from 18/20 to 21/25
+    null:
+      (
+        font-size: 21px,
+        line-height: 25px
+      ),
+    tablet: (
+      font-size: 24px,
+      line-height: 30px
+    ),
+    print: (
+      font-size: 18pt,
+      line-height: 1.15
+    )
+  ),
+  19: (
+    // Stay at 19/25 at all sizes
+    null:
+      (
+        font-size: 19px,
+        line-height: 25px
+      ),
+    print: (
+      font-size: 14pt,
+      line-height: 1.15
+    )
+  ),
+  16: (
+    // Stay at 16/20 at all sizes
+    null:
+      (
+        font-size: 16px,
+        line-height: 20px
+      ),
+    print: (
+      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/vendor/assets/stylesheets/settings/_warnings.scss ADDED Viewed

@@ -0,0 +1,78 @@
+////
+/// @group settings/warnings
+////
+/// Suppressed warnings map
+///
+/// This map is used to determine which deprecation warnings to **not** show
+/// to users when compiling sass. This is in place for codebases that do not
+/// have the necessary capacity to upgrade and remove the deprecation,
+/// particularly if the deprecation is significant. For example, the removal of
+/// mixins and functions that were previously available to users of Frontend.
+///
+/// You can add to this map and define which warnings to suppress by appending to
+/// it using the warning key, found in the warning message. For example:
+///
+/// @example scss:
+///   // warning message:
+///   //  $foobar is no longer supported. To silence this warning, update
+///   //  $govuk-suppressed-warnings with key: "foobar"
+///   $govuk-suppressed-warnings: (
+///     foobar
+///   );
+///
+/// @type List
+/// @access public
+$govuk-suppressed-warnings: () !default;
+/// Warnings
+///
+/// Acts as a wrapper for the built in `@warn` sass function
+///
+/// We use this instead of using `@warn` for 3 reasons:
+///
+/// - To check if a warning is being suppressed through `$govuk-suppressed-warnings`,
+/// in which case we don't call `@warn` and printing the warning to the user
+/// - To format the passed warning `$message` with the warning key at the end
+/// - To prevent duplicate warnings by adding the passed `$key` to
+/// `$govuk-suppressed-warnings` after `@warn` is called to ensure it only runs
+/// once per sass compilation (unless $silence-further-warnings is false)
+///
+/// @param {String} $key - The key to be checked against `$govuk-suppressed-warnings`
+/// and then passed to it to prevent multiple of the same warning.
+/// @param {String} $message - The message to use when calling `@warn`
+/// @param {Boolean} $silence-further-warnings - Whether to silence future
+/// warnings that use the same $key
+/// @access private
+@mixin _warning($key, $message, $silence-further-warnings: true) {
+  @if _should-warn($key) {
+    @warn _warning-text($key, $message);
+    @if $silence-further-warnings {
+      $govuk-suppressed-warnings: append($govuk-suppressed-warnings, $key) !global;
+    }
+  }
+}
+/// Check whether a key is present in the suppressed warnings list.
+///
+/// @param {String} $key - The key to be checked against `$govuk-suppressed-warnings`.
+/// @access private
+@function _should-warn($key) {
+  @return index($govuk-suppressed-warnings, $key) == null;
+}
+/// Format a warning by appending information on how to suppress it.
+///
+/// @param {String} $key - The key needed to suppress the warning.
+/// @param {String} $message - The warning text.
+/// @access private
+@function _warning-text($key, $message) {
+  @return $message + " To silence this warning, update $govuk-suppressed-warnings " + 'with key: "#{$key}"';
+}
+/*# sourceMappingURL=_warnings.scss.map */

data/vendor/assets/stylesheets/tools/_all.scss CHANGED Viewed

@@ -1,8 +1,10 @@
-@import "compatibility";
-@import "exports";
-@import "font-url";
-@import "ie8";
-@import "iff";
-@import "image-url";
-@import "px-to-em";
-@import "px-to-rem";
+@import "../settings/warnings";
+@import "index";
+@include _warning(
+  "import-using-all",
+  "Importing using 'govuk/tools/all' is deprecated. Update your import statement to import 'govuk/tools/index'.",
+  $silence-further-warnings: false
+);
+/*# sourceMappingURL=_all.scss.map */

data/vendor/assets/stylesheets/tools/_exports.scss CHANGED Viewed

@@ -22,7 +22,7 @@ $_govuk-imported-modules: () !default;
 @mixin govuk-exports($name) {
   // If the mixin is not in the list of modules already exported...
-  @if (index($_govuk-imported-modules, $name) == null) {
+  @if not index($_govuk-imported-modules, $name) {
     // ... then add it to the list
     $_govuk-imported-modules: append($_govuk-imported-modules, $name) !global;
     // ... and output the CSS for that module
@@ -31,3 +31,5 @@ $_govuk-imported-modules: () !default;
   // The next time exports is called for the module of the same name, it will be
   // found in the list and so nothing will be outputted.
 }
+/*# sourceMappingURL=_exports.scss.map */

data/vendor/assets/stylesheets/tools/_font-url.scss CHANGED Viewed

@@ -13,13 +13,16 @@
 /// @access public
 @function govuk-font-url($filename) {
+  // prettier-ignore
   $use-custom-function: variable-exists("govuk-font-url-function")
     and $govuk-font-url-function
     and function-exists($govuk-font-url-function);
-  @if ($use-custom-function) {
+  @if $use-custom-function {
     @return call(get-function($govuk-font-url-function), $filename);
   } @else {
     @return url($govuk-fonts-path + $filename);
   }
 }
+/*# sourceMappingURL=_font-url.scss.map */

data/vendor/assets/stylesheets/tools/_image-url.scss CHANGED Viewed

@@ -13,13 +13,16 @@
 /// @access public
 @function govuk-image-url($filename) {
+  // prettier-ignore
   $use-custom-function: variable-exists("govuk-image-url-function")
     and $govuk-image-url-function
     and function-exists($govuk-image-url-function);
-  @if ($use-custom-function) {
+  @if $use-custom-function {
     @return call(get-function($govuk-image-url-function), $filename);
   } @else {
     @return url($govuk-images-path + $filename);
   }
 }
+/*# sourceMappingURL=_image-url.scss.map */

data/vendor/assets/stylesheets/tools/_index.scss ADDED Viewed

@@ -0,0 +1,7 @@
+@import "exports";
+@import "font-url";
+@import "image-url";
+@import "px-to-em";
+@import "px-to-rem";
+/*# sourceMappingURL=_index.scss.map */

data/vendor/assets/stylesheets/tools/_px-to-em.scss CHANGED Viewed

@@ -10,11 +10,13 @@
 /// @access public
 @function govuk-em($value, $context-font-size) {
-  @if (unitless($value)) {
+  @if unitless($value) {
     $value: $value * 1px;
   }
-  @if (unitless($context-font-size)) {
+  @if unitless($context-font-size) {
     $context-font-size: $context-font-size * 1px;
   }
   @return $value / $context-font-size * 1em;
 }
+/*# sourceMappingURL=_px-to-em.scss.map */

data/vendor/assets/stylesheets/tools/_px-to-rem.scss CHANGED Viewed

@@ -12,9 +12,11 @@
 /// @access public
 @function govuk-px-to-rem($value) {
-  @if (unitless($value)) {
+  @if unitless($value) {
     $value: $value * 1px;
   }
   @return $value / $govuk-root-font-size * 1rem;
 }
+/*# sourceMappingURL=_px-to-rem.scss.map */

data/vendor/assets/stylesheets/utilities/_all.scss CHANGED Viewed

@@ -1,2 +1,10 @@
-@import "clearfix";
-@import "visually-hidden";
+@import "../settings/warnings";
+@import "index";
+@include _warning(
+  "import-using-all",
+  "Importing using 'govuk/utilities/all' is deprecated. Update your import statement to import 'govuk/utilities/index'.",
+  $silence-further-warnings: false
+);
+/*# sourceMappingURL=_all.scss.map */

data/vendor/assets/stylesheets/utilities/_clearfix.scss CHANGED Viewed

@@ -3,3 +3,5 @@
     @include govuk-clearfix;
   }
 }
+/*# sourceMappingURL=_clearfix.scss.map */

data/vendor/assets/stylesheets/utilities/_index.scss ADDED Viewed

@@ -0,0 +1,4 @@
+@import "clearfix";
+@import "visually-hidden";
+/*# sourceMappingURL=_index.scss.map */

data/vendor/assets/stylesheets/utilities/_visually-hidden.scss CHANGED Viewed

@@ -7,3 +7,5 @@
     @include govuk-visually-hidden-focusable;
   }
 }
+/*# sourceMappingURL=_visually-hidden.scss.map */

data/vendor/assets/stylesheets/vendor/_sass-mq.scss CHANGED Viewed

@@ -319,7 +319,7 @@ $mq-media-type: all !default;
 ///  // Show breakpoints using custom settings
 ///  @include mq-show-breakpoints((L, XL), (S: 300px, L: 800px, XL: 1200px));
 @mixin mq-show-breakpoints($show-breakpoints: $mq-show-breakpoints, $breakpoints: $mq-breakpoints) {
-    body:before {
+    body::before {
         background-color: #FCF8E3;
         border-bottom: 1px solid #FBEED5;
         border-left: 1px solid #FBEED5;
@@ -345,3 +345,5 @@ $mq-media-type: all !default;
 @if length($mq-show-breakpoints) > 0 {
     @include mq-show-breakpoints;
 }
+/*# sourceMappingURL=_sass-mq.scss.map */