Skip to content

Commit 3d7b3cc

Browse files
authored
Merge pull request #195 from scientist-softserv/194-footer-component-update
194 footer component update
2 parents a10e467 + c213a47 commit 3d7b3cc

File tree

8 files changed

+31
-10
lines changed

8 files changed

+31
-10
lines changed

src/assets/img/thank-you.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ Our icons were sourced from the following:
1111
* [Twitter social badge icons created by Freepik - Flaticon](https://www.flaticon.com/free-icons/twitter-social-badge)
1212
* [Vimeo icons created by Md Tanvirul Haque - Flaticon](https://www.flaticon.com/free-icons/vimeo)
1313
* [Youtube icons created by Freepik - Flaticon](https://www.flaticon.com/free-icons/youtube)
14+
* [LinkedIn icons created by mohammed mahdi - Flaticon](https://www.flaticon.com/free-icons/mass-media)

src/assets/svg/LinkedIn.jsx

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import * as React from 'react'
2+
3+
const LinkedIn = ({ height, fill }) => (
4+
<svg
5+
height={height}
6+
width={height}
7+
fill={fill}
8+
viewBox='0 0 144 144'
9+
xmlns='http://www.w3.org/2000/svg'
10+
>
11+
<path d='M67.5 0h9c.4.1.7.2 1.1.2 10.8.8 21 3.8 30.3 9.4 19.1 11.4 30.9 28 35 50 .5 2.6.7 5.3 1.1 7.9v9c-.1.4-.2.7-.2 1.1-.9 12.3-4.8 23.7-11.7 34-11.5 17-27.3 27.5-47.6 31.3-2.7.5-5.4.8-8 1.1h-9c-.4-.1-.7-.2-1.1-.2-14.3-1.1-27.3-6.1-38.6-14.9-14.5-11.5-23.5-26.4-26.7-44.6-.5-2.6-.7-5.2-1.1-7.8v-9l.6-5.1c2.1-14.7 8-27.6 18-38.6C29.7 11.5 43.4 3.9 59.7 1.1 62.3.6 64.9.4 67.5 0zm41.8 107.6c0-.3.1-.5.1-.7 0-11.5.1-23.1-.1-34.6 0-2.1-.7-4.4-1.5-6.4-5.3-11.9-22.5-13.6-30.7-3.2-.3.4-.6.8-1 1.2-.1 0-.2-.1-.3-.1v-6.4H61v50.2h15.6V83.1c0-1.6 0-3.3.1-4.9.2-2.6 1.4-4.8 3.4-6.6 4.8-4.2 11.4-2.3 13 3.9.4 1.5.5 3.1.5 4.7v27.4h15.7zm-57.8 0V57.5H35.6v50.1h15.9zm-8-56.9c5 0 9-4 9.1-9 0-5-4-9-9-9.1-5 0-9 4-9 9s3.9 9 8.9 9.1z' />
12+
</svg>
13+
)
14+
15+
export default LinkedIn

src/components/Link/link.css

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
.link-group-links {
22
color: #000000;
3-
display: block;
4-
font-size: 16px;
5-
margin-bottom: 5px;
6-
text-decoration: none;
3+
font-size: 13px;
74
}

src/components/SocialIcon/SocialIcon.jsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import TikTok from '../../assets/svg/TikTok'
77
import Twitter from '../../assets/svg/Twitter'
88
import Vimeo from '../../assets/svg/Vimeo'
99
import YouTube from '../../assets/svg/YouTube'
10+
import LinkedIn from '../../assets/svg/LinkedIn'
1011
import './social-icon.css'
1112

1213
const iconsList = {
@@ -17,6 +18,7 @@ const iconsList = {
1718
twitter: (height, color) => <Twitter height={height} fill={color} />,
1819
vimeo: (height, color) => <Vimeo height={height} fill={color} />,
1920
youtube: (height, color) => <YouTube height={height} fill={color} />,
21+
linkedin: (height, color) => <LinkedIn height={height} fill={color}/>,
2022
}
2123

2224
const SocialIcon = ({ addClass, color, height, icon, url }) => (
@@ -29,7 +31,7 @@ SocialIcon.propTypes = {
2931
addClass: PropTypes.string,
3032
color: PropTypes.string,
3133
height: PropTypes.number,
32-
icon: PropTypes.oneOf(['facebook', 'instagram', 'rss', 'tiktok', 'twitter', 'vimeo', 'youtube']).isRequired,
34+
icon: PropTypes.oneOf(['facebook', 'instagram', 'rss', 'tiktok', 'twitter', 'vimeo', 'youtube', 'linkedin']).isRequired,
3335
url: PropTypes.string.isRequired,
3436
}
3537

src/compounds/Footer/Footer.jsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
import React from 'react'
22
import PropTypes from 'prop-types'
33
import LinkGroup from '../LinkGroup/LinkGroup'
4+
import Link from '../../components/Link/Link'
45
import SocialIcon from '../../components/SocialIcon/SocialIcon'
56

67
const Footer = ({ companyName, sections, socials, color, ...props }) => (
7-
<footer id='footer' className={`container-fluid bg-primary py-4 text-${color}`}>
8+
<footer id='footer' className={`container-fluid bg-primary py-3 text-${color}`}>
89
<div className='container'>
910
<div className='row'>
1011
<div className='col-12 col-md-3 text-center text-md-start'>
11-
<h5>© {companyName} {new Date().getFullYear()}</h5>
12+
<h6>© {companyName} {new Date().getFullYear()}</h6>
13+
<Link label='Legal Notices' href='/legal-notices' className={`text-${color} link-group-links text-decoration-none`}/>
1214
</div>
1315
<div
1416
className='col-12 col-md-7 d-flex flex-column flex-sm-row

src/compounds/LinkGroup/LinkGroup.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const LinkGroup = ({ header, headerStyle, links, linkStyle }) => (
1212
key={name}
1313
label={name}
1414
target={target}
15-
addClass='link-group-links'
15+
addClass='link-group-links text-decoration-none mb-1 d-block'
1616
style={linkStyle}
1717
/>
1818
)}

src/compounds/LinkGroup/LinkGroup.stories.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Default.args = {
1818
export const Alternate = Template.bind({})
1919
Alternate.args = {
2020
header: 'Header',
21-
headerStyle: { fontSize: 20, color: '#EC88EE' },
21+
headerStyle: { fontSize: 13, color: '#EC88EE' },
2222
links,
23-
linkStyle: { fontSize: 14, color: '#5E5CCF' },
23+
linkStyle: { fontSize: 13, color: '#5E5CCF' },
2424
}

src/resources/args.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,10 @@ export const socials = [
110110
icon: 'facebook',
111111
url: 'www.facebook.com',
112112
},
113+
{
114+
icon: 'linkedin',
115+
url: 'www.linkedin.com',
116+
},
113117
]
114118

115119
export const shipTo = {

0 commit comments

Comments
 (0)