Skip to content

Commit a69962f

Browse files
forstisabellaforstisabella
authored
Merge pull request #7669 from segmentio/master
Master to develop after one-off
2 parents 3050d38 + 18fe026 commit a69962f

File tree

154 files changed

+402
-304
lines changed

Some content is hidden

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

154 files changed

+402
-304
lines changed

‎src/_data/nav.yml‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
---
22
sections:
3-
- section_title: Product
3+
- section_title: Products
44
section:
55
- path: "https://segment.com/product/connections/"
66
title: Connections
77
- path: "https://segment.com/product/protocols/"
88
title: Protocols
9+
- path: "https://segment.com/product/unify/"
10+
title: Unify
911
- path: "https://segment.com/product/twilio-engage/"
1012
title: Twilio Engage
13+
- path: "https://segment.com/customer-data-platform/"
14+
title: Customer Data Platform
1115
- path: "https://segment.com/catalog/"
1216
title: Integrations Catalog
1317
- path: "https://segment.com/pricing/"
@@ -36,10 +40,14 @@ sections:
3640
title: Blog
3741
- path: "https://segment.com/press/"
3842
title: Press
39-
- path: "https://segment.com/podcast/"
40-
title: FTFY Podcast
4143
- path: "https://segment.com/events/"
4244
title: Events
45+
- path: "https://segment.com/podcast/"
46+
title: Podcast
47+
- path: "https://segment.com/growth-center/"
48+
title: Growth Center
49+
- path: "https://segment.com/data-hub/"
50+
title: Data Hub
4351
- section_title: Support
4452
section:
4553
- path: "https://segment.com/help/"
@@ -50,7 +58,15 @@ sections:
5058
title: Resources
5159
- path: "https://segment.com/recipes/"
5260
title: Recipes
61+
- path: "https://segment.com/services/"
62+
title: Professional Services
5363
- path: "https://segment.com/security/bulletins/"
5464
title: Security Bulletins
65+
- path: "https://segment.com/docs/"
66+
title: Documentation
67+
- path: "https://community.segment.com/product-updates"
68+
title: Release Notes
5569
- path: "https://segment.com/partners/"
5670
title: Become a Partner
71+
- path: "https://segment.com/resources/cdp/"
72+
title: Guide to Customer Data Platforms

‎src/_includes/components/footer.html‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<div class="footer">
22
<div class="footer__container">
33
{% include icons/segment.svg %}
4-
54
<div class="footer__content">
65
<div class="flex flex--wrap waffle waffle--large">
76
{% for nav in site.data.nav.sections %}
@@ -20,7 +19,7 @@
2019
</div>
2120
{% endfor %}
2221
</div>
23-
</div>
22+
</div>
2423
</div>
2524

2625
<div class="footer__aside">
@@ -30,19 +29,19 @@
3029
<div class="nav">
3130
<ul class="nav-list flex flex--stack flex--queue@large waffle waffle--xlarge@large">
3231
<li class="flex__column flex__column--shrink">
33-
<p>© {{ site.time | date: "%Y" }} Segment.io, Inc.</p>
32+
<p>© {{ site.time | date: "%Y" }} Twilio Inc. All Rights Reserved. </p>
3433
</li>
3534

3635
<li class="flex__column flex__column--shrink">
37-
<a class="nav-list__link" href="https://segment.com/legal/privacy/">Privacy</a>
36+
<a class="nav-list__link" href="https://www.twilio.com/en-us/legal/privacy">Privacy</a>
3837
</li>
3938

4039
<li class="flex__column flex__column--shrink">
41-
<a class="nav-list__link" href="https://segment.com/legal/terms/">Terms</a>
40+
<a class="nav-list__link" href="https://www.twilio.com/en-us/legal/tos">Terms</a>
4241
</li>
4342

4443
<li class="flex__column flex__column--shrink">
45-
<a class="nav-list__link" href="#" id="open-consent-manager">Website Data Collection Preferences</a>
44+
<a class="nav-list__link" href="#" id="open-consent-manager">Website Data Collection</a>
4645
</li>
4746
</ul>
4847
</div>
@@ -57,8 +56,8 @@
5756
</li>
5857

5958
<li>
60-
<a href="https://twitter.com/segment" class="social-list__link">
61-
{% include icons/socials/twitter.svg %}
59+
<a href="https://x.com/segment" class="social-list__link">
60+
{% include icons/socials/x.svg %}
6261
</a>
6362
</li>
6463

‎src/_includes/content/functions-copilot-nutrition-facts.html‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
<style type="text/css">
2-
@font-face {
3-
font-family: 'SF Pro Text';
4-
src: url('fonts/sf-pro/SFProText-Regular.eot');
5-
src: url('fonts/sf-pro/SFProText-Regular.eot?#iefix') format('embedded-opentype');
6-
font-style: normal;
7-
}
2+
@font-face @font-face {
3+
font-family: 'Twilio Sans Text';
4+
src: url('fonts/twilio-sans-text/TwilioSansText-Regular.eot') format ('eot');
5+
src: url('fonts/twilio-sans-text/TwilioSansText-Regular.woff2') format('woff2');
6+
src: url('fonts/twilio-sans-text/TwilioSansText-Regular.woff') format('woff');
7+
font-style: normal;
8+
}
89
doc-content.ol{margin:0;padding:0}
910
doc-content.table td,table th{padding:0}
1011
.c9{border-right-style:solid;padding:5pt 5pt 5pt 5pt;border-bottom-color:#000000;border-top-width:1pt;border-right-width:3pt;border-left-color:#000000;vertical-align:top;border-right-color:#000000;border-left-width:3pt;border-top-style:solid;border-left-style:solid;border-bottom-width:3pt;width:468pt;border-top-color:#000000;border-bottom-style:solid}
1112
.c28{border-right-style:solid;padding:5pt 5pt 5pt 5pt;border-bottom-color:#000000;border-top-width:3pt;border-right-width:3pt;border-left-color:#000000;vertical-align:top;border-right-color:#000000;border-left-width:3pt;border-top-style:solid;border-left-style:solid;border-bottom-width:6pt;width:468pt;border-top-color:#000000;border-bottom-style:solid}
1213
.c6{border-right-style:solid;padding:5pt 5pt 5pt 5pt;border-bottom-color:#000000;border-top-width:1pt;border-right-width:3pt;border-left-color:#000000;vertical-align:top;border-right-color:#000000;border-left-width:3pt;border-top-style:solid;border-left-style:solid;border-bottom-width:1pt;width:468pt;border-top-color:#000000;border-bottom-style:solid}
1314
.c26{border-right-style:solid;padding:5pt 5pt 5pt 5pt;border-bottom-color:#000000;border-top-width:6pt;border-right-width:3pt;border-left-color:#000000;vertical-align:top;border-right-color:#000000;border-left-width:3pt;border-top-style:solid;border-left-style:solid;border-bottom-width:1pt;width:468pt;border-top-color:#000000;border-bottom-style:solid}
14-
.c0{color:#000000;font-weight:400;text-decoration:none;vertical-align:baseline;font-size:12pt;font-family:"SF Pro Text";font-style:normal}
15-
.c7{color:#000000;font-weight:400;text-decoration:none;vertical-align:baseline;font-size:11pt;font-family:"SF Pro Text";font-style:normal}
16-
.c8{color:#000000;font-weight:700;text-decoration:none;vertical-align:baseline;font-size:12pt;font-family:"SF Pro Text";font-style:normal}
15+
.c0{color:#000000;font-weight:400;text-decoration:none;vertical-align:baseline;font-size:12pt;font-family:"Twilio Sans Text";font-style:normal}
16+
.c7{color:#000000;font-weight:400;text-decoration:none;vertical-align:baseline;font-size:11pt;font-family:"Twilio Sans Text";font-style:normal}
17+
.c8{color:#000000;font-weight:700;text-decoration:none;vertical-align:baseline;font-size:12pt;font-family:"Twilio Sans Text";font-style:normal}
1718
.c11{padding-top:0pt;padding-bottom:10pt;line-height:1.0;orphans:2;widows:2;text-align:left;height:11pt}
1819
.c20{margin-left:216pt;padding-top:0pt;padding-bottom:10pt;line-height:1.0;orphans:2;widows:2;text-align:left}
1920
.c3{margin-left:13.5pt;padding-top:0pt;padding-bottom:0pt;line-height:1.15;text-align:left}
@@ -23,30 +24,30 @@
2324
.c14{padding-top:0pt;padding-bottom:0pt;line-height:1.15;text-align:left}
2425
.c27{color:#ffffff;text-decoration:none;vertical-align:baseline;font-style:normal}
2526
.c23{background-color:#ffffff;max-width:468pt;padding:72pt 72pt 72pt 72pt}
26-
.c15{font-weight:400;font-size:11pt;font-family:"SF Pro Text"}
27-
.c25{font-size:25pt;font-family:"SF Pro Text";font-weight:700}
27+
.c15{font-weight:400;font-size:11pt;font-family:"Twilio Sans Text"}
28+
.c25{font-size:25pt;font-family:"Twilio Sans Text";font-weight:700}
2829
.c18{orphans:2;widows:2;height:11pt}
29-
.c21{font-size:10pt;font-family:"SF Pro Text";font-weight:700}
30-
.c24{font-weight:400;font-size:11pt;font-family:"SF Pro Text"}
31-
.c13{font-size:12pt;font-family:"SF Pro Text";font-weight:700}
32-
.c22{font-size:12pt;font-family:"SF Pro Text";font-weight:400}
33-
.c1{font-size:9pt;font-family:"SF Pro Text";font-weight:400}
34-
.c17{font-weight:400;font-size:18pt;font-family:"SF Pro Text"}
35-
.c29{font-weight:400;font-size:10pt;font-family:"SF Pro Text"}
36-
.c16{font-weight:400;font-size:10pt;font-family:"SF Pro Text"}
30+
.c21{font-size:10pt;font-family:"Twilio Sans Text";font-weight:700}
31+
.c24{font-weight:400;font-size:11pt;font-family:"Twilio Sans Text"}
32+
.c13{font-size:12pt;font-family:"Twilio Sans Text";font-weight:700}
33+
.c22{font-size:12pt;font-family:"Twilio Sans Text";font-weight:400}
34+
.c1{font-size:9pt;font-family:"Twilio Sans Text";font-weight:400}
35+
.c17{font-weight:400;font-size:18pt;font-family:"Twilio Sans Text"}
36+
.c29{font-weight:400;font-size:10pt;font-family:"Twilio Sans Text"}
37+
.c16{font-weight:400;font-size:10pt;font-family:"Twilio Sans Text"}
3738
.c19{background-color:#000000}
3839
.c5{height:63.5pt}.c4{height:0pt}
3940
.c4{height:0pt}
40-
doc-content.title{padding-top:0pt;color:#000000;font-size:26pt;padding-bottom:3pt;font-family:"SF Pro Text";line-height:1.15;page-break-after:avoid;orphans:2;widows:2;text-align:left}
41-
doc-content.subtitle{padding-top:0pt;color:#666666;font-size:15pt;padding-bottom:16pt;font-family:"SF Pro Text";line-height:1.15;page-break-after:avoid;orphans:2;widows:2;text-align:left}
42-
doc-content.li{color:#000000;font-size:11pt;font-family:"SF Pro Text"}
43-
doc-content.p{margin:0;color:#000000;font-size:11pt;font-family:"SF Pro Text"}
44-
doc-content.h1{padding-top:20pt;color:#000000;font-size:20pt;padding-bottom:6pt;font-family:"SF Pro Text";line-height:1.15;page-break-after:avoid;orphans:2;widows:2;text-align:left}
45-
doc-content.h2{padding-top:18pt;color:#000000;font-size:16pt;padding-bottom:6pt;font-family:"SF Pro Text";line-height:1.15;page-break-after:avoid;orphans:2;widows:2;text-align:left}
46-
doc-content.h3{padding-top:16pt;color:#434343;font-size:14pt;padding-bottom:4pt;font-family:"SF Pro Text";line-height:1.15;page-break-after:avoid;orphans:2;widows:2;text-align:left}
47-
doc-content.h4{padding-top:14pt;color:#666666;font-size:12pt;padding-bottom:4pt;font-family:"SF Pro Text";line-height:1.15;page-break-after:avoid;orphans:2;widows:2;text-align:left}
48-
doc-content.h5{padding-top:12pt;color:#666666;font-size:11pt;padding-bottom:4pt;font-family:"SF Pro Text";line-height:1.15;page-break-after:avoid;orphans:2;widows:2;text-align:left}
49-
doc-content.h6{padding-top:12pt;color:#666666;font-size:11pt;padding-bottom:4pt;font-family:"SF Pro Text";line-height:1.15;page-break-after:avoid;font-style:italic;orphans:2;widows:2;text-align:left}
41+
doc-content.title{padding-top:0pt;color:#000000;font-size:26pt;padding-bottom:3pt;font-family:"Twilio Sans Text";line-height:1.15;page-break-after:avoid;orphans:2;widows:2;text-align:left}
42+
doc-content.subtitle{padding-top:0pt;color:#666666;font-size:15pt;padding-bottom:16pt;font-family:"Twilio Sans Text";line-height:1.15;page-break-after:avoid;orphans:2;widows:2;text-align:left}
43+
doc-content.li{color:#000000;font-size:11pt;font-family:"Twilio Sans Text"}
44+
doc-content.p{margin:0;color:#000000;font-size:11pt;font-family:"Twilio Sans Text"}
45+
doc-content.h1{padding-top:20pt;color:#000000;font-size:20pt;padding-bottom:6pt;font-family:"Twilio Sans Text";line-height:1.15;page-break-after:avoid;orphans:2;widows:2;text-align:left}
46+
doc-content.h2{padding-top:18pt;color:#000000;font-size:16pt;padding-bottom:6pt;font-family:"Twilio Sans Text";line-height:1.15;page-break-after:avoid;orphans:2;widows:2;text-align:left}
47+
doc-content.h3{padding-top:16pt;color:#434343;font-size:14pt;padding-bottom:4pt;font-family:"Twilio Sans Text";line-height:1.15;page-break-after:avoid;orphans:2;widows:2;text-align:left}
48+
doc-content.h4{padding-top:14pt;color:#666666;font-size:12pt;padding-bottom:4pt;font-family:"Twilio Sans Text";line-height:1.15;page-break-after:avoid;orphans:2;widows:2;text-align:left}
49+
doc-content.h5{padding-top:12pt;color:#666666;font-size:11pt;padding-bottom:4pt;font-family:"Twilio Sans Text";line-height:1.15;page-break-after:avoid;orphans:2;widows:2;text-align:left}
50+
doc-content.h6{padding-top:12pt;color:#666666;font-size:11pt;padding-bottom:4pt;font-family:"Twilio Sans Text";line-height:1.15;page-break-after:avoid;font-style:italic;orphans:2;widows:2;text-align:left}
5051
.nf-right-align{float:right;width:50%;text-align:right;}
5152
.nf-indent{padding-left:1.5em}
5253
</style>

0 commit comments

Comments
 (0)