govuk_publishing_components 24.12.0 → 24.13.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (113) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/govuk_publishing_components/analytics/analytics.js +3 -1
  3. data/app/assets/javascripts/govuk_publishing_components/analytics/custom-dimensions.js +2 -0
  4. data/app/assets/javascripts/govuk_publishing_components/analytics/scroll-tracker.js +1 -1
  5. data/app/assets/javascripts/govuk_publishing_components/components/checkboxes.js +5 -3
  6. data/app/assets/javascripts/govuk_publishing_components/components/contextual-guidance.js +1 -1
  7. data/app/assets/javascripts/govuk_publishing_components/components/reorderable-list.js +9 -9
  8. data/app/assets/javascripts/govuk_publishing_components/lib/govspeak/magna-charta.js +3 -3
  9. data/app/assets/javascripts/govuk_publishing_components/lib/header-navigation.js +6 -0
  10. data/app/assets/javascripts/govuk_publishing_components/lib/trigger-event.js +5 -3
  11. data/app/assets/stylesheets/govuk_publishing_components/_all_components.scss +3 -0
  12. data/app/assets/stylesheets/govuk_publishing_components/components/_accordion.scss +50 -31
  13. data/app/assets/stylesheets/govuk_publishing_components/components/_action-link.scss +0 -35
  14. data/app/assets/stylesheets/govuk_publishing_components/components/_contents-list.scss +0 -13
  15. data/app/assets/stylesheets/govuk_publishing_components/components/_image-card.scss +0 -6
  16. data/app/assets/stylesheets/govuk_publishing_components/components/_inverse-header.scss +0 -4
  17. data/app/assets/stylesheets/govuk_publishing_components/components/_organisation-logo.scss +10 -3
  18. data/app/assets/stylesheets/govuk_publishing_components/components/_previous-and-next-navigation.scss +11 -1
  19. data/app/assets/stylesheets/govuk_publishing_components/components/_print-link.scss +1 -1
  20. data/app/assets/stylesheets/govuk_publishing_components/components/_share-links.scss +0 -1
  21. data/app/assets/stylesheets/govuk_publishing_components/components/_show-password.scss +1 -0
  22. data/app/assets/stylesheets/govuk_publishing_components/components/_step-by-step-nav.scss +8 -2
  23. data/app/assets/stylesheets/govuk_publishing_components/components/_subscription-links.scss +6 -2
  24. data/app/assets/stylesheets/govuk_publishing_components/components/helpers/_markdown-typography.scss +1 -0
  25. data/app/views/govuk_publishing_components/components/_action_link.html.erb +2 -1
  26. data/app/views/govuk_publishing_components/components/_contents_list.html.erb +10 -3
  27. data/app/views/govuk_publishing_components/components/_contextual_sidebar.html.erb +1 -1
  28. data/app/views/govuk_publishing_components/components/_government_navigation.html.erb +49 -7
  29. data/app/views/govuk_publishing_components/components/_image_card.html.erb +15 -2
  30. data/app/views/govuk_publishing_components/components/_layout_for_public.html.erb +2 -0
  31. data/app/views/govuk_publishing_components/components/_layout_header.html.erb +11 -2
  32. data/app/views/govuk_publishing_components/components/_organisation_logo.html.erb +13 -13
  33. data/app/views/govuk_publishing_components/components/_previous_and_next_navigation.html.erb +10 -6
  34. data/app/views/govuk_publishing_components/components/_search.html.erb +5 -2
  35. data/app/views/govuk_publishing_components/components/_share_links.html.erb +1 -1
  36. data/app/views/govuk_publishing_components/components/_subscription_links.html.erb +7 -7
  37. data/app/views/govuk_publishing_components/components/contextual_sidebar/_brexit_cta.html.erb +9 -4
  38. data/app/views/govuk_publishing_components/components/docs/government_navigation.yml +2 -0
  39. data/app/views/govuk_publishing_components/components/docs/inset_text.yml +2 -2
  40. data/app/views/govuk_publishing_components/components/docs/inverse_header.yml +18 -15
  41. data/app/views/govuk_publishing_components/components/layout_header/_header_logo.html.erb +3 -3
  42. data/config/locales/ar.yml +3 -0
  43. data/config/locales/az.yml +3 -0
  44. data/config/locales/be.yml +3 -0
  45. data/config/locales/bg.yml +3 -0
  46. data/config/locales/bn.yml +3 -0
  47. data/config/locales/cs.yml +3 -0
  48. data/config/locales/cy.yml +4 -1
  49. data/config/locales/da.yml +3 -0
  50. data/config/locales/de.yml +3 -0
  51. data/config/locales/dr.yml +3 -0
  52. data/config/locales/el.yml +3 -0
  53. data/config/locales/en.yml +4 -1
  54. data/config/locales/es-419.yml +3 -0
  55. data/config/locales/es.yml +3 -0
  56. data/config/locales/et.yml +3 -0
  57. data/config/locales/fa.yml +3 -0
  58. data/config/locales/fi.yml +3 -0
  59. data/config/locales/fr.yml +3 -0
  60. data/config/locales/gd.yml +3 -0
  61. data/config/locales/gu.yml +3 -0
  62. data/config/locales/he.yml +3 -0
  63. data/config/locales/hi.yml +3 -0
  64. data/config/locales/hr.yml +3 -0
  65. data/config/locales/hu.yml +3 -0
  66. data/config/locales/hy.yml +3 -0
  67. data/config/locales/id.yml +3 -0
  68. data/config/locales/is.yml +3 -0
  69. data/config/locales/it.yml +3 -0
  70. data/config/locales/ja.yml +3 -0
  71. data/config/locales/ka.yml +3 -0
  72. data/config/locales/kk.yml +3 -0
  73. data/config/locales/ko.yml +3 -0
  74. data/config/locales/lt.yml +3 -0
  75. data/config/locales/lv.yml +3 -0
  76. data/config/locales/ms.yml +3 -0
  77. data/config/locales/mt.yml +3 -0
  78. data/config/locales/nl.yml +3 -0
  79. data/config/locales/no.yml +3 -0
  80. data/config/locales/pa-pk.yml +3 -0
  81. data/config/locales/pa.yml +3 -0
  82. data/config/locales/pl.yml +3 -0
  83. data/config/locales/ps.yml +3 -0
  84. data/config/locales/pt.yml +3 -0
  85. data/config/locales/ro.yml +3 -0
  86. data/config/locales/ru.yml +3 -0
  87. data/config/locales/si.yml +3 -0
  88. data/config/locales/sk.yml +3 -0
  89. data/config/locales/sl.yml +3 -0
  90. data/config/locales/so.yml +3 -0
  91. data/config/locales/sq.yml +3 -0
  92. data/config/locales/sr.yml +3 -0
  93. data/config/locales/sv.yml +3 -0
  94. data/config/locales/sw.yml +3 -0
  95. data/config/locales/ta.yml +3 -0
  96. data/config/locales/th.yml +3 -0
  97. data/config/locales/tk.yml +3 -0
  98. data/config/locales/tr.yml +3 -0
  99. data/config/locales/uk.yml +3 -0
  100. data/config/locales/ur.yml +3 -0
  101. data/config/locales/uz.yml +3 -0
  102. data/config/locales/vi.yml +3 -0
  103. data/config/locales/zh-hk.yml +3 -0
  104. data/config/locales/zh-tw.yml +3 -0
  105. data/config/locales/zh.yml +3 -0
  106. data/lib/govuk_publishing_components.rb +1 -0
  107. data/lib/govuk_publishing_components/presenters/brexit_cta_helper.rb +33 -0
  108. data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority.rb +15 -1
  109. data/lib/govuk_publishing_components/presenters/content_item.rb +1 -3
  110. data/lib/govuk_publishing_components/presenters/contents_list_helper.rb +0 -3
  111. data/lib/govuk_publishing_components/presenters/public_layout_helper.rb +1 -1
  112. data/lib/govuk_publishing_components/version.rb +1 -1
  113. metadata +8 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9bf26b097c1773c4126687d518e698357b3c57425cc63f3b55788ed58e211019
4
- data.tar.gz: 8a016b8a8d05b0805600eb6770fd401e8af63a8086bc077ed1cdc9c2816a64f2
3
+ metadata.gz: 48d13ec5bd03475381c42cb9e3fbdb32118e851c82a2021462994e0af0cbe042
4
+ data.tar.gz: 30b3eaa8d62c9fe6eab0c48b65667329e9ae99d955f584cd37009dc59daeb254
5
5
  SHA512:
6
- metadata.gz: e32f62161f041f1614788acb40837ac1d535a90721de924bd1d86ce8e4abff8be1051fe10742042347fcb22982f45b35cba12e8f8eb2f3e07690cd57c5f78644
7
- data.tar.gz: 57329b331cd9939c9f00c08b216c30b8b7ae1349ba1a2aa881ff488b14a49c795a7fcf2dc287243aa80f50159899bdfa1e9aa69677a39f3fe46cc8144ae2f91f
6
+ metadata.gz: 83f0878e78d24711ed4fa7694d4becac691474370c29b33b355faed6dc98b98619af4f22bb6d3bdd70a787c510d93ac3cf8659d78ff7b009a3a46bbce93a9a50
7
+ data.tar.gz: 919f5697fbba2e55d2709e24750af0f3d3d07836958c0a09ece0cba6a5ee8e4634e58b99230303eb6ce88f467e5a4e99ced6a3bf3de527fb7ef1b4c2e7fd344a
@@ -41,7 +41,9 @@
41
41
  // we ignore the possibility of there being campaign variables in the
42
42
  // anchor because we wouldn't know how to detect and parse them if they
43
43
  // were present
44
- return this.pii.stripPIIFromString(location.href.substring(location.origin.length).split('#')[0])
44
+ // IE can't access window.location.origin, so we have to do this slightly complex thing
45
+ var root = location.protocol + '//' + location.hostname + (location.port ? ':' + location.port : '')
46
+ return this.pii.stripPIIFromString(location.href.substring(root.length).split('#')[0])
45
47
  }
46
48
 
47
49
  Analytics.prototype.trackPageview = function (path, title, options) {
@@ -33,6 +33,8 @@
33
33
 
34
34
  if (window.devicePixelRatio) {
35
35
  customDimensions.dimension11 = window.devicePixelRatio
36
+ } else {
37
+ customDimensions.dimension11 = window.screen.deviceXDPI / window.screen.logicalXDPI
36
38
  }
37
39
 
38
40
  return customDimensions
@@ -6,7 +6,7 @@
6
6
  window.GOVUK = window.GOVUK || {}
7
7
 
8
8
  var CONFIG = {
9
- '/transition': [
9
+ '/brexit': [
10
10
  ['Percent', 20],
11
11
  ['Percent', 40],
12
12
  ['Percent', 60],
@@ -33,7 +33,9 @@ window.GOVUK.Modules.Checkboxes = window.GOVUKFrontend;
33
33
  if (window.GOVUK.analytics && window.GOVUK.analytics.trackEvent) {
34
34
  // Where checkboxes are manipulated externally in finders, `suppressAnalytics`
35
35
  // is passed to prevent duplicate GA events.
36
- if (!event.detail || (event.detail && event.detail.suppressAnalytics !== true)) {
36
+ // use Oliver Steele's Nested Object Access Pattern https://hackernoon.com/accessing-nested-objects-in-javascript-f02f1bd6387f
37
+ var allowAnalytics = ((event || {}).detail || {}).suppressAnalytics !== true
38
+ if (allowAnalytics) {
37
39
  var $checkbox = event.target
38
40
  var category = $checkbox.getAttribute('data-track-category')
39
41
  if (category) {
@@ -100,11 +102,11 @@ window.GOVUK.Modules.Checkboxes = window.GOVUKFrontend;
100
102
  var $exclusiveOption = $checkboxes.querySelector('input[type=checkbox][data-exclusive]')
101
103
  var $nonExclusiveOptions = $checkboxes.querySelectorAll('input[type=checkbox]:not([data-exclusive])')
102
104
 
103
- if ($currentCheckbox.dataset.exclusive === 'true' && $currentCheckbox.checked === true) {
105
+ if ($currentCheckbox.getAttribute('data-exclusive') === 'true' && $currentCheckbox.checked === true) {
104
106
  for (var i = 0; i < $nonExclusiveOptions.length; i++) {
105
107
  $nonExclusiveOptions[i].checked = false
106
108
  }
107
- } else if ($currentCheckbox.dataset.exclusive !== 'true' && $currentCheckbox.checked === true) {
109
+ } else if ($currentCheckbox.getAttribute('data-exclusive') !== 'true' && $currentCheckbox.checked === true) {
108
110
  if ($exclusiveOption) {
109
111
  $exclusiveOption.checked = false
110
112
  }
@@ -15,7 +15,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
15
15
 
16
16
  ContextualGuidance.prototype.handleFocus = function (event) {
17
17
  this.hideAllGuidance()
18
- if (!event.target.dataset.contextualGuidanceHideOnly) {
18
+ if (!event.target.getAttribute('data-contextual-guidance-hide-only')) {
19
19
  this.$guidance.style.display = 'block'
20
20
  }
21
21
  }
@@ -26,14 +26,14 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
26
26
  }
27
27
 
28
28
  var boundOnClickUpButton = this.onClickUpButton.bind(this)
29
- this.$upButtons.forEach(function (button) {
30
- button.addEventListener('click', boundOnClickUpButton)
31
- })
29
+ for (var u = 0; u < this.$upButtons.length; u++) {
30
+ this.$upButtons[u].addEventListener('click', boundOnClickUpButton)
31
+ }
32
32
 
33
33
  var boundOnClickDownButton = this.onClickDownButton.bind(this)
34
- this.$downButtons.forEach(function (button) {
35
- button.addEventListener('click', boundOnClickDownButton)
36
- })
34
+ for (var d = 0; d < this.$downButtons.length; d++) {
35
+ this.$downButtons[d].addEventListener('click', boundOnClickDownButton)
36
+ }
37
37
  }
38
38
 
39
39
  ReorderableList.prototype.setupResponsiveChecks = function () {
@@ -85,9 +85,9 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
85
85
 
86
86
  ReorderableList.prototype.updateOrderIndexes = function () {
87
87
  var $orderInputs = this.$module.querySelectorAll('.gem-c-reorderable-list__actions input')
88
- $orderInputs.forEach(function (input, index) {
89
- input.setAttribute('value', index + 1)
90
- })
88
+ for (var i = 0; i < $orderInputs.length; i++) {
89
+ $orderInputs[i].setAttribute('value', i + 1)
90
+ }
91
91
  }
92
92
 
93
93
  ReorderableList.prototype.triggerEvent = function (element, eventName) {
@@ -462,11 +462,11 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
462
462
  var allCharts = document.querySelectorAll('table.js-barchart-table')
463
463
  var id = null
464
464
 
465
- allCharts.forEach(function (chart, i) {
466
- if (chart === module) {
465
+ for (var i = 0; i < allCharts.length; i++) {
466
+ if (allCharts[i] === module) {
467
467
  id = i
468
468
  }
469
- })
469
+ }
470
470
 
471
471
  return id
472
472
  }
@@ -21,8 +21,14 @@
21
21
 
22
22
  if (targetClass.indexOf('js-visible') !== -1) {
23
23
  target.setAttribute('class', targetClass.replace(/(^|\s)js-visible(\s|$)/, ''))
24
+ if (window.GOVUK.analytics && window.GOVUK.analytics.trackEvent) {
25
+ window.GOVUK.analytics.trackEvent('headerClicked', 'searchClosed', { label: 'none' })
26
+ }
24
27
  } else {
25
28
  target.setAttribute('class', targetClass + ' js-visible')
29
+ if (window.GOVUK.analytics && window.GOVUK.analytics.trackEvent) {
30
+ window.GOVUK.analytics.trackEvent('headerClicked', 'searchOpened', { label: 'none' })
31
+ }
26
32
  }
27
33
  if (sourceClass.indexOf('js-visible') !== -1) {
28
34
  this.setAttribute('class', sourceClass.replace(/(^|\s)js-visible(\s|$)/, ''))
@@ -2,15 +2,17 @@
2
2
  'use strict'
3
3
  window.GOVUK = window.GOVUK || {}
4
4
 
5
- window.GOVUK.triggerEvent = function (element, eventName) {
6
- var params = { bubbles: true, cancelable: true }
5
+ window.GOVUK.triggerEvent = function (element, eventName, parameters) {
6
+ var params = parameters || {}
7
+ params.bubbles = true
8
+ params.cancelable = true
7
9
  var event
8
10
 
9
11
  if (typeof window.CustomEvent === 'function') {
10
12
  event = new window.CustomEvent(eventName, params)
11
13
  } else {
12
14
  event = document.createEvent('CustomEvent')
13
- event.initCustomEvent(eventName, params.bubbles, params.cancelable, null)
15
+ event.initCustomEvent(eventName, params.bubbles, params.cancelable, params.detail)
14
16
  }
15
17
 
16
18
  element.dispatchEvent(event)
@@ -1,6 +1,9 @@
1
1
  // This is the file that the application needs to include in order to use
2
2
  // the components.
3
3
 
4
+ // feature flag for accessible link styles
5
+ $govuk-new-link-styles: true;
6
+
4
7
  @import "govuk_publishing_components/govuk_frontend_support";
5
8
  @import "govuk_publishing_components/component_support";
6
9
 
@@ -40,6 +40,7 @@ $gem-c-accordion-bottom-border-width: 1px;
40
40
  @include govuk-font($size: 16);
41
41
  @include govuk-link-common;
42
42
  @include govuk-link-style-default;
43
+
43
44
  // Remove default button focus outline in Firefox
44
45
  &::-moz-focus-inner {
45
46
  padding: 0;
@@ -47,21 +48,6 @@ $gem-c-accordion-bottom-border-width: 1px;
47
48
  }
48
49
  }
49
50
 
50
- .gem-c-accordion__open-all:hover,
51
- .gem-c-accordion__open-all-text:hover {
52
- text-decoration: underline;
53
- color: $govuk-link-colour;
54
- }
55
-
56
- // Focus state, also to change chervon icon to black
57
- .gem-c-accordion__open-all:focus {
58
- .gem-c-accordion__open-all-text,
59
- .gem-c-accordion-nav__chevron {
60
- color: $govuk-focus-text-colour;
61
- text-decoration: none;
62
- }
63
- }
64
-
65
51
  // Create Chervon icon align with text
66
52
  .gem-c-accordion-nav__chevron {
67
53
  vertical-align: text-top;
@@ -73,6 +59,7 @@ $gem-c-accordion-bottom-border-width: 1px;
73
59
  margin-left: govuk-em(5, 14);
74
60
  border: govuk-em(1, 14) solid;
75
61
  border-radius: govuk-em(100, 14);
62
+
76
63
  // Main icon size across views, yet keep responsive for zoom
77
64
  @include govuk-media-query($from: tablet) {
78
65
  width: govuk-em(20, 16);
@@ -94,6 +81,7 @@ $gem-c-accordion-bottom-border-width: 1px;
94
81
  transform: rotate(-45deg);
95
82
  left: govuk-em(6, 14);
96
83
  bottom: govuk-em(5, 14);
84
+
97
85
  @include govuk-media-query($from: tablet) {
98
86
  width: govuk-em(6, 16);
99
87
  height: govuk-em(6, 16);
@@ -105,6 +93,22 @@ $gem-c-accordion-bottom-border-width: 1px;
105
93
  }
106
94
  }
107
95
 
96
+ .gem-c-accordion__open-all:hover,
97
+ .gem-c-accordion__section-button:hover {
98
+ .gem-c-accordion-nav__chevron {
99
+ color: $govuk-link-hover-colour;
100
+ text-decoration: none;
101
+ }
102
+ }
103
+
104
+ // Focus state, also to change chervon icon to black
105
+ .gem-c-accordion__open-all:focus {
106
+ .gem-c-accordion-nav__chevron {
107
+ color: $govuk-focus-text-colour;
108
+ text-decoration: none;
109
+ }
110
+ }
111
+
108
112
  // Rotate icon to create "Down" version
109
113
  .gem-c-accordion-nav__chevron--down {
110
114
  transform: rotate(180deg);
@@ -150,6 +154,10 @@ $gem-c-accordion-bottom-border-width: 1px;
150
154
  @include govuk-typography-common;
151
155
  width: 100%;
152
156
 
157
+ &:hover {
158
+ color: $govuk-link-hover-colour;
159
+ }
160
+
153
161
  &:active {
154
162
  z-index: 1;
155
163
  color: $govuk-link-active-colour;
@@ -163,26 +171,12 @@ $gem-c-accordion-bottom-border-width: 1px;
163
171
  }
164
172
  }
165
173
 
166
- .gem-c-accordion__section-button:hover {
167
- color: $govuk-link-colour;
168
- // On hover, add underline to toggle link
169
- .gem-c-accordion__toggle-text {
170
- text-decoration: underline;
171
- color: $govuk-link-colour;
172
- }
173
- }
174
-
175
174
  .gem-c-accordion__section-button:focus {
176
175
  @include govuk-focused-text;
177
176
  // Overwrite focus border to top
178
177
  box-shadow: 0 0, 0 -4px;
179
178
  border-top: 1px solid transparent;
180
179
 
181
- // Focus state to change the toggle link within individual sections
182
- .gem-c-accordion__toggle-text {
183
- color: $govuk-focus-text-colour;
184
- text-decoration: none;
185
- }
186
180
  // Focus state to change chervon icon colour within individual sections
187
181
  .gem-c-accordion-nav__chevron {
188
182
  color: $govuk-text-colour;
@@ -225,10 +219,24 @@ $gem-c-accordion-bottom-border-width: 1px;
225
219
  }
226
220
  }
227
221
 
228
- // Setting width of the text, so the icon doesn't shift (left / right) when toggled
229
222
  .gem-c-accordion__toggle-text {
230
- min-width: govuk-em(40, 16);
231
223
  display: inline-block;
224
+ // Setting width of the text so the icon doesn't shift left or right when
225
+ // toggled:
226
+ min-width: govuk-em(40, 16);
227
+ }
228
+
229
+ // On hover add underline to toggle link only:
230
+ .gem-c-accordion__section-button:hover .gem-c-accordion__toggle-text {
231
+ color: $govuk-link-hover-colour;
232
+ @include govuk-link-decoration;
233
+ @include govuk-link-hover-decoration;
234
+ }
235
+
236
+ // Ensure the correct focus sstate text colour and no underline:
237
+ .gem-c-accordion__section-button:focus .gem-c-accordion__toggle-text {
238
+ color: $govuk-focus-text-colour;
239
+ text-decoration: none;
232
240
  }
233
241
 
234
242
  .gem-c-accordion__open-all-text {
@@ -237,6 +245,17 @@ $gem-c-accordion-bottom-border-width: 1px;
237
245
  text-align: left;
238
246
  }
239
247
 
248
+ .gem-c-accordion__open-all:hover {
249
+ .gem-c-accordion__open-all-text {
250
+ @include govuk-link-decoration;
251
+ @include govuk-link-hover-decoration;
252
+ }
253
+ }
254
+
255
+ .gem-c-accordion__open-all:focus .gem-c-accordion__open-all-text {
256
+ text-decoration: none;
257
+ }
258
+
240
259
  // Change the summary subheading size.
241
260
  .gem-c-accordion__section-summary {
242
261
  @include govuk-responsive-margin(1, "top");
@@ -32,10 +32,6 @@
32
32
  .gem-c-action-link__link {
33
33
  color: inherit;
34
34
 
35
- &:hover {
36
- text-decoration: underline;
37
- }
38
-
39
35
  &:focus {
40
36
  text-decoration: none;
41
37
  color: $govuk-focus-text-colour;
@@ -106,10 +102,6 @@
106
102
  background-size: 25px auto;
107
103
  background-position: 0 2px;
108
104
  }
109
-
110
- .gem-c-action-link__link {
111
- text-decoration: none;
112
- }
113
105
  }
114
106
 
115
107
  .gem-c-action-link--simple-light {
@@ -122,10 +114,6 @@
122
114
  background-size: 25px auto;
123
115
  background-position: 0 2px;
124
116
  }
125
-
126
- .gem-c-action-link__link {
127
- text-decoration: none;
128
- }
129
117
  }
130
118
 
131
119
  .gem-c-action-link--dark-icon {
@@ -150,10 +138,6 @@
150
138
  background-size: 25px auto;
151
139
  background-position: 0 2px;
152
140
  }
153
-
154
- .gem-c-action-link__link {
155
- text-decoration: none;
156
- }
157
141
  }
158
142
 
159
143
  .gem-c-action-link--transparent-icon {
@@ -177,25 +161,6 @@
177
161
  .gem-c-action-link--light-text {
178
162
  color: govuk-colour("white");
179
163
 
180
- .gem-c-action-link__link,
181
- .gem-c-action-link__subtext-link {
182
- text-decoration: underline;
183
-
184
- &:link,
185
- &:visited {
186
- color: govuk-colour("white");
187
- }
188
-
189
- &:hover {
190
- color: $gem-hover-dark-background;
191
- }
192
-
193
- &:focus {
194
- text-decoration: none;
195
- color: $govuk-focus-text-colour;
196
- }
197
- }
198
-
199
164
  .gem-c-action-link__subtext {
200
165
  &:before {
201
166
  border-color: govuk-colour("white");
@@ -25,19 +25,6 @@
25
25
  list-style-type: none;
26
26
  }
27
27
 
28
- .gem-c-contents-list--no-underline {
29
- .gem-c-contents-list__link {
30
- text-decoration: none;
31
-
32
- &:hover,
33
- &:active {
34
- text-decoration: underline;
35
- }
36
-
37
- @include govuk-template-link-focus-override;
38
- }
39
- }
40
-
41
28
  .gem-c-contents-list__link {
42
29
  .gem-c-contents-list__list-item--parent > & {
43
30
  font-weight: bold;
@@ -63,12 +63,6 @@
63
63
  }
64
64
 
65
65
  .gem-c-image-card__title-link {
66
- text-decoration: none;
67
-
68
- &:hover {
69
- text-decoration: underline;
70
- }
71
-
72
66
  &:focus {
73
67
  text-decoration: none;
74
68
  }
@@ -7,10 +7,6 @@
7
7
  box-sizing: border-box;
8
8
  }
9
9
 
10
- .gem-c-inverse-header a {
11
- color: govuk-colour("white");
12
- }
13
-
14
10
  .gem-c-inverse-header .gem-c-inverse-header__supplement,
15
11
  .gem-c-inverse-header .publication-header__last-changed {
16
12
  // This publication-header class is injected on publication pages, really
@@ -1,12 +1,14 @@
1
1
  // Default logo corresponds with the "medium stacked" Whitehall equivalent
2
2
  .gem-c-organisation-logo {
3
3
  font-size: 13px;
4
- line-height: (15 / 13);
5
4
  font-weight: 400;
5
+ line-height: 1.35;
6
+ // When this is a heading the margin needs to be set to stop it from
7
+ // inheriting the browser's default margin:
8
+ margin: 0;
6
9
 
7
10
  @include govuk-media-query($from: tablet) {
8
11
  font-size: 18px;
9
- line-height: 20px;
10
12
  }
11
13
  }
12
14
 
@@ -62,7 +64,12 @@
62
64
  font-family: "HelveticaNeue", "Helvetica Neue", "Arial", "Helvetica", sans-serif;
63
65
 
64
66
  &:hover {
65
- text-decoration: underline;
67
+ color: $govuk-link-hover-colour;
68
+ }
69
+
70
+ &:active {
71
+ color: govuk-colour("black");
72
+ @include govuk-link-hover-decoration;
66
73
  }
67
74
 
68
75
  &:focus {