Skip to content

Commit f94aa4a

Browse files
authored
Merge pull request #80 from joquendo/footer
Footer
2 parents 1a47e12 + 8fec9aa commit f94aa4a

File tree

4 files changed

+78
-116
lines changed

4 files changed

+78
-116
lines changed

src/components/Footer/Footer.css

Lines changed: 0 additions & 104 deletions
This file was deleted.

src/components/Footer/Footer.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
33

4-
import FooterBrand from './FooterBrand';
54
import FooterLinks from './FooterLinks';
65
import FooterDisclaimer from './FooterDisclaimer';
76

8-
import './Footer.css';
7+
import './footer.scss';
98

109
const Footer = ({ theme, backgroundColor, fontColor, linkColor, columns, linksList}) => {
1110
const cssStyles = {
@@ -16,7 +15,6 @@ const Footer = ({ theme, backgroundColor, fontColor, linkColor, columns, linksLi
1615

1716
return (
1817
<footer className={ theme } style={ cssStyles }>
19-
<FooterBrand position="center" />
2018
<FooterLinks linkColor = {linkColor} linksList = {linksList} numberOfColumns={columns} />
2119
<FooterDisclaimer position="center sm:left" />
2220
</footer>

src/components/Footer/Footer.stories.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ export default {
1717
},
1818
},
1919
args: {
20-
columns: 1,
20+
columns: 3,
2121
linksList: [
22-
{ ...FooterLinkStories.Default.args.FooterLink, id: '1', title: 'About', url: '#0'},
23-
{ ...FooterLinkStories.Default.args.FooterLink, id: '2', title: 'Projects', url: '#0'},
24-
{ ...FooterLinkStories.Default.args.FooterLink, id: '3', title: 'Blog', url: '#0'},
25-
{ ...FooterLinkStories.Default.args.FooterLink, id: '4', title: 'Contact', url: '#0'},
26-
{ ...FooterLinkStories.Default.args.FooterLink, id: '5', title: 'Forum', url: '#0'},
27-
{ ...FooterLinkStories.Default.args.FooterLink, id: '6', title: 'Archive', url: '#0'},
28-
{ ...FooterLinkStories.Default.args.FooterLink, id: '7', title: 'Gallery', url: '#0'},
29-
{ ...FooterLinkStories.Default.args.FooterLink, id: '8', title: 'Foo', url: '#0'},
22+
{ ...FooterLinkStories.Default.args.FooterLink, id: '1', title: 'About Us', url: '#0'},
23+
{ ...FooterLinkStories.Default.args.FooterLink, id: '2', title: 'Terms of Service', url: '#0'},
24+
{ ...FooterLinkStories.Default.args.FooterLink, id: '3', title: 'Code of Conduct', url: '#0'},
25+
{ ...FooterLinkStories.Default.args.FooterLink, id: '4', title: 'Contact Us', url: '#0'},
26+
{ ...FooterLinkStories.Default.args.FooterLink, id: '5', title: 'Chat', url: '#0'},
27+
{ ...FooterLinkStories.Default.args.FooterLink, id: '6', title: 'Meetups', url: '#0'},
28+
{ ...FooterLinkStories.Default.args.FooterLink, id: '7', title: 'Team Hack', url: '#0'},
29+
{ ...FooterLinkStories.Default.args.FooterLink, id: '8', title: 'Mentorships', url: '#0'},
3030
],
3131
},
3232

@@ -46,6 +46,7 @@ Dark.args = {
4646

4747
export const OneColumn = Template.bind({})
4848
OneColumn.args = {
49+
columns: 1,
4950
}
5051

5152
export const TwoColumn = Template.bind({})

src/components/Footer/footer.scss

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
footer {
2+
color: #fff;
3+
background-color: #4e4e4e;
4+
font-family: 'Oxygen', sans-serif;
5+
font-size: 18px;
6+
font-weight: 400;
7+
padding: 35px 66px;
8+
a {
9+
color: #fff;
10+
display: block;
11+
margin: 5px;
12+
padding: 5px;
13+
width: 100%;
14+
}
15+
.row {
16+
padding: 5px 0;
17+
&:after {
18+
content: '';
19+
display: table;
20+
clear: both;
21+
}
22+
}
23+
.flex {
24+
display: flex;
25+
justify-content: space-evenly;
26+
}
27+
.flex-justify-left {
28+
justify-content: flex-start;
29+
}
30+
/* Setting column widths with flex display */
31+
ul {
32+
li {
33+
flex: 1 0 25%;
34+
}
35+
&.column {
36+
display: flex;
37+
flex-wrap: wrap;
38+
list-style: none;
39+
justify-content: flex-start;
40+
}
41+
&.column-1 li {
42+
flex: 1 0 100%;
43+
}
44+
&.column-2 li {
45+
flex: 0 0 50%;
46+
}
47+
&.column-3 li {
48+
flex: 0 0 33.33%;
49+
}
50+
}
51+
}
52+
53+
@media (min-width: 640px) {
54+
/* Responsive Default for small view */
55+
.sm\:center {
56+
text-align: center;
57+
}
58+
.sm\:left {
59+
text-align: left;
60+
}
61+
.sm\:right {
62+
text-align: right;
63+
}
64+
.sm\:flex-justify-left {
65+
justify-content: flex-start;
66+
}
67+
}

0 commit comments

Comments
 (0)