govuk_publishing_components 21.67.0 → 21.69.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (20) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +6 -1
  3. data/app/assets/images/govuk_publishing_components/action-link-arrow--simple-light.png +0 -0
  4. data/app/assets/images/govuk_publishing_components/action-link-arrow--simple-light.svg +4 -0
  5. data/app/assets/javascripts/govuk_publishing_components/components/step-by-step-nav.js +15 -3
  6. data/app/assets/stylesheets/govuk_publishing_components/components/_action-link.scss +26 -0
  7. data/app/assets/stylesheets/govuk_publishing_components/components/_feedback.scss +10 -2
  8. data/app/assets/stylesheets/govuk_publishing_components/components/_image-card.scss +1 -0
  9. data/app/assets/stylesheets/govuk_publishing_components/components/_print-link.scss +23 -18
  10. data/app/assets/stylesheets/govuk_publishing_components/components/_subscription-links.scss +95 -45
  11. data/app/views/govuk_publishing_components/components/_action_link.html.erb +2 -0
  12. data/app/views/govuk_publishing_components/components/_print_link.html.erb +12 -4
  13. data/app/views/govuk_publishing_components/components/_search.html.erb +1 -1
  14. data/app/views/govuk_publishing_components/components/_subscription-links.html.erb +20 -9
  15. data/app/views/govuk_publishing_components/components/docs/action_link.yml +8 -0
  16. data/app/views/govuk_publishing_components/components/feedback/_yes_no_banner.html.erb +5 -5
  17. data/app/views/govuk_publishing_components/components/layout_header/_search.html.erb +0 -1
  18. data/config/locales/en.yml +1 -1
  19. data/lib/govuk_publishing_components/version.rb +1 -1
  20. metadata +7 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a7991985a7a9869043e35d91693f0248e5ba011de2eac78f1b2275b979d25264
4
- data.tar.gz: 89c607b3f7064922a61cf2827cd5a3b6394f97ca7ad8701bf5ad174810f6e432
3
+ metadata.gz: d0b6878bc79789f43fcd57bed78e08d8ccfad470373eea7ee261de9acd93590f
4
+ data.tar.gz: b36a5b8dc546bf6b0f450f23f67e2e55692b6f4c9b252ddf813e935e4ba90398
5
5
  SHA512:
6
- metadata.gz: 4cc489ecf258a21462db3af8a187180240f6b2b2cfe83c2ba3e84338cb155ea262b5c34e7250c4d2026d1ff65e853f2696f9f03322bebd44bf5387da82dbad24
7
- data.tar.gz: 18822a14a52b63504b3132a66ede1e8ef85ca4c55023dd2e9f6f7b1ba19ece9318e8d3b083ba182512ff27d7e1c3d471551307e812d41287cbcd03662ade90a7
6
+ metadata.gz: 01e13c35538dd4930ce21e50f35dc1cc3f78c8b2a1c5fb795a1e2f7fec0fe415f951a9dbb5f73b0aed742cfef37c24a8d733b6003e1927e74724c46bba55e5a7
7
+ data.tar.gz: 9bd4cb3fb94c2fab03c532002bc2a356774c6537f075a560c078bc599fb2fdfac2056fa029522f84be738b94c71dcf1fc3352da4cd2f361b052d376795d6fc55
data/README.md CHANGED
@@ -1,6 +1,7 @@
1
- GOV.UK Publishing Components ·
1
+ GOV.UK Publishing Components
2
2
  [![status](https://badgen.net/github/status/alphagov/govuk_publishing_components/master)](https://ci.integration.publishing.service.gov.uk/job/govuk_publishing_components/job/master/)
3
3
  [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
4
+ [![Stylelint Style Guide](https://img.shields.io/badge/code_style-stylelint-brightgreen.svg)](https://github.com/alphagov/stylelint-config-gds/)
4
5
  =====================
5
6
 
6
7
  GOV.UK Publishing Components is a Ruby gem to document and distribute components for GOV.UK applications.
@@ -58,6 +59,10 @@ bundle install
58
59
  yarn install
59
60
  ```
60
61
 
62
+ ### Running a local app with a local gem
63
+
64
+ The GDS Developer Docs has a [guide on local frontend development](https://docs.publishing.service.gov.uk/manual/local-frontend-development.html) that covers setting up a local app to use the local version of the components gem in Docker and using the `./startup.sh` script.
65
+
61
66
  ### Running tests
62
67
 
63
68
  The default rake task runs all the linting and test tasks:
data/app/assets/images/govuk_publishing_components/action-link-arrow--simple-light.svg ADDED
@@ -0,0 +1,4 @@
1
+ <svg width="23" height="23" viewBox="0 0 23 23" fill="none" xmlns="http://www.w3.org/2000/svg">
2
+ <path fill-rule="evenodd" clip-rule="evenodd" d="M14.9429 11.7949L10.4402 7.29222L11.7327 5.99967L17.528 11.7949L11.7327 17.5902L10.4402 16.2976L14.9429 11.7949Z" fill="#ffffff"/>
3
+ <path fill-rule="evenodd" clip-rule="evenodd" d="M3.95631 10.881L15.4414 10.881L15.4414 12.709L3.95631 12.709L3.95631 10.881Z" fill="#ffffff"/>
4
+ </svg>
data/app/assets/javascripts/govuk_publishing_components/components/step-by-step-nav.js CHANGED
@@ -80,9 +80,21 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
80
80
 
81
81
  if (!thisel.querySelectorAll('.js-toggle-link').length) {
82
82
  var span = document.createElement('span')
83
- span.className = 'gem-c-step-nav__toggle-link js-toggle-link'
84
- span.setAttribute('aria-hidden', true)
85
- span.setAttribute('hidden', 'hidden')
83
+ var showHideSpan = document.createElement('span')
84
+ var commaSpan = document.createElement('span')
85
+ var thisSectionSpan = document.createElement('span')
86
+
87
+ showHideSpan.className = 'gem-c-step-nav__toggle-link js-toggle-link'
88
+ commaSpan.className = 'govuk-visually-hidden'
89
+ thisSectionSpan.className = 'govuk-visually-hidden'
90
+
91
+ commaSpan.innerHTML = ', '
92
+ thisSectionSpan.innerHTML = ' this section'
93
+
94
+ span.appendChild(commaSpan)
95
+ span.appendChild(showHideSpan)
96
+ span.appendChild(thisSectionSpan)
97
+
86
98
  thisel.querySelectorAll('.js-step-title-button')[0].appendChild(span)
87
99
  }
88
100
  }
data/app/assets/stylesheets/govuk_publishing_components/components/_action-link.scss CHANGED
@@ -1,3 +1,5 @@
1
+ $gem-hover-dark-background: #dddcdb;
2
+
1
3
  .gem-c-action-link {
2
4
  display: table;
3
5
 
@@ -113,6 +115,22 @@
113
115
  }
114
116
  }
115
117
 
118
+ .gem-c-action-link--simple-light {
119
+ &:before {
120
+ width: 30px;
121
+ height: 30px;
122
+ background: image-url("govuk_publishing_components/action-link-arrow--simple-light.png");
123
+ background: image-url("govuk_publishing_components/action-link-arrow--simple-light.svg"), linear-gradient(transparent, transparent);
124
+ background-repeat: no-repeat;
125
+ background-size: 25px auto;
126
+ background-position: 0 2px;
127
+ }
128
+
129
+ .gem-c-action-link__link {
130
+ text-decoration: none;
131
+ }
132
+ }
133
+
116
134
  .gem-c-action-link--dark-icon {
117
135
  &:before {
118
136
  background: image-url("govuk_publishing_components/action-link-arrow--dark.png");
@@ -171,10 +189,18 @@
171
189
  color: govuk-colour("white");
172
190
  }
173
191
 
192
+ &:hover {
193
+ color: $gem-hover-dark-background;
194
+ }
195
+
174
196
  &:focus,
175
197
  &:active {
176
198
  text-decoration: none;
177
199
  color: govuk-colour("black");
200
+
201
+ &:hover {
202
+ color: govuk-colour("black");
203
+ }
178
204
  }
179
205
  }
180
206
 
data/app/assets/stylesheets/govuk_publishing_components/components/_feedback.scss CHANGED
@@ -90,7 +90,7 @@
90
90
  }
91
91
 
92
92
  .gem-c-feedback__prompt-question {
93
- vertical-align: text-top;
93
+ vertical-align: top;
94
94
  display: inline-block;
95
95
  margin: govuk-spacing(2) govuk-spacing(4);
96
96
 
@@ -113,9 +113,17 @@
113
113
 
114
114
  .gem-c-feedback__prompt-link {
115
115
  @include govuk-font(19);
116
- box-shadow: 0 2px 0 govuk-colour("black");
116
+ background: transparent;
117
+ box-shadow: 0 2px 0 govuk-colour("white");
118
+ border: 1px govuk-colour("white") solid;
117
119
  min-width: 100%;
118
120
 
121
+ &:hover {
122
+ // backup style for browsers that don't support rgba
123
+ background: govuk-colour("black");
124
+ background: rgba(govuk-colour("black"), .2);
125
+ }
126
+
119
127
  @include govuk-media-query($from: mobile) {
120
128
  min-width: 100px;
121
129
  margin-bottom: 0;
data/app/assets/stylesheets/govuk_publishing_components/components/_image-card.scss CHANGED
@@ -29,6 +29,7 @@
29
29
 
30
30
  @include govuk-media-query($from: tablet) {
31
31
  margin-bottom: govuk-spacing(2);
32
+ height: 100%;
32
33
  }
33
34
 
34
35
  + .gem-c-image-card__text-wrapper {
data/app/assets/stylesheets/govuk_publishing_components/components/_print-link.scss CHANGED
@@ -1,3 +1,6 @@
1
+ $gem-c-print-link-background-width: 16px;
2
+ $gem-c-print-link-background-height: 18px;
3
+
1
4
  .gem-c-print-link {
2
5
  display: none;
3
6
  margin-bottom: 2em;
@@ -14,39 +17,41 @@
14
17
  }
15
18
  }
16
19
 
17
- .gem-c-print-link__link {
18
- background: image-url("govuk_publishing_components/icon-print.png") no-repeat 10px 50%;
19
-
20
- margin-left: -10px;
21
- padding: .5em .5em .5em 38px;
20
+ .gem-c-print-link__link,
21
+ .gem-c-print-link__button {
22
+ background: image-url("govuk_publishing_components/icon-print.png") no-repeat govuk-spacing(2) 50%;
23
+ background-size: $gem-c-print-link-background-width $gem-c-print-link-background-height;
24
+ padding: govuk-spacing(2) govuk-spacing(2) govuk-spacing(2) (govuk-spacing(4) + $gem-c-print-link-background-width);
22
25
 
23
26
  @include govuk-device-pixel-ratio($ratio: 2) {
24
27
  background-image: image-url("govuk_publishing_components/icon-print-2x.png");
25
- background-size: 16px 18px;
26
28
  }
27
29
 
30
+ &:hover {
31
+ background-color: govuk-colour("light-grey");
32
+ }
33
+ }
34
+
35
+ .gem-c-print-link__link {
36
+ box-shadow: inset 0 0 0 1px $govuk-border-colour;
37
+ text-decoration: none;
38
+
28
39
  &:focus {
29
- @include govuk-focused-text;
40
+ border: 0;
41
+ box-shadow: 0 $govuk-focus-width $govuk-text-colour;
30
42
  }
31
43
  }
32
44
 
33
45
  .gem-c-print-link__button {
34
46
  @extend %govuk-body-s;
35
- background: image-url("govuk_publishing_components/icon-print.png") no-repeat 10px 50%;
36
- border: 0;
47
+ border: 1px solid $govuk-border-colour;
37
48
  color: $govuk-link-colour;
38
49
  cursor: pointer;
39
- margin: 0;
40
- margin-left: -10px;
41
- padding: .5em .5em .5em 38px;
42
- text-decoration: underline;
43
-
44
- @include govuk-device-pixel-ratio($ratio: 2) {
45
- background-image: image-url("govuk_publishing_components/icon-print-2x.png");
46
- background-size: 16px 18px;
47
- }
50
+ margin: govuk-spacing(0);
48
51
 
49
52
  &:focus {
50
53
  @include govuk-focused-text;
54
+ background-color: $govuk-focus-colour;
55
+ border-color: transparent;
51
56
  }
52
57
  }
data/app/assets/stylesheets/govuk_publishing_components/components/_subscription-links.scss CHANGED
@@ -1,79 +1,129 @@
1
1
  .gem-c-subscription-links {
2
2
  @include govuk-text-colour;
3
3
  @include govuk-font(19, $weight: bold);
4
+ }
4
5
 
5
- .gem-c-subscription-links__hidden-header {
6
- @include govuk-visually-hidden;
6
+ .gem-c-subscription-links__hidden-header {
7
+ @include govuk-visually-hidden;
8
+ }
9
+
10
+ .gem-c-subscription-links__list {
11
+ list-style: none;
12
+ margin: 0;
13
+ padding: 0;
14
+ }
15
+
16
+ .gem-c-subscription-links__list--small {
17
+ @include govuk-font(16);
18
+ }
19
+
20
+ .gem-c-subscription-links__list-item {
21
+ display: inline-block;
22
+ vertical-align: middle;
23
+ margin-right: govuk-spacing(4);
24
+ margin-bottom: govuk-spacing(3);
25
+
26
+ &:last-child {
27
+ margin-right: 0;
7
28
  }
29
+ }
30
+
31
+ .gem-c-subscription-links__list-item--small {
32
+ display: inline-block;
33
+ margin-left: 0;
34
+ margin-right: 0;
35
+ margin-bottom: govuk-spacing(2);
8
36
 
9
- .gem-c-subscription-links__list {
10
- list-style: none;
11
- margin: 0;
12
- padding: 0;
37
+ &:first-child {
38
+ margin-right: govuk-spacing(2);
13
39
  }
14
40
 
15
- .gem-c-subscription-links__list--small {
16
- @include govuk-font(16);
41
+ &:only-child {
42
+ margin-right: 0;
17
43
  }
44
+ }
18
45
 
19
- .gem-c-subscription-links__list-item {
20
- display: inline-block;
21
- margin-right: govuk-spacing(4);
22
- margin-bottom: govuk-spacing(3);
46
+ .gem-c-subscription-links__item {
47
+ @extend %govuk-link;
48
+ display: inline-block;
49
+ text-decoration: none;
50
+ background-repeat: no-repeat;
51
+ background-position: 0 20%;
23
52
 
24
- &:last-child {
25
- margin-right: 0;
26
- }
53
+ @include govuk-media-query($from: tablet) {
54
+ background-position: 0 35%;
27
55
  }
56
+ }
28
57
 
29
- .gem-c-subscription-links__list-item--small {
30
- display: inline-block;
31
- margin-left: 0;
32
- margin-right: 0;
33
- margin-bottom: govuk-spacing(2);
58
+ .gem-c-subscription-links__item--button {
59
+ display: none;
60
+ font-size: inherit;
61
+ font-weight: inherit;
62
+ line-height: inherit;
63
+ padding: govuk-spacing(2);
64
+ border: 1px solid $gem-quiet-button-colour;
65
+ background-color: $gem-secondary-button-background-colour;
34
66
 
35
- &:first-child {
36
- margin-right: govuk-spacing(2);
37
- }
67
+ .js-enabled & {
68
+ display: inline-block;
69
+ }
38
70
 
39
- &:only-child {
40
- margin-right: 0;
41
- }
71
+ &:not(.brand__color) {
72
+ color: $govuk-link-colour;
42
73
  }
43
74
 
44
- .gem-c-subscription-links__link {
45
- @extend %govuk-link;
75
+ &:visited,
76
+ &:active,
77
+ &:focus {
46
78
  text-decoration: none;
47
- background-repeat: no-repeat;
48
- background-position: 0 20%;
79
+ }
49
80
 
50
- @include govuk-media-query($from: tablet) {
51
- background-position: 0 35%;
52
- }
81
+ &:focus {
82
+ color: $govuk-focus-text-colour;
83
+ border: 1px solid $govuk-focus-colour;
84
+ outline: 3px solid transparent;
85
+ }
86
+
87
+ &:hover:not(:focus) {
88
+ background-color: $gem-secondary-button-hover-background-colour;
89
+ text-decoration: none;
53
90
  }
91
+ }
54
92
 
55
- .gem-c-subscription-links__feed-box {
56
- padding: govuk-spacing(3);
57
- margin-bottom: govuk-spacing(3);
58
- background: govuk-colour("light-grey", $legacy: "grey-3");
93
+ .gem-c-subscription-links__feed-box {
94
+ padding: govuk-spacing(3);
95
+ margin-bottom: govuk-spacing(3);
96
+ background: govuk-colour("light-grey", $legacy: "grey-3");
59
97
 
60
- .js-enabled &.js-hidden {
61
- display: none;
62
- }
98
+ .js-enabled &.js-hidden {
99
+ display: none;
63
100
  }
101
+ }
64
102
 
65
- .gem-c-subscription-links__feed-hidden-description {
103
+ .gem-c-subscription-links__feed-hidden-description {
104
+ .js-enabled & {
66
105
  @include govuk-visually-hidden;
67
106
  }
68
107
  }
69
108
 
70
109
  .gem-c-subscription-links__icon {
71
110
  margin-right: .1em;
111
+ color: govuk-colour("black");
72
112
  }
73
113
 
74
- .gem-c-subscription-links__list-item--small {
75
- .gem-c-subscription-links__icon {
76
- @include scale(.9);
77
- transform-origin: bottom left;
114
+ .gem-c-subscription-links__list-item--small .gem-c-subscription-links__icon {
115
+ @include scale(.9);
116
+ transform-origin: bottom left;
117
+ }
118
+
119
+ .gem-c-subscription-links--with-feed-box {
120
+ .gem-c-subscription-links__item--link {
121
+ padding: govuk-spacing(2) govuk-spacing(2) govuk-spacing(2) 0;
122
+ border: 1px solid transparent;
123
+ border-bottom: 1px solid govuk-colour("dark-grey", $legacy: "grey-1");
124
+
125
+ &:focus {
126
+ border-bottom-color: transparent;
127
+ }
78
128
  }
79
129
  }
data/app/views/govuk_publishing_components/components/_action_link.html.erb CHANGED
@@ -10,6 +10,7 @@
10
10
  mobile_subtext ||= false
11
11
  light_text ||= false
12
12
  simple ||= false
13
+ simple_light ||= false
13
14
  dark_icon ||= false
14
15
  small_icon ||= false
15
16
  nhs_icon ||= false
@@ -24,6 +25,7 @@
24
25
  css_classes << "gem-c-action-link--transparent-icon" if transparent_icon
25
26
  css_classes << "gem-c-action-link--nhs" if nhs_icon
26
27
  css_classes << "gem-c-action-link--simple" if simple
28
+ css_classes << "gem-c-action-link--simple-light" if simple_light
27
29
  css_classes << "gem-c-action-link--with-subtext" if subtext
28
30
  css_classes << "gem-c-action-link--mobile-subtext" if mobile_subtext
29
31
  css_classes << (shared_helper.get_margin_bottom)
data/app/views/govuk_publishing_components/components/_print_link.html.erb CHANGED
@@ -2,15 +2,19 @@
2
2
  text ||= t('components.print_link.text')
3
3
  href ||= nil
4
4
  data_attributes ||= {}
5
-
6
5
  require_js ||= href.nil?
6
+
7
7
  data_attributes[:module] = 'print-link' if require_js
8
+
9
+ classes = %w(govuk-link)
10
+ classes << "gem-c-print-link__button" if href.nil?
11
+ classes << "gem-c-print-link__link govuk-link--no-visited-state" if href.present?
8
12
  %>
9
13
 
10
14
  <% if require_js %>
11
15
  <div class="gem-c-print-link" >
12
16
  <%= content_tag(:button, text, {
13
- class: %w(gem-c-print-link__button govuk-link),
17
+ class: classes,
14
18
  data: data_attributes
15
19
  }) %>
16
20
  </div>
@@ -19,9 +23,13 @@
19
23
  <%= link_to(
20
24
  text,
21
25
  href,
22
- class: %w(gem-c-print-link__link govuk-link),
26
+ class: classes,
23
27
  rel: "alternate",
24
- data: data_attributes
28
+ data: data_attributes,
29
+ role: "button",
30
+ data: {
31
+ module: "button",
32
+ },
25
33
  ) %>
26
34
  </div>
27
35
  <% end %>
data/app/views/govuk_publishing_components/components/_search.html.erb CHANGED
@@ -16,7 +16,7 @@
16
16
 
17
17
  value ||= ""
18
18
  id ||= "search-main-" + SecureRandom.hex(4)
19
- label_text ||= "Search GOV.UK"
19
+ label_text ||= "Search on GOV.UK"
20
20
  name ||= 'q'
21
21
  aria_controls ||= nil
22
22
  %>
data/app/views/govuk_publishing_components/components/_subscription-links.html.erb CHANGED
@@ -11,6 +11,7 @@
11
11
  css_classes = %w( gem-c-subscription-links )
12
12
  css_classes << (shared_helper.get_margin_bottom) unless local_assigns[:margin_bottom] == 0
13
13
  css_classes << brand_helper.brand_class
14
+ css_classes << "gem-c-subscription-links--with-feed-box" if sl_helper.feed_link_box_value
14
15
 
15
16
  data = {"module": "gem-toggle"} if sl_helper.feed_link_box_value
16
17
 
@@ -30,9 +31,12 @@
30
31
  >
31
32
  <% if sl_helper.email_signup_link.present? %>
32
33
  <li class="gem-c-subscription-links__list-item<%= ' gem-c-subscription-links__list-item--small' if local_assigns[:small_form] == true %>" >
33
- <svg xmlns="http://www.w3.org/2000/svg" width="21" height="15.75" class="gem-c-subscription-links__icon" focusable="false" fill="currentColor" aria-hidden="true"><path d="M19.687 0H1.312C.589 0 0 .587 0 1.313v13.124c0 .726.588 1.313 1.313 1.313h18.374c.725 0 1.313-.587 1.313-1.313V1.313C21 .587 20.412 0 19.687 0zm-2.625 2.625L10.5 7.875l-6.563-5.25h13.126zm1.313 10.5H2.625V3.937L10.5 10.5l7.875-6.563v9.188z"/></svg>
34
- <%= link_to sl_helper.email_signup_link_text, sl_helper.email_signup_link, {
35
- class: "gem-c-subscription-links__link #{brand_helper.color_class}",
34
+ <% email_link_text = capture do %>
35
+ <svg xmlns="http://www.w3.org/2000/svg" width="21" height="15.75" class="gem-c-subscription-links__icon" focusable="false" fill="currentColor" aria-hidden="true"><path d="M19.687 0H1.312C.589 0 0 .587 0 1.313v13.124c0 .726.588 1.313 1.313 1.313h18.374c.725 0 1.313-.587 1.313-1.313V1.313C21 .587 20.412 0 19.687 0zm-2.625 2.625L10.5 7.875l-6.563-5.25h13.126zm1.313 10.5H2.625V3.937L10.5 10.5l7.875-6.563v9.188z"/></svg>
36
+ <%= sl_helper.email_signup_link_text %>
37
+ <% end %>
38
+ <%= link_to email_link_text, sl_helper.email_signup_link, {
39
+ class: "gem-c-subscription-links__item #{brand_helper.color_class} gem-c-subscription-links__item--link",
36
40
  data: sl_helper.email_signup_link_data_attributes,
37
41
  lang: email_signup_link_text_locale
38
42
  } %>
@@ -41,21 +45,28 @@
41
45
 
42
46
  <% if sl_helper.feed_link_box_value || sl_helper.feed_link %>
43
47
  <li class="gem-c-subscription-links__list-item<%= ' gem-c-subscription-links__list-item--small' if local_assigns[:small_form] == true %>">
44
- <svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" class="gem-c-subscription-links__icon" focusable="false" fill="currentColor" aria-hidden="true"><path d="M1.996 11A2 2 0 0 0 0 12.993c0 1.101.895 1.99 1.996 1.99 1.106 0 2-.889 2-1.99a2 2 0 0 0-2-1.993zM.002 5.097V7.97c1.872 0 3.632.733 4.958 2.059A6.984 6.984 0 0 1 7.015 15h2.888c0-5.461-4.443-9.903-9.9-9.903zM.006 0v2.876c6.676 0 12.11 5.44 12.11 12.124H15C15 6.731 8.273 0 .006 0z"/></svg>
45
- <%= link_to sl_helper.feed_link_text, sl_helper.feed_link,
48
+ <% feed_link_text = capture do %>
49
+ <svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" class="gem-c-subscription-links__icon" focusable="false" fill="currentColor" aria-hidden="true"><path d="M1.996 11A2 2 0 0 0 0 12.993c0 1.101.895 1.99 1.996 1.99 1.106 0 2-.889 2-1.99a2 2 0 0 0-2-1.993zM.002 5.097V7.97c1.872 0 3.632.733 4.958 2.059A6.984 6.984 0 0 1 7.015 15h2.888c0-5.461-4.443-9.903-9.9-9.903zM.006 0v2.876c6.676 0 12.11 5.44 12.11 12.124H15C15 6.731 8.273 0 .006 0z"/></svg>
50
+ <%= sl_helper.feed_link_text %>
51
+ <% end %>
52
+ <%= tag.button feed_link_text, {
53
+ class: "gem-c-subscription-links__item #{brand_helper.color_class} gem-c-subscription-links__item--button",
54
+ data: sl_helper.feed_link_data_attributes,
55
+ lang: feed_link_text_locale
56
+ } if sl_helper.feed_link_box_value %>
57
+ <%= link_to feed_link_text, sl_helper.feed_link,
46
58
  {
47
- class: "gem-c-subscription-links__link #{brand_helper.color_class}",
59
+ class: "gem-c-subscription-links__item #{brand_helper.color_class} gem-c-subscription-links__item--link",
48
60
  data: sl_helper.feed_link_data_attributes,
49
61
  lang: feed_link_text_locale
50
- }
51
- %>
62
+ } unless sl_helper.feed_link_box_value %>
52
63
  </li>
53
64
  <% end %>
54
65
  </ul>
55
66
 
56
67
  <% if sl_helper.feed_link_box_value %>
57
68
  <div class="gem-c-subscription-links__feed-box js-hidden" id="<%= sl_helper.feed_box_id %>">
58
- <p class="gem-c-subscription-links__feed-hidden-description visuallyhidden"><%= sl_helper.feed_link_text %></p>
69
+ <h3 class="gem-c-subscription-links__feed-hidden-description visuallyhidden govuk-!-margin-top-0"><%= sl_helper.feed_link_text %></h3>
59
70
  <div lang="en">
60
71
  <%= render "govuk_publishing_components/components/input", {
61
72
  label: {
data/app/views/govuk_publishing_components/components/docs/action_link.yml CHANGED
@@ -83,6 +83,14 @@ examples:
83
83
  text: Getting financial help and keeping your business safe
84
84
  href: "/financial-help"
85
85
  simple: true
86
+ simple_light_arrow:
87
+ data:
88
+ text: Getting financial help and keeping your business safe
89
+ href: "/financial-help"
90
+ light_text: true
91
+ simple_light: true
92
+ context:
93
+ dark_background: true
86
94
  with_small_icon:
87
95
  data:
88
96
  text: Coronavirus (COVID-19)
data/app/views/govuk_publishing_components/components/feedback/_yes_no_banner.html.erb CHANGED
@@ -6,18 +6,18 @@
6
6
  <div class="gem-c-feedback__prompt-questions js-prompt-questions">
7
7
  <h2 class="gem-c-feedback__prompt-question"><%= t("components.feedback.is_this_page_useful", default: "Is this page useful?") %></h2>
8
8
  <!-- Maybe button exists only to try and capture clicks by bots -->
9
- <button class="govuk-button govuk-button--secondary gem-c-feedback__prompt-link" data-track-category="yesNoFeedbackForm" data-track-action="ffMaybeClick" aria-expanded="false" style="display: none" hidden="hidden" aria-hidden="true">
9
+ <button data-track-category="yesNoFeedbackForm" data-track-action="ffMaybeClick" aria-expanded="false" style="display: none" hidden="hidden" aria-hidden="true">
10
10
  <%= t("components.feedback.maybe", default: "Maybe") %>
11
11
  </button>
12
12
 
13
13
  <ul class="gem-c-feedback__option-list">
14
14
  <li class="gem-c-feedback__option-list-item">
15
- <button class="govuk-button govuk-button--secondary gem-c-feedback__prompt-link js-page-is-useful" data-track-category="yesNoFeedbackForm" data-track-action="ffYesClick">
15
+ <button class="govuk-button gem-c-feedback__prompt-link js-page-is-useful" data-track-category="yesNoFeedbackForm" data-track-action="ffYesClick">
16
16
  <%= t("components.feedback.yes", default: "Yes") %> <span class="govuk-visually-hidden"><%= t("components.feedback.is_useful", default: "this page is useful") %></span>
17
17
  </button>
18
18
  </li>
19
19
  <li class="gem-c-feedback__option-list-item">
20
- <button class="govuk-button govuk-button--secondary gem-c-feedback__prompt-link js-toggle-form js-page-is-not-useful" data-track-category="yesNoFeedbackForm" data-track-action="ffNoClick" aria-controls="page-is-not-useful" aria-expanded="false">
20
+ <button class="govuk-button gem-c-feedback__prompt-link js-toggle-form js-page-is-not-useful" data-track-category="yesNoFeedbackForm" data-track-action="ffNoClick" aria-controls="page-is-not-useful" aria-expanded="false">
21
21
  <%= t("components.feedback.no", default: "No") %> <span class="govuk-visually-hidden"><%= t("components.feedback.is_not_useful", default: "this page is not useful") %></span>
22
22
  </button>
23
23
  </li>
@@ -27,8 +27,8 @@
27
27
  <%= t("components.feedback.thank_you_for_feedback", default: "Thank you for your feedback") %>
28
28
  </div>
29
29
  <div class="gem-c-feedback__prompt-questions gem-c-feedback__prompt-questions--something-is-wrong js-prompt-questions">
30
- <button class="govuk-button govuk-button--secondary gem-c-feedback__prompt-link js-toggle-form js-something-is-wrong" data-track-category="Onsite Feedback" data-track-action="GOV-UK Open Form" aria-controls="something-is-wrong" aria-expanded="false">
31
- <%= t("components.feedback.anything_wrong", default: "Is there anything wrong with this page?") %>
30
+ <button class="govuk-button gem-c-feedback__prompt-link js-toggle-form js-something-is-wrong" data-track-category="Onsite Feedback" data-track-action="GOV-UK Open Form" aria-controls="something-is-wrong" aria-expanded="false">
31
+ <%= t("components.feedback.something_wrong", default: "There is something wrong with this page") %>
32
32
  </button>
33
33
  </div>
34
34
  </div>
data/app/views/govuk_publishing_components/components/layout_header/_search.html.erb CHANGED
@@ -2,7 +2,6 @@
2
2
  <form id="search" class="gem-c-layout-header__search-form govuk-clearfix" action="/search" method="get" role="search">
3
3
  <%= render "govuk_publishing_components/components/search", {
4
4
  id: "site-search-text",
5
- label_text: "Search",
6
5
  no_border: true,
7
6
  margin_bottom: 0
8
7
  } %>
data/config/locales/en.yml CHANGED
@@ -44,7 +44,7 @@ en:
44
44
  is_useful: "this page is useful"
45
45
  is_not_useful: "this page is not useful"
46
46
  thank_you_for_feedback: "Thank you for your feedback"
47
- anything_wrong: "Is there anything wrong with this page?"
47
+ something_wrong: "There is something wrong with this page"
48
48
  close: "Close"
49
49
  help_us_improve_govuk: "Help us improve GOV.UK"
50
50
  more_about_visit: "To help us improve GOV.UK, we’d like to know more about your visit today. We’ll send you a link to a feedback form. It will take only 2 minutes to fill in. Don’t worry we won’t send you spam or share your email address with anyone."
data/lib/govuk_publishing_components/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module GovukPublishingComponents
2
- VERSION = "21.67.0".freeze
2
+ VERSION = "21.69.0".freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: govuk_publishing_components
3
3
  version: !ruby/object:Gem::Version
4
- version: 21.67.0
4
+ version: 21.69.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - GOV.UK Dev
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-09-28 00:00:00.000000000 Z
11
+ date: 2020-10-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: govuk_app_config
@@ -156,14 +156,14 @@ dependencies:
156
156
  requirements:
157
157
  - - "~>"
158
158
  - !ruby/object:Gem::Version
159
- version: '1'
159
+ version: '2'
160
160
  type: :development
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
164
  - - "~>"
165
165
  - !ruby/object:Gem::Version
166
- version: '1'
166
+ version: '2'
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: jasmine
169
169
  requirement: !ruby/object:Gem::Requirement
@@ -318,6 +318,8 @@ files:
318
318
  - app/assets/images/govuk_publishing_components/action-link--nhs.svg
319
319
  - app/assets/images/govuk_publishing_components/action-link-arrow--dark.png
320
320
  - app/assets/images/govuk_publishing_components/action-link-arrow--dark.svg
321
+ - app/assets/images/govuk_publishing_components/action-link-arrow--simple-light.png
322
+ - app/assets/images/govuk_publishing_components/action-link-arrow--simple-light.svg
321
323
  - app/assets/images/govuk_publishing_components/action-link-arrow--simple.png
322
324
  - app/assets/images/govuk_publishing_components/action-link-arrow--simple.svg
323
325
  - app/assets/images/govuk_publishing_components/action-link-arrow--transparent.svg
@@ -1803,7 +1805,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1803
1805
  - !ruby/object:Gem::Version
1804
1806
  version: '0'
1805
1807
  requirements: []
1806
- rubygems_version: 3.0.3
1808
+ rubygems_version: 3.1.4
1807
1809
  signing_key:
1808
1810
  specification_version: 4
1809
1811
  summary: A gem to document components in GOV.UK frontend applications