Skip to content

Commit e4315b0

Browse files
authored
Merge pull request #7987 from google/link-svgs-7968
2 parents fd747de + 0ceca2e commit e4315b0

File tree

194 files changed

+173
-75
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+173
-75
lines changed

assets/js/components/Link.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ const Link = forwardRef( ( props, ref ) => {
182182
<BackIcon width={ 14 } height={ 14 } />
183183
</IconWrapper>
184184
) }
185-
{ children }
185+
<span>{ children }</span>
186186
{ external && ! hideExternalIndicator && (
187187
<IconWrapper marginLeft={ 5 }>
188188
<ExternalIcon width={ 14 } height={ 14 } />

assets/js/components/notifications/__snapshots__/ErrorNotifications.test.js.snap

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,9 @@ exports[`ErrorNotifications renders the GTE message when the only unsatisfied sc
237237
rel="noopener noreferrer"
238238
target="_blank"
239239
>
240-
Learn more
240+
<span>
241+
Learn more
242+
</span>
241243
<span
242244
class="googlesitekit-icon-wrapper"
243245
style="margin-left: 5px;"

assets/js/components/setup/__snapshots__/SetupUsingProxyWithSignIn.test.js.snap

Lines changed: 50 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,20 @@ exports[`SetupUsingProxyWithSignIn should not render the Activate Analytics noti
1919
class="googlesitekit-cta-link googlesitekit-header__logo-link"
2020
href=""
2121
>
22-
<div
23-
aria-hidden="true"
24-
class="googlesitekit-logo"
25-
>
26-
<svg />
27-
<svg />
28-
<span
29-
class="screen-reader-text"
22+
<span>
23+
<div
24+
aria-hidden="true"
25+
class="googlesitekit-logo"
3026
>
31-
Site Kit by Google Logo
32-
</span>
33-
</div>
27+
<svg />
28+
<svg />
29+
<span
30+
class="screen-reader-text"
31+
>
32+
Site Kit by Google Logo
33+
</span>
34+
</div>
35+
</span>
3436
</a>
3537
</div>
3638
<div
@@ -75,7 +77,9 @@ exports[`SetupUsingProxyWithSignIn should not render the Activate Analytics noti
7577
tabindex="-1"
7678
target="_blank"
7779
>
78-
Fix common issues
80+
<span>
81+
Fix common issues
82+
</span>
7983
</a>
8084
</li>
8185
<li
@@ -92,7 +96,9 @@ exports[`SetupUsingProxyWithSignIn should not render the Activate Analytics noti
9296
tabindex="-1"
9397
target="_blank"
9498
>
95-
Read help docs
99+
<span>
100+
Read help docs
101+
</span>
96102
</a>
97103
</li>
98104
<li
@@ -109,7 +115,9 @@ exports[`SetupUsingProxyWithSignIn should not render the Activate Analytics noti
109115
tabindex="-1"
110116
target="_blank"
111117
>
112-
Get support
118+
<span>
119+
Get support
120+
</span>
113121
</a>
114122
</li>
115123
</ul>
@@ -278,7 +286,9 @@ exports[`SetupUsingProxyWithSignIn should not render the Activate Analytics noti
278286
rel="noopener noreferrer"
279287
target="_blank"
280288
>
281-
Google Privacy Policy.
289+
<span>
290+
Google Privacy Policy.
291+
</span>
282292
<span
283293
class="googlesitekit-icon-wrapper"
284294
style="margin-left: 5px;"
@@ -336,18 +346,20 @@ exports[`SetupUsingProxyWithSignIn should render the setup page, including the A
336346
class="googlesitekit-cta-link googlesitekit-header__logo-link"
337347
href=""
338348
>
339-
<div
340-
aria-hidden="true"
341-
class="googlesitekit-logo"
342-
>
343-
<svg />
344-
<svg />
345-
<span
346-
class="screen-reader-text"
349+
<span>
350+
<div
351+
aria-hidden="true"
352+
class="googlesitekit-logo"
347353
>
348-
Site Kit by Google Logo
349-
</span>
350-
</div>
354+
<svg />
355+
<svg />
356+
<span
357+
class="screen-reader-text"
358+
>
359+
Site Kit by Google Logo
360+
</span>
361+
</div>
362+
</span>
351363
</a>
352364
</div>
353365
<div
@@ -392,7 +404,9 @@ exports[`SetupUsingProxyWithSignIn should render the setup page, including the A
392404
tabindex="-1"
393405
target="_blank"
394406
>
395-
Fix common issues
407+
<span>
408+
Fix common issues
409+
</span>
396410
</a>
397411
</li>
398412
<li
@@ -409,7 +423,9 @@ exports[`SetupUsingProxyWithSignIn should render the setup page, including the A
409423
tabindex="-1"
410424
target="_blank"
411425
>
412-
Read help docs
426+
<span>
427+
Read help docs
428+
</span>
413429
</a>
414430
</li>
415431
<li
@@ -426,7 +442,9 @@ exports[`SetupUsingProxyWithSignIn should render the setup page, including the A
426442
tabindex="-1"
427443
target="_blank"
428444
>
429-
Get support
445+
<span>
446+
Get support
447+
</span>
430448
</a>
431449
</li>
432450
</ul>
@@ -649,7 +667,9 @@ exports[`SetupUsingProxyWithSignIn should render the setup page, including the A
649667
rel="noopener noreferrer"
650668
target="_blank"
651669
>
652-
Google Privacy Policy.
670+
<span>
671+
Google Privacy Policy.
672+
</span>
653673
<span
654674
class="googlesitekit-icon-wrapper"
655675
style="margin-left: 5px;"

assets/js/googlesitekit/widgets/components/__snapshots__/WPDashboardReportError.test.js.snap

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ exports[`WPDashboardReportError should only render one error per module when the
3636
rel="noopener noreferrer"
3737
target="_blank"
3838
>
39-
Get help
39+
<span>
40+
Get help
41+
</span>
4042
</a>
4143
</div>
4244
</div>
@@ -74,7 +76,9 @@ exports[`WPDashboardReportError should only render one error per module when the
7476
rel="noopener noreferrer"
7577
target="_blank"
7678
>
77-
Get help
79+
<span>
80+
Get help
81+
</span>
7882
</a>
7983
</div>
8084
</div>

assets/js/modules/adsense/components/widgets/__snapshots__/ConnectAdSenseCTATileWidget.test.js.snap

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ exports[`ConnectAdSenseCTATileWidget should render the Connect AdSense CTA tile
2525
<button
2626
class="googlesitekit-cta-link googlesitekit-cta-link--secondary"
2727
>
28-
Connect AdSense
28+
<span>
29+
Connect AdSense
30+
</span>
2931
</button>
3032
</div>
3133
</div>

assets/js/modules/analytics-4/components/common/__snapshots__/EnhancedMeasurementSwitch.test.js.snap

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ exports[`EnhancedMeasurementSwitch should render correctly in the already enable
1919
rel="noopener noreferrer"
2020
target="_blank"
2121
>
22-
Learn more
22+
<span>
23+
Learn more
24+
</span>
2325
<span
2426
class="googlesitekit-icon-wrapper"
2527
style="margin-left: 5px;"
@@ -79,7 +81,9 @@ exports[`EnhancedMeasurementSwitch should render correctly in the default state
7981
rel="noopener noreferrer"
8082
target="_blank"
8183
>
82-
Learn more
84+
<span>
85+
Learn more
86+
</span>
8387
<span
8488
class="googlesitekit-icon-wrapper"
8589
style="margin-left: 5px;"
@@ -140,7 +144,9 @@ exports[`EnhancedMeasurementSwitch should render correctly in the disabled state
140144
rel="noopener noreferrer"
141145
target="_blank"
142146
>
143-
Learn more
147+
<span>
148+
Learn more
149+
</span>
144150
<span
145151
class="googlesitekit-icon-wrapper"
146152
style="margin-left: 5px;"
@@ -192,7 +198,9 @@ exports[`EnhancedMeasurementSwitch should render correctly in the loading state
192198
rel="noopener noreferrer"
193199
target="_blank"
194200
>
195-
Learn more
201+
<span>
202+
Learn more
203+
</span>
196204
<span
197205
class="googlesitekit-icon-wrapper"
198206
style="margin-left: 5px;"

assets/js/modules/analytics-4/components/dashboard/EnhancedMeasurementActivationBanner/__snapshots__/SetupBanner.test.js.snap

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ exports[`SetupBanner should render correctly when the user does have the edit sc
4444
rel="noopener noreferrer"
4545
target="_blank"
4646
>
47-
Learn more
47+
<span>
48+
Learn more
49+
</span>
4850
<span
4951
class="googlesitekit-icon-wrapper"
5052
style="margin-left: 5px;"
@@ -70,7 +72,9 @@ exports[`SetupBanner should render correctly when the user does have the edit sc
7072
<button
7173
class="googlesitekit-cta-link"
7274
>
73-
Maybe later
75+
<span>
76+
Maybe later
77+
</span>
7478
</button>
7579
</div>
7680
<div
@@ -133,7 +137,9 @@ exports[`SetupBanner should render correctly when the user does not have the edi
133137
rel="noopener noreferrer"
134138
target="_blank"
135139
>
136-
Learn more
140+
<span>
141+
Learn more
142+
</span>
137143
<span
138144
class="googlesitekit-icon-wrapper"
139145
style="margin-left: 5px;"
@@ -159,7 +165,9 @@ exports[`SetupBanner should render correctly when the user does not have the edi
159165
<button
160166
class="googlesitekit-cta-link"
161167
>
162-
Maybe later
168+
<span>
169+
Maybe later
170+
</span>
163171
</button>
164172
</div>
165173
<div

assets/js/modules/analytics-4/components/dashboard/EnhancedMeasurementActivationBanner/__snapshots__/index.test.js.snap

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ exports[`EnhancedMeasurementActivationBanner should render the setup step when e
4444
rel="noopener noreferrer"
4545
target="_blank"
4646
>
47-
Learn more
47+
<span>
48+
Learn more
49+
</span>
4850
<span
4951
class="googlesitekit-icon-wrapper"
5052
style="margin-left: 5px;"
@@ -70,7 +72,9 @@ exports[`EnhancedMeasurementActivationBanner should render the setup step when e
7072
<button
7173
class="googlesitekit-cta-link"
7274
>
73-
Maybe later
75+
<span>
76+
Maybe later
77+
</span>
7478
</button>
7579
</div>
7680
<div
@@ -133,7 +137,9 @@ exports[`EnhancedMeasurementActivationBanner should render the success step when
133137
rel="noopener noreferrer"
134138
target="_blank"
135139
>
136-
Learn more
140+
<span>
141+
Learn more
142+
</span>
137143
<span
138144
class="googlesitekit-icon-wrapper"
139145
style="margin-left: 5px;"

0 commit comments

Comments
 (0)