govuk_tech_docs 5.2.1 → 6.0.0.beta

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (169) hide show
  1. checksums.yaml +4 -4
  2. data/.github/dependabot.yml +59 -0
  3. data/.npmrc +1 -0
  4. data/.ruby-version +1 -0
  5. data/CHANGELOG.md +19 -0
  6. data/README.md +13 -4
  7. data/example/config/tech-docs.yml +1 -1
  8. data/govuk_tech_docs.gemspec +2 -2
  9. data/lib/assets/stylesheets/_core.scss +1 -0
  10. data/lib/assets/stylesheets/_govuk_tech_docs.scss +13 -15
  11. data/lib/assets/stylesheets/modules/_app-pane.scss +3 -3
  12. data/lib/assets/stylesheets/modules/_page-review.scss +4 -4
  13. data/lib/assets/stylesheets/modules/_search.scss +3 -3
  14. data/lib/assets/stylesheets/modules/_service-navigation.scss +5 -0
  15. data/lib/assets/stylesheets/modules/_technical-documentation.scss +7 -7
  16. data/lib/assets/stylesheets/modules/_toc.scss +13 -13
  17. data/lib/assets/stylesheets/palette/_syntax-highlighting.scss +9 -7
  18. data/lib/govuk_tech_docs/meta_tags.rb +1 -1
  19. data/lib/govuk_tech_docs/version.rb +1 -1
  20. data/lib/source/layouts/_header.erb +2 -16
  21. data/lib/source/layouts/_service_navigation.erb +27 -0
  22. data/lib/source/layouts/core.erb +7 -7
  23. data/node_modules/govuk-frontend/dist/govuk/_base.scss +1 -0
  24. data/node_modules/govuk-frontend/dist/govuk/all.bundle.js +183 -300
  25. data/node_modules/govuk-frontend/dist/govuk/all.bundle.mjs +184 -300
  26. data/node_modules/govuk-frontend/dist/govuk/all.mjs +0 -1
  27. data/node_modules/govuk-frontend/dist/govuk/assets/images/favicon.ico +0 -0
  28. data/node_modules/govuk-frontend/dist/govuk/assets/images/favicon.svg +1 -1
  29. data/node_modules/govuk-frontend/dist/govuk/assets/images/govuk-icon-180.png +0 -0
  30. data/node_modules/govuk-frontend/dist/govuk/assets/images/govuk-icon-192.png +0 -0
  31. data/node_modules/govuk-frontend/dist/govuk/assets/images/govuk-icon-512.png +0 -0
  32. data/node_modules/govuk-frontend/dist/govuk/assets/images/govuk-opengraph-image.png +0 -0
  33. data/node_modules/govuk-frontend/dist/govuk/common/configuration.mjs +29 -2
  34. data/node_modules/govuk-frontend/dist/govuk/common/govuk-frontend-version.mjs +1 -1
  35. data/node_modules/govuk-frontend/dist/govuk/common/index.mjs +4 -10
  36. data/node_modules/govuk-frontend/dist/govuk/components/accordion/_index.scss +18 -15
  37. data/node_modules/govuk-frontend/dist/govuk/components/accordion/accordion.bundle.js +14 -137
  38. data/node_modules/govuk-frontend/dist/govuk/components/accordion/accordion.bundle.mjs +14 -137
  39. data/node_modules/govuk-frontend/dist/govuk/components/accordion/accordion.mjs +4 -4
  40. data/node_modules/govuk-frontend/dist/govuk/components/back-link/_index.scss +2 -2
  41. data/node_modules/govuk-frontend/dist/govuk/components/breadcrumbs/_index.scss +2 -2
  42. data/node_modules/govuk-frontend/dist/govuk/components/button/_index.scss +18 -21
  43. data/node_modules/govuk-frontend/dist/govuk/components/button/button.bundle.js +7 -5
  44. data/node_modules/govuk-frontend/dist/govuk/components/button/button.bundle.mjs +7 -5
  45. data/node_modules/govuk-frontend/dist/govuk/components/character-count/_index.scss +2 -2
  46. data/node_modules/govuk-frontend/dist/govuk/components/character-count/character-count.bundle.js +30 -143
  47. data/node_modules/govuk-frontend/dist/govuk/components/character-count/character-count.bundle.mjs +30 -143
  48. data/node_modules/govuk-frontend/dist/govuk/components/character-count/character-count.mjs +20 -10
  49. data/node_modules/govuk-frontend/dist/govuk/components/checkboxes/_index.scss +7 -6
  50. data/node_modules/govuk-frontend/dist/govuk/components/checkboxes/checkboxes.bundle.js +10 -5
  51. data/node_modules/govuk-frontend/dist/govuk/components/checkboxes/checkboxes.bundle.mjs +10 -5
  52. data/node_modules/govuk-frontend/dist/govuk/components/cookie-banner/_index.scss +2 -5
  53. data/node_modules/govuk-frontend/dist/govuk/components/date-input/_index.scss +5 -0
  54. data/node_modules/govuk-frontend/dist/govuk/components/details/_index.scss +6 -4
  55. data/node_modules/govuk-frontend/dist/govuk/components/error-message/_index.scss +1 -1
  56. data/node_modules/govuk-frontend/dist/govuk/components/error-summary/_index.scss +4 -2
  57. data/node_modules/govuk-frontend/dist/govuk/components/error-summary/error-summary.bundle.js +8 -12
  58. data/node_modules/govuk-frontend/dist/govuk/components/error-summary/error-summary.bundle.mjs +8 -12
  59. data/node_modules/govuk-frontend/dist/govuk/components/error-summary/error-summary.mjs +2 -2
  60. data/node_modules/govuk-frontend/dist/govuk/components/exit-this-page/_index.scss +1 -1
  61. data/node_modules/govuk-frontend/dist/govuk/components/exit-this-page/exit-this-page.bundle.js +10 -133
  62. data/node_modules/govuk-frontend/dist/govuk/components/exit-this-page/exit-this-page.bundle.mjs +10 -133
  63. data/node_modules/govuk-frontend/dist/govuk/components/file-upload/_index.scss +30 -38
  64. data/node_modules/govuk-frontend/dist/govuk/components/file-upload/file-upload.bundle.js +46 -140
  65. data/node_modules/govuk-frontend/dist/govuk/components/file-upload/file-upload.bundle.mjs +46 -140
  66. data/node_modules/govuk-frontend/dist/govuk/components/file-upload/file-upload.mjs +36 -7
  67. data/node_modules/govuk-frontend/dist/govuk/components/footer/_index.scss +30 -27
  68. data/node_modules/govuk-frontend/dist/govuk/components/header/_index.scss +89 -449
  69. data/node_modules/govuk-frontend/dist/govuk/components/hint/_index.scss +1 -1
  70. data/node_modules/govuk-frontend/dist/govuk/components/input/_index.scss +14 -20
  71. data/node_modules/govuk-frontend/dist/govuk/components/inset-text/_index.scss +2 -1
  72. data/node_modules/govuk-frontend/dist/govuk/components/notification-banner/_index.scss +10 -8
  73. data/node_modules/govuk-frontend/dist/govuk/components/notification-banner/notification-banner.bundle.js +7 -5
  74. data/node_modules/govuk-frontend/dist/govuk/components/notification-banner/notification-banner.bundle.mjs +7 -5
  75. data/node_modules/govuk-frontend/dist/govuk/components/pagination/_index.scss +16 -11
  76. data/node_modules/govuk-frontend/dist/govuk/components/panel/_index.scss +4 -4
  77. data/node_modules/govuk-frontend/dist/govuk/components/password-input/_index.scss +2 -2
  78. data/node_modules/govuk-frontend/dist/govuk/components/password-input/password-input.bundle.js +10 -133
  79. data/node_modules/govuk-frontend/dist/govuk/components/password-input/password-input.bundle.mjs +10 -133
  80. data/node_modules/govuk-frontend/dist/govuk/components/phase-banner/_index.scss +12 -6
  81. data/node_modules/govuk-frontend/dist/govuk/components/radios/_index.scss +8 -7
  82. data/node_modules/govuk-frontend/dist/govuk/components/radios/radios.bundle.js +10 -5
  83. data/node_modules/govuk-frontend/dist/govuk/components/radios/radios.bundle.mjs +10 -5
  84. data/node_modules/govuk-frontend/dist/govuk/components/select/_index.scss +6 -11
  85. data/node_modules/govuk-frontend/dist/govuk/components/service-navigation/_index.scss +58 -74
  86. data/node_modules/govuk-frontend/dist/govuk/components/service-navigation/service-navigation.bundle.js +40 -7
  87. data/node_modules/govuk-frontend/dist/govuk/components/service-navigation/service-navigation.bundle.mjs +40 -7
  88. data/node_modules/govuk-frontend/dist/govuk/components/service-navigation/service-navigation.mjs +30 -2
  89. data/node_modules/govuk-frontend/dist/govuk/components/skip-link/_index.scss +8 -4
  90. data/node_modules/govuk-frontend/dist/govuk/components/skip-link/skip-link.bundle.js +12 -19
  91. data/node_modules/govuk-frontend/dist/govuk/components/skip-link/skip-link.bundle.mjs +12 -19
  92. data/node_modules/govuk-frontend/dist/govuk/components/skip-link/skip-link.mjs +3 -9
  93. data/node_modules/govuk-frontend/dist/govuk/components/summary-list/_index.scss +25 -21
  94. data/node_modules/govuk-frontend/dist/govuk/components/table/_index.scss +7 -8
  95. data/node_modules/govuk-frontend/dist/govuk/components/tabs/_index.scss +9 -6
  96. data/node_modules/govuk-frontend/dist/govuk/components/tabs/tabs.bundle.js +12 -13
  97. data/node_modules/govuk-frontend/dist/govuk/components/tabs/tabs.bundle.mjs +12 -13
  98. data/node_modules/govuk-frontend/dist/govuk/components/tabs/tabs.mjs +3 -3
  99. data/node_modules/govuk-frontend/dist/govuk/components/tag/_index.scss +66 -31
  100. data/node_modules/govuk-frontend/dist/govuk/components/task-list/_index.scss +7 -5
  101. data/node_modules/govuk-frontend/dist/govuk/components/textarea/_index.scss +5 -10
  102. data/node_modules/govuk-frontend/dist/govuk/components/warning-text/_index.scss +5 -4
  103. data/node_modules/govuk-frontend/dist/govuk/core/_index.scss +0 -1
  104. data/node_modules/govuk-frontend/dist/govuk/core/_lists.scss +2 -2
  105. data/node_modules/govuk-frontend/dist/govuk/core/_section-break.scss +2 -1
  106. data/node_modules/govuk-frontend/dist/govuk/core/_typography.scss +6 -20
  107. data/node_modules/govuk-frontend/dist/govuk/custom-properties/_breakpoints.scss +17 -0
  108. data/node_modules/govuk-frontend/dist/govuk/custom-properties/_frontend-version.scss +15 -0
  109. data/node_modules/govuk-frontend/dist/govuk/custom-properties/_functional-colours.scss +17 -0
  110. data/node_modules/govuk-frontend/dist/govuk/custom-properties/_index.scss +5 -0
  111. data/node_modules/govuk-frontend/dist/govuk/errors/index.mjs +5 -3
  112. data/node_modules/govuk-frontend/dist/govuk/govuk-frontend.min.js +1 -1
  113. data/node_modules/govuk-frontend/dist/govuk/helpers/_colour.scss +187 -72
  114. data/node_modules/govuk-frontend/dist/govuk/helpers/_focused.scss +41 -6
  115. data/node_modules/govuk-frontend/dist/govuk/helpers/_grid.scss +1 -1
  116. data/node_modules/govuk-frontend/dist/govuk/helpers/_links.scss +24 -40
  117. data/node_modules/govuk-frontend/dist/govuk/helpers/_media-queries.scss +172 -33
  118. data/node_modules/govuk-frontend/dist/govuk/helpers/_spacing.scss +1 -1
  119. data/node_modules/govuk-frontend/dist/govuk/helpers/_typography.scss +6 -30
  120. data/node_modules/govuk-frontend/dist/govuk/helpers/_visually-hidden.scss +4 -1
  121. data/node_modules/govuk-frontend/dist/govuk/i18n.mjs +5 -128
  122. data/node_modules/govuk-frontend/dist/govuk/init.mjs +53 -45
  123. data/node_modules/govuk-frontend/dist/govuk/objects/_button-group.scss +1 -1
  124. data/node_modules/govuk-frontend/dist/govuk/objects/_form-group.scss +2 -1
  125. data/node_modules/govuk-frontend/dist/govuk/objects/_main-wrapper.scss +1 -1
  126. data/node_modules/govuk-frontend/dist/govuk/objects/_template.scss +3 -7
  127. data/node_modules/govuk-frontend/dist/govuk/objects/_width-container.scss +2 -2
  128. data/node_modules/govuk-frontend/dist/govuk/overrides/_display.scss +1 -1
  129. data/node_modules/govuk-frontend/dist/govuk/overrides/_typography.scss +0 -2
  130. data/node_modules/govuk-frontend/dist/govuk/overrides/_width.scss +5 -5
  131. data/node_modules/govuk-frontend/dist/govuk/settings/_colours-applied.scss +3 -188
  132. data/node_modules/govuk-frontend/dist/govuk/settings/_colours-functional.scss +366 -0
  133. data/node_modules/govuk-frontend/dist/govuk/settings/_colours-organisations.scss +9 -255
  134. data/node_modules/govuk-frontend/dist/govuk/settings/_colours-palette.scss +117 -25
  135. data/node_modules/govuk-frontend/dist/govuk/settings/_custom-properties.scss +18 -0
  136. data/node_modules/govuk-frontend/dist/govuk/settings/_index.scss +3 -14
  137. data/node_modules/govuk-frontend/dist/govuk/settings/_media-queries.scss +0 -9
  138. data/node_modules/govuk-frontend/dist/govuk/settings/_typography-responsive.scss +12 -189
  139. data/node_modules/govuk-frontend/dist/govuk/tools/_index.scss +0 -1
  140. data/node_modules/govuk-frontend/dist/govuk/tools/_px-to-em.scss +4 -2
  141. data/node_modules/govuk-frontend/dist/govuk/tools/_px-to-rem.scss +2 -0
  142. data/package-lock.json +2461 -1150
  143. data/package.json +3 -3
  144. metadata +16 -30
  145. data/node_modules/govuk-frontend/dist/govuk/all.scss +0 -9
  146. data/node_modules/govuk-frontend/dist/govuk/assets/rebrand/images/favicon.ico +0 -0
  147. data/node_modules/govuk-frontend/dist/govuk/assets/rebrand/images/favicon.svg +0 -1
  148. data/node_modules/govuk-frontend/dist/govuk/assets/rebrand/images/govuk-crest.svg +0 -1
  149. data/node_modules/govuk-frontend/dist/govuk/assets/rebrand/images/govuk-icon-180.png +0 -0
  150. data/node_modules/govuk-frontend/dist/govuk/assets/rebrand/images/govuk-icon-192.png +0 -0
  151. data/node_modules/govuk-frontend/dist/govuk/assets/rebrand/images/govuk-icon-512.png +0 -0
  152. data/node_modules/govuk-frontend/dist/govuk/assets/rebrand/images/govuk-icon-mask.svg +0 -1
  153. data/node_modules/govuk-frontend/dist/govuk/assets/rebrand/images/govuk-opengraph-image.png +0 -0
  154. data/node_modules/govuk-frontend/dist/govuk/assets/rebrand/manifest.json +0 -39
  155. data/node_modules/govuk-frontend/dist/govuk/components/_all.scss +0 -10
  156. data/node_modules/govuk-frontend/dist/govuk/components/header/header.bundle.js +0 -233
  157. data/node_modules/govuk-frontend/dist/govuk/components/header/header.bundle.mjs +0 -225
  158. data/node_modules/govuk-frontend/dist/govuk/components/header/header.mjs +0 -89
  159. data/node_modules/govuk-frontend/dist/govuk/core/_all.scss +0 -10
  160. data/node_modules/govuk-frontend/dist/govuk/core/_govuk-frontend-properties.scss +0 -15
  161. data/node_modules/govuk-frontend/dist/govuk/helpers/_all.scss +0 -10
  162. data/node_modules/govuk-frontend/dist/govuk/objects/_all.scss +0 -10
  163. data/node_modules/govuk-frontend/dist/govuk/overrides/_all.scss +0 -9
  164. data/node_modules/govuk-frontend/dist/govuk/settings/_all.scss +0 -10
  165. data/node_modules/govuk-frontend/dist/govuk/tools/_all.scss +0 -10
  166. data/node_modules/govuk-frontend/dist/govuk/tools/_rebrand.scss +0 -65
  167. data/node_modules/govuk-frontend/dist/govuk/utilities/_all.scss +0 -10
  168. data/node_modules/govuk-frontend/dist/govuk/vendor/_sass-mq.scss +0 -349
  169. data/node_modules/govuk-frontend/dist/govuk-prototype-kit/functions.js +0 -25
@@ -6,32 +6,124 @@
6
6
  ///
7
7
  /// @type Map
8
8
  ///
9
- /// @prop $colour - Representation for the given $colour, where $colour is the
10
- /// friendly name for the colour (e.g. "red": #ff0000);
9
+ /// @prop {Map|Colour} $colour - Representation for the `$colour` or a map associating
10
+ /// name of `$variant`s of the colours to their representation
11
11
  ///
12
- /// @access public
12
+ /// @access private
13
13
 
14
- $govuk-colours: (
15
- "red": #d4351c,
16
- "yellow": #ffdd00,
17
- "green": #00703c,
18
- "blue": #1d70b8,
19
- "dark-blue": #003078,
20
- "light-blue": #5694ca,
21
- "purple": #4c2c92,
22
- "black": #0b0c0c,
23
- "dark-grey": #505a5f,
24
- "mid-grey": #b1b4b6,
25
- "light-grey": #f3f2f1,
26
- "white": #ffffff,
27
- "light-purple": #6f72af,
28
- "bright-purple": #912b88,
29
- "pink": #d53880,
30
- "light-pink": #f499be,
31
- "orange": #f47738,
32
- "brown": #b58840,
33
- "light-green": #85994b,
34
- "turquoise": #28a197
35
- ) !default;
14
+ $_govuk-palette: (
15
+ "blue": (
16
+ "primary": #1d70b8,
17
+ "tint-25": #5694ca,
18
+ "tint-50": #8eb8dc,
19
+ "tint-80": #d2e2f1,
20
+ "tint-95": #f4f8fb,
21
+ "shade-25": #16548a,
22
+ "shade-50": #0f385c,
23
+ // Listed last as tests expect colours to be in a given order
24
+ "shade-10": #1a65a6
25
+ ),
26
+ "green": (
27
+ "primary": #0f7a52,
28
+ "tint-25": #4b9b7d,
29
+ "tint-50": #87bca8,
30
+ "tint-80": #cfe4dc,
31
+ "tint-95": #f3f8f6,
32
+ "shade-25": #0b5c3e,
33
+ "shade-50": #083d29
34
+ ),
35
+ "teal": (
36
+ "primary": #158187,
37
+ "tint-25": #50a1a5,
38
+ "tint-50": #8ac0c3,
39
+ "tint-80": #d0e6e7,
40
+ "tint-95": #f3f9f9,
41
+ "shade-25": #106165,
42
+ "shade-50": #0b4144,
43
+ "accent": #00ffe0
44
+ ),
45
+ "purple": (
46
+ "primary": #54319f,
47
+ "tint-25": #7f65b7,
48
+ "tint-50": #aa98cf,
49
+ "tint-80": #ddd6ec,
50
+ "tint-95": #f6f5fa,
51
+ "shade-25": #3f2577,
52
+ "shade-50": #2a1950
53
+ ),
54
+ "magenta": (
55
+ "primary": #ca357c,
56
+ "tint-25": #d7689d,
57
+ "tint-50": #e59abe,
58
+ "tint-80": #f4d7e5,
59
+ "tint-95": #fcf5f8,
60
+ "shade-25": #98285d,
61
+ "shade-50": #651b3e
62
+ ),
63
+ "red": (
64
+ "primary": #ca3535,
65
+ "tint-25": #d76868,
66
+ "tint-50": #e59a9a,
67
+ "tint-80": #f4d7d7,
68
+ "tint-95": #fcf5f5,
69
+ "shade-25": #982828,
70
+ "shade-50": #651b1b
71
+ ),
72
+ "orange": (
73
+ "primary": #f47738,
74
+ "tint-25": #f7996a,
75
+ "tint-50": #fabb9c,
76
+ "tint-80": #fde4d7,
77
+ "tint-95": #fef8f5,
78
+ "shade-25": #b7592a,
79
+ "shade-50": #7a3c1c
80
+ ),
81
+ "yellow": (
82
+ "primary": #ffdd00,
83
+ "tint-25": #ffe640,
84
+ "tint-50": #ffee80,
85
+ "tint-80": #fff8cc,
86
+ "tint-95": #fffdf2,
87
+ "shade-25": #bfa600,
88
+ "shade-50": #806f00
89
+ ),
90
+ "brown": (
91
+ "primary": #99704a,
92
+ "tint-25": #b39477,
93
+ "tint-50": #ccb8a5,
94
+ "tint-95": #faf8f6
95
+ ),
96
+ "black": (
97
+ "primary": #0b0c0c,
98
+ "tint-25": #484949,
99
+ "tint-50": #858686,
100
+ "tint-80": #cecece,
101
+ "tint-95": #f3f3f3
102
+ ),
103
+ "white": #ffffff
104
+ );
105
+
106
+ /// Pre-brand colours correspondence table
107
+ ///
108
+ /// @type Map
109
+ ///
110
+ /// @prop {List} $colour - Colour name and variant in the brand colours
111
+ /// that correspond to the `$colour` in GOV.UK Frontend colours before
112
+ /// the brand colours were introduced
113
+ ///
114
+ /// @access private
115
+ $_govuk-pre-brand-colours: (
116
+ "light-pink": "magenta" "tint-50",
117
+ "pink": "magenta" "primary",
118
+ "light-green": "green" "tint-25",
119
+ "turquoise": "teal" "primary",
120
+ "light-blue": "blue" "tint-25",
121
+ "dark-blue": "blue" "shade-50",
122
+ "light-purple": "purple" "tint-25",
123
+ "bright-purple": "magenta" "shade-25",
124
+ "dark-grey": "black" "tint-25",
125
+ "mid-grey": "black" "tint-80",
126
+ "light-grey": "black" "tint-95"
127
+ );
36
128
 
37
129
  /*# sourceMappingURL=_colours-palette.scss.map */
@@ -0,0 +1,18 @@
1
+ ////
2
+ /// @group settings/custom-properties
3
+ ////
4
+
5
+ /// Output CSS custom properties
6
+ ///
7
+ /// Whether to output CSS Custom Properties in the compiled stylesheet.
8
+ ///
9
+ /// If you are compiling multiple stylesheets that will be used together on a
10
+ /// page, set this to false in any secondary stylesheets to avoid including the
11
+ /// Custom Properties multiple times.
12
+ ///
13
+ /// @type Boolean
14
+ /// @access public
15
+
16
+ $govuk-output-custom-properties: true !default;
17
+
18
+ /*# sourceMappingURL=_custom-properties.scss.map */
@@ -6,11 +6,13 @@
6
6
  @import "warnings";
7
7
  @import "global-styles";
8
8
 
9
+ @import "custom-properties";
10
+
9
11
  @import "media-queries";
10
12
 
11
13
  @import "colours-palette";
12
14
  @import "colours-organisations";
13
- @import "colours-applied";
15
+ @import "colours-functional";
14
16
 
15
17
  @import "spacing";
16
18
  @import "measurements";
@@ -20,17 +22,4 @@
20
22
 
21
23
  @import "links";
22
24
 
23
- // LibSass evaluates this as a single unquoted string, equivalent to
24
- // "true == false", whereas Dart Sass evaluates it as "true" == "false".
25
- // Because a string in Sass is truthy, LibSass will output the warning; Dart
26
- // Sass will not.
27
- @if #{true} == #{false} {
28
- @include _warning(
29
- "libsass",
30
- "It looks like you may be using LibSass to compile your Sass. LibSass is " +
31
- "deprecated and will not be supported by the next major version of " +
32
- "GOV.UK Frontend. See https://sass-lang.com/libsass/ for more information."
33
- );
34
- }
35
-
36
25
  /*# sourceMappingURL=_index.scss.map */
@@ -13,13 +13,4 @@ $govuk-breakpoints: (
13
13
  desktop: 769px
14
14
  ) !default;
15
15
 
16
- /// Show active breakpoint in top-right corner.
17
- ///
18
- /// Only use this during local development.
19
- ///
20
- /// @type Boolean
21
- /// @access public
22
-
23
- $govuk-show-breakpoints: false !default;
24
-
25
16
  /*# sourceMappingURL=_media-queries.scss.map */
@@ -16,151 +16,20 @@
16
16
 
17
17
  $govuk-root-font-size: 16px !default;
18
18
 
19
- /// Feature flag for new typography scale
20
- ///
21
- /// When set to true, $govuk-typography-scale will use the new font map instead
22
- /// of the current/old one as well as apply changes in components to account
23
- /// for the updated scale.
24
- ///
25
- /// Should be removed in 6.0.
19
+ /// Responsive typography font map
26
20
  ///
27
- /// @type Boolean
28
- /// @access public
29
-
30
- $govuk-new-typography-scale: false !default;
31
-
32
- /// The font map for the old typography scale
21
+ /// This is used to generate responsive typography that adapts according to the
22
+ /// breakpoints.
33
23
  ///
34
- /// @type Map
24
+ /// Font size and font weight can be defined for each breakpoint. You can define
25
+ /// different behaviour on tablet and desktop. The 'null' breakpoint is for
26
+ /// mobile.
35
27
  ///
36
- /// @prop {Number} $point.$breakpoint.font-size - Font size for `$point` at `$breakpoint`
37
- /// @prop {Number} $point.$breakpoint.line-height - Line height for `$point` at `$breakpoint`
38
- /// @prop {Number} $point.print.font-size - Font size for `$point` when printing
39
- /// @prop {Number} $point.print.line-height - Line height for `$point` when printing
28
+ /// Line-heights will automatically be converted from pixel measurements into
29
+ /// relative values. For example, with a font-size of 16px and a line-height of
30
+ /// 24px, the line-height will be converted to 1.5 before output.
40
31
  ///
41
- /// @access private
42
-
43
- $_govuk-typography-scale-legacy: (
44
- 80: (
45
- null: (
46
- font-size: 53px,
47
- line-height: 55px
48
- ),
49
- tablet: (
50
- font-size: 80px,
51
- line-height: 80px
52
- ),
53
- print: (
54
- font-size: 53pt,
55
- line-height: 1.1
56
- )
57
- ),
58
- 48: (
59
- null: (
60
- font-size: 32px,
61
- line-height: 35px
62
- ),
63
- tablet: (
64
- font-size: 48px,
65
- line-height: 50px
66
- ),
67
- print: (
68
- font-size: 32pt,
69
- line-height: 1.15
70
- )
71
- ),
72
- 36: (
73
- null: (
74
- font-size: 24px,
75
- line-height: 25px
76
- ),
77
- tablet: (
78
- font-size: 36px,
79
- line-height: 40px
80
- ),
81
- print: (
82
- font-size: 24pt,
83
- line-height: 1.05
84
- )
85
- ),
86
- 27: (
87
- null: (
88
- font-size: 18px,
89
- line-height: 20px
90
- ),
91
- tablet: (
92
- font-size: 27px,
93
- line-height: 30px
94
- ),
95
- print: (
96
- font-size: 18pt,
97
- line-height: 1.15
98
- )
99
- ),
100
- 24: (
101
- null: (
102
- font-size: 18px,
103
- line-height: 20px
104
- ),
105
- tablet: (
106
- font-size: 24px,
107
- line-height: 30px
108
- ),
109
- print: (
110
- font-size: 18pt,
111
- line-height: 1.15
112
- )
113
- ),
114
- 19: (
115
- null: (
116
- font-size: 16px,
117
- line-height: 20px
118
- ),
119
- tablet: (
120
- font-size: 19px,
121
- line-height: 25px
122
- ),
123
- print: (
124
- font-size: 14pt,
125
- line-height: 1.15
126
- )
127
- ),
128
- 16: (
129
- null: (
130
- font-size: 14px,
131
- line-height: 16px
132
- ),
133
- tablet: (
134
- font-size: 16px,
135
- line-height: 20px
136
- ),
137
- print: (
138
- font-size: 14pt,
139
- line-height: 1.2
140
- )
141
- ),
142
- 14: (
143
- null: (
144
- font-size: 12px,
145
- line-height: 15px
146
- ),
147
- tablet: (
148
- font-size: 14px,
149
- line-height: 20px
150
- ),
151
- print: (
152
- font-size: 12pt,
153
- line-height: 1.2
154
- ),
155
- deprecation: (
156
- key: "govuk-typography-scale-14",
157
- message: "14 on the type scale is deprecated and will be removed as " +
158
- "a possible option in the next major version."
159
- )
160
- )
161
- );
162
-
163
- /// The font map for the new typography scale
32
+ /// You can also specify a separate font size and line height for print media.
164
33
  ///
165
34
  /// @type Map
166
35
  ///
@@ -169,9 +38,9 @@ $_govuk-typography-scale-legacy: (
169
38
  /// @prop {Number} $point.print.font-size - Font size for `$point` when printing
170
39
  /// @prop {Number} $point.print.line-height - Line height for `$point` when printing
171
40
  ///
172
- /// @access private
41
+ /// @access public
173
42
 
174
- $_govuk-typography-scale-modern: (
43
+ $govuk-typography-scale: (
175
44
  80: (
176
45
  null: (
177
46
  font-size: 53px,
@@ -265,53 +134,7 @@ $_govuk-typography-scale-modern: (
265
134
  font-size: 14pt,
266
135
  line-height: 1.2
267
136
  )
268
- ),
269
- 14: (
270
- // Stay at 14/20 at all sizes (consider deprecating this size)
271
- null: (
272
- font-size: 14px,
273
- line-height: 20px
274
- ),
275
- print: (
276
- font-size: 12pt,
277
- line-height: 1.2
278
- ),
279
- deprecation: (
280
- key: "govuk-typography-scale-14",
281
- message: "14 on the type scale is deprecated and will be removed as " +
282
- "a possible option in the next major version."
283
- )
284
137
  )
285
- );
286
-
287
- /// Responsive typography font map
288
- ///
289
- /// This is used to generate responsive typography that adapts according to the
290
- /// breakpoints.
291
- ///
292
- /// Font size and font weight can be defined for each breakpoint. You can define
293
- /// different behaviour on tablet and desktop. The 'null' breakpoint is for
294
- /// mobile.
295
- ///
296
- /// Line-heights will automatically be converted from pixel measurements into
297
- /// relative values. For example, with a font-size of 16px and a line-height of
298
- /// 24px, the line-height will be converted to 1.5 before output.
299
- ///
300
- /// You can also specify a separate font size and line height for print media.
301
- ///
302
- /// @type Map
303
- ///
304
- /// @prop {Number} $point.$breakpoint.font-size - Font size for `$point` at `$breakpoint`
305
- /// @prop {Number} $point.$breakpoint.line-height - Line height for `$point` at `$breakpoint`
306
- /// @prop {Number} $point.print.font-size - Font size for `$point` when printing
307
- /// @prop {Number} $point.print.line-height - Line height for `$point` when printing
308
- ///
309
- /// @access public
310
-
311
- $govuk-typography-scale: if(
312
- $govuk-new-typography-scale,
313
- $_govuk-typography-scale-modern,
314
- $_govuk-typography-scale-legacy
315
138
  ) !default;
316
139
 
317
140
  /*# sourceMappingURL=_typography-responsive.scss.map */
@@ -3,6 +3,5 @@
3
3
  @import "image-url";
4
4
  @import "px-to-em";
5
5
  @import "px-to-rem";
6
- @import "rebrand";
7
6
 
8
7
  /*# sourceMappingURL=_index.scss.map */
@@ -2,14 +2,16 @@
2
2
  /// @group tools/unit-conversion
3
3
  ////
4
4
 
5
+ @import "../settings/typography-responsive";
6
+
5
7
  /// Convert pixels to em
6
8
  ///
7
9
  /// @param {Number} $value - Length in pixels
8
- /// @param {Number} $context-font-size - Font size of element
10
+ /// @param {Number} $context-font-size [$govuk-root-font-size] - Font size of element
9
11
  /// @return {Number} Length in ems
10
12
  /// @access public
11
13
 
12
- @function govuk-em($value, $context-font-size) {
14
+ @function govuk-em($value, $context-font-size: $govuk-root-font-size) {
13
15
  @if unitless($value) {
14
16
  $value: $value * 1px;
15
17
  }
@@ -2,6 +2,8 @@
2
2
  /// @group tools/unit-conversion
3
3
  ////
4
4
 
5
+ @import "../settings/typography-responsive";
6
+
5
7
  /// Convert pixels to rem
6
8
  ///
7
9
  /// The $govuk-root-font-size (defined in settings/_typography-responsive.scss)