Skip to content

Commit 53a741a

Browse files
authored
Merge pull request #10 from bocoup/main
Add compliance links to footer
2 parents 35b3eee + b4ec686 commit 53a741a

1 file changed

Lines changed: 93 additions & 18 deletions

File tree

packages/demo/src/components/Footer.tsx

Lines changed: 93 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,17 @@ const useStyles = makeStyles({
3232
link: {
3333
color: 'var(--color-text-light)',
3434
textDecoration: 'none',
35-
fontSize: tokens.fontSizeBase300,
3635
transition: 'color var(--transition-speed) ease',
36+
'&.top-section': {
37+
fontSize: tokens.fontSizeBase300,
38+
},
39+
'&.bottom-section': {
40+
fontSize: tokens.fontSizeBase200,
41+
},
3742
'&:hover': {
3843
color: 'var(--color-primary)',
3944
},
4045
},
41-
copyright: {
42-
textAlign: 'center',
43-
color: 'var(--color-text-light)',
44-
fontSize: tokens.fontSizeBase300,
45-
marginTop: 'calc(var(--spacing-unit) * 4)',
46-
},
4746
list: {
4847
listStyle: 'none',
4948
padding: 0,
@@ -53,6 +52,36 @@ const useStyles = makeStyles({
5352
alignItems: 'center',
5453
gap: 'calc(var(--spacing-unit) * 2)',
5554
},
55+
bottomRowContainer: {
56+
maxWidth: '1200px',
57+
margin: '16px auto 0',
58+
width: '100%',
59+
},
60+
bottomRow: {
61+
borderTop: 'var(--border-width) solid var(--color-border)',
62+
display: 'flex',
63+
flexDirection: 'row',
64+
alignItems: 'center',
65+
justifyContent: 'space-between',
66+
gap: '24px',
67+
padding: '16px',
68+
color: 'var(--color-text-light)',
69+
marginTop: '0',
70+
},
71+
linksContainer: {
72+
display: 'flex',
73+
alignItems: 'center',
74+
gap: '24px',
75+
},
76+
copyrightContainer: {
77+
display: 'flex',
78+
alignItems: 'center',
79+
gap: '24px',
80+
},
81+
copyright: {
82+
color: 'var(--color-text-light)',
83+
fontSize: tokens.fontSizeBase200,
84+
},
5685
});
5786

5887
export function Footer(): JSX.Element {
@@ -67,31 +96,37 @@ export function Footer(): JSX.Element {
6796
<ul className={styles.list}>
6897
{currentUser ? (
6998
<li>
70-
<Link to={`/profile/${currentUser.id}`} className={styles.link}>
99+
<Link
100+
to={`/profile/${currentUser.id}`}
101+
className={`${styles.link} top-section`}
102+
>
71103
View Profile
72104
</Link>
73105
</li>
74106
) : (
75107
<li>
76-
<Link to="/get-started" className={styles.link}>
108+
<Link
109+
to="/get-started"
110+
className={`${styles.link} top-section`}
111+
>
77112
Consent Demo
78113
</Link>
79114
</li>
80115
)}
81116
<li>
82-
<Link to="/policies" className={styles.link}>
117+
<Link to="/policies" className={`${styles.link} top-section`}>
83118
Admin Demo
84119
</Link>
85120
</li>
86121
<li>
87-
<Link to="/playground" className={styles.link}>
122+
<Link to="/playground" className={`${styles.link} top-section`}>
88123
Playground
89124
</Link>
90125
</li>
91126
<li>
92127
<Link
93128
to="https://github.com/microsoft/Open-Source-Consent-Package/tree/main/docs"
94-
className={styles.link}
129+
className={`${styles.link} top-section`}
95130
target="_blank"
96131
rel="noopener noreferrer"
97132
>
@@ -106,7 +141,7 @@ export function Footer(): JSX.Element {
106141
<li>
107142
<Link
108143
to="https://github.com/microsoft/Open-Source-Consent-Package"
109-
className={styles.link}
144+
className={`${styles.link} top-section`}
110145
target="_blank"
111146
rel="noopener noreferrer"
112147
>
@@ -116,7 +151,7 @@ export function Footer(): JSX.Element {
116151
<li>
117152
<Link
118153
to="https://github.com/microsoft/Open-Source-Consent-Package/issues"
119-
className={styles.link}
154+
className={`${styles.link} top-section`}
120155
target="_blank"
121156
rel="noopener noreferrer"
122157
>
@@ -131,7 +166,7 @@ export function Footer(): JSX.Element {
131166
<li>
132167
<Link
133168
to="https://github.com/microsoft/Open-Source-Consent-Package/blob/main/SECURITY.md"
134-
className={styles.link}
169+
className={`${styles.link} top-section`}
135170
target="_blank"
136171
rel="noopener noreferrer"
137172
>
@@ -141,7 +176,7 @@ export function Footer(): JSX.Element {
141176
<li>
142177
<Link
143178
to="https://github.com/microsoft/Open-Source-Consent-Package/blob/main/LICENSE"
144-
className={styles.link}
179+
className={`${styles.link} top-section`}
145180
target="_blank"
146181
rel="noopener noreferrer"
147182
>
@@ -151,8 +186,48 @@ export function Footer(): JSX.Element {
151186
</ul>
152187
</div>
153188
</div>
154-
<div className={styles.copyright}>
155-
© {new Date().getFullYear()} Microsoft. All rights reserved.
189+
<div className={styles.bottomRowContainer}>
190+
<div className={styles.bottomRow}>
191+
<div className={styles.linksContainer}>
192+
<a
193+
href="https://go.microsoft.com/fwlink/?LinkId=521839"
194+
className={`${styles.link} bottom-section`}
195+
target="_blank"
196+
rel="noopener noreferrer"
197+
>
198+
Privacy & Cookies
199+
</a>
200+
<a
201+
href="https://go.microsoft.com/fwlink/?linkid=2259814"
202+
className={`${styles.link} bottom-section`}
203+
target="_blank"
204+
rel="noopener noreferrer"
205+
>
206+
Consumer Health Privacy
207+
</a>
208+
<a
209+
href="https://www.microsoft.com/trademarks"
210+
className={`${styles.link} bottom-section`}
211+
target="_blank"
212+
rel="noopener noreferrer"
213+
>
214+
Trademarks
215+
</a>
216+
</div>
217+
<div className={styles.copyrightContainer}>
218+
<a
219+
href="https://go.microsoft.com/fwlink/?LinkID=206977"
220+
className={`${styles.link} bottom-section`}
221+
target="_blank"
222+
rel="noopener noreferrer"
223+
>
224+
Terms of use
225+
</a>
226+
<span className={styles.copyright}>
227+
&copy; Microsoft {new Date().getFullYear()}
228+
</span>
229+
</div>
230+
</div>
156231
</div>
157232
</footer>
158233
);

0 commit comments

Comments
 (0)