Skip to content

Commit fe793e2

Browse files
goodgoofgoodgoof
committed
updated landingF
1 parent 29edbfc commit fe793e2

File tree

2 files changed

+1
-337
lines changed

2 files changed

+1
-337
lines changed

‎client/components/LandingF/LandingF.js‎

Lines changed: 1 addition & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,6 @@ import React from 'react'
22
import styles from './LandingF.scss'
33
import logoV from '../../images/logo-home-video-copy.png'
44
import c3nonprofit from '../../images/501-c-3-nonprofit.png'
5-
import React, { Component } from 'react';
6-
import ReactDOM from 'react-dom';
7-
import styles from './LandingF.scss';
8-
import logoV from '../../images/logo-home-video-copy.png';
9-
import facebook from '../../images/facebook.png';
10-
import linkedIn from '../../images/linked-in.png';
11-
import pininterest from '../../images/pininterest.png';
12-
import twitter from '../../images/twitter.png';
13-
import c3nonprofit from '../../images/501-c-3-nonprofit.png';
14-
<<<<<<< HEAD
15-
=======
16-
17-
>>>>>>> 7fcea305a1e111cc6d48d4b6e341182eb4eac9cc
185

196
class Footer extends React.Component {
207
render () {
@@ -23,63 +10,11 @@ class Footer extends React.Component {
2310
<div className={styles.column1}>
2411
<img src={logoV} alt="Call to code logo"/>
2512
<p><img src={c3nonprofit} className={styles.nonProfit} /></p>
26-
<p><img src={c3nonprofit} className="nonProfit" /></p>
2713
</div>
2814

2915
<div className={styles.column2}>
3016
<ul className={styles.list}>
3117
<li className={styles.projects}><a href="#" className={styles.link}>Projects</a></li>
32-
import React, { Component } from 'react'
33-
import styles from './LandingF.scss'
34-
import logo from '../../images/logo-home.png'
35-
import facebook from '../../images/facebook.png'
36-
import linkedin from '../../images/linked-in.png'
37-
import pininterest from '../../images/pininterest.png'
38-
import twitter from '../../images/twitter.png'
39-
import c3nonprofit from '../../images/501-c-3-nonprofit.png'
40-
import React, { Component } from 'react';
41-
import ReactDOM from 'react-dom';
42-
import styles from './LandingF.scss';
43-
import logo from '../../images/logo-home.png';
44-
import facebook from '../../images/facebook.png';
45-
import linkedIn from '../../images/linked-in.png';
46-
import pininterest from '../../images/pininterest.png';
47-
import twitter from '../../images/twitter.png';
48-
import c3nonprofit from '../../images/501-c-3-nonprofit.png';
49-
50-
51-
class Footer extends React.Component {
52-
render(){
53-
return (
54-
<div className={styles.container}>
55-
<div className={styles.column1}>
56-
<<<<<<< HEAD
57-
<img src={logo} alt="Call to code logo" className={styles.logoHome} />
58-
<p><img src={c3nonprofit} className="nonProfit" /></p>
59-
=======
60-
<img src={logo} alt="Call to code logo" className="logo-home" />
61-
<p><img src={c3nonprofit} className="non-profit" /></p>
62-
>>>>>>> 7fcea305a1e111cc6d48d4b6e341182eb4eac9cc
63-
</div>
64-
65-
66-
<div className={styles.column2}>
67-
<ul className={styles.list}>
68-
<li className={styles.product}>Product</li>
69-
<li className={styles.list-items styles.popular}><a href="#">Popular</li>
70-
<li className={styles.list-items}><a href="#">Trending</li>
71-
<li className={styles.list-items}><a href="#">Catalog</li>
72-
<li className={styles.list-items styles.popular}>Popular</li>
73-
<li className={styles.list-items}>Trending</li>
74-
<li className={styles.list-items}>Catalog</li>
75-
<li className={styles.listItems}>Popular</li>
76-
<li className={styles.listItems}>Trending</li>
77-
<li className={styles.listItems}>Catalog</li>
78-
<li className={styles.projects}>Projects</li>
79-
// <li className={styles.listItems}>Popular</li>
80-
// <li className={styles.listItems}>Trending</li>
81-
// <li className={styles.listItems}>Catalog</li>
82-
// <li className={styles.listItems}>Features</li>
8318
</ul>
8419
</div>
8520

@@ -88,53 +23,10 @@ class Footer extends React.Component {
8823
<li className={styles.about}><a href="/about" className={styles.link}>About</a></li>
8924
</ul>
9025
</div>
26+
9127
</div>
9228
)
9329
}
9430
}
95-
};
9631

9732
export default Footer
98-
<li className={styles.company}>Company</li>
99-
<li className={styles.listItems}>Press</li>
100-
<li className={styles.listItems}>Releases</li>
101-
<li className={styles.listItems}>Mission</li>
102-
<li className={styles.listItems}>Strategy</li>
103-
<li className={styles.listItems}>Works</li>
104-
<li className={styles.about}>About</li>
105-
// <li className={styles.listItems}>Press</li>
106-
// <li className={styles.listItems}>Releases</li>
107-
// <li className={styles.listItems}>Mission</li>
108-
// <li className={styles.listItems}>Strategy</li>
109-
// <li className={styles.listItems}>Works</li>
110-
</ul>
111-
</div>
112-
113-
<<<<<<< HEAD
114-
// <div className={styles.column4}>
115-
// <p className={styles.followUS}>FOLLOW US</p>
116-
// <div className={styles.socialMedia}>
117-
// <a href="#"><img src={facebook} alt="facebook logo" className={styles.facebook} /></a>
118-
// <a href="#"><img src={twitter} alt="twitter logo" className={styles.twitter} /></a>
119-
// <a href="#"><img src={linkedIn} alt="linkedin logo" className={styles.linkedIn} /></a>
120-
// <a href="#"><img src={pininterest} alt="pininterest logo" className={styles.pininterest} /></a>
121-
// </div>
122-
// </div>
123-
=======
124-
<div className={styles.column4}>
125-
<p className={styles.followUS}>FOLLOW US</p>
126-
<div className={styles.socialMedia}>
127-
<a href="#"><img src={facebook} alt="facebook logo" className="facebook" /></a>
128-
<a href="#"><img src={twitter} alt="twitter logo" className="twitter" /></a>
129-
<a href="#"><img src={linked-in} alt="linkedin logo" className="linkedIn" /></a>
130-
<a href="#"><img src={pininterest} alt="pininterest logo" className="pininterest" /></a>
131-
</div>
132-
</div>
133-
>>>>>>> 7fcea305a1e111cc6d48d4b6e341182eb4eac9cc
134-
</div>
135-
)
136-
}
137-
};
138-
139-
140-
export default LandingF

‎client/components/LandingF/LandingF.scss‎

Lines changed: 0 additions & 228 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,6 @@ $white: #ffffff;
2020
width: 103px;
2121
height: 15px;
2222
list-style-type: none;
23-
<<<<<<< HEAD
24-
=======
25-
font-size: 30px;
26-
>>>>>>> 7fcea305a1e111cc6d48d4b6e341182eb4eac9cc
27-
font-family: Gotham;
28-
background-color: $black;
29-
background-size: cover;
30-
height: 438px;
31-
color: $grey;
32-
display: flex;
33-
position: absolute;
34-
}
35-
36-
.projects, .about {
37-
width: 103px;
38-
height: 15px;
39-
list-style-type: none;
40-
font-family: Gotham;
41-
font-size: 15.6px;
4223
font-size: 15.6px;
4324
font-weight: bold;
4425
letter-spacing: 3.1px;
@@ -48,93 +29,8 @@ $white: #ffffff;
4829
.link {
4930
color: $white;
5031
}
51-
.link {
52-
color: $grey;
53-
}
54-
.column1, .column2, .column3, .column4 {
55-
margin-top: 103px;
56-
}
57-
58-
.column1 {
59-
margin-left: 95px;
60-
}
61-
.column2 {
62-
margin-left: 137px;
63-
padding-left: 0px;
64-
text-align: left;
65-
color: $grey;
66-
}
67-
68-
.column3 {
69-
margin-left: 155px;
70-
<<<<<<< HEAD
71-
width: 131px;
72-
=======
73-
>>>>>>> 7fcea305a1e111cc6d48d4b6e341182eb4eac9cc
74-
}
75-
//
76-
//
77-
//
78-
// .followUS {
79-
// width: 127px;
80-
// height: 15px;
81-
// font-family: Gotham;
82-
// font-family: Gotham;
83-
// font-size: 15.6px;
84-
// font-weight: bold;
85-
// text-align: left;
86-
// color: #ffffff;
87-
// }
88-
89-
// .popular, .press {
90-
// margin-top: 32px;
91-
// }
92-
//
93-
// .list {
94-
// padding-left: 0px;
95-
// }
96-
// .listItems {
97-
// list-style-type: none;
98-
// width: 131px;
99-
// margin-bottom: 28px;
100-
// object-fit: contain;
101-
// font-family: Gotham;
102-
// font-size: 18.2px;
103-
// text-align: left;
104-
// color: #9fa3a7;
105-
// }
106-
//
107-
// .socialMedia {
108-
// display: flex;
109-
// }
110-
<<<<<<< HEAD
111-
112-
// .popular, .press {
113-
// margin-top: 32px;
114-
// }
115-
//
116-
// .list {
117-
// padding-left: 0px;
118-
// }
119-
// .listItems {
120-
// list-style-type: none;
121-
// width: 131px;
122-
// margin-bottom: 28px;
123-
// object-fit: contain;
124-
// font-family: Gotham;
125-
// font-size: 18.2px;
126-
// text-align: left;
127-
// color: #9fa3a7;
128-
// }
129-
//
130-
// .socialMedia {
131-
// display: flex;
132-
// }
133-
=======
134-
>>>>>>> 7fcea305a1e111cc6d48d4b6e341182eb4eac9cc
13532

13633
.column1, .column2, .column3 {
137-
.column1, .column2, .column3, .column4 {
13834
margin-top: 103px;
13935
display: inline-block;
14036
}
@@ -147,17 +43,6 @@ $white: #ffffff;
14743
margin-top: 24px;
14844
}
14945

150-
.nonProfit {
151-
margin-top: 24px;
152-
}
153-
154-
<<<<<<< HEAD
155-
.nonProfit {
156-
margin-top: 24px;
157-
}
158-
159-
=======
160-
>>>>>>> 7fcea305a1e111cc6d48d4b6e341182eb4eac9cc
16146
.column2 {
16247
margin-left: 80px;
16348
padding-left: 0px;
@@ -167,117 +52,4 @@ $white: #ffffff;
16752

16853
.column3 {
16954
width: 131px;
170-
color: #9fa3a7;
171-
}
172-
173-
.column3 {
174-
margin-left: 155px;
175-
}
176-
177-
.column4 {
178-
margin-left: 153px;
179-
}
180-
181-
.logoHome {
182-
width: 248px;
183-
height: 90px;
184-
}
185-
186-
.facebook, .twitter, .linkedIn, .pininterest {
187-
margin-right: 66px;
188-
}
189-
190-
.followUS {
191-
width: 127px;
192-
height: 15px;
193-
font-family: Gotham;
194-
font-family: Gotham;
195-
font-size: 15.6px;
196-
font-weight: bold;
197-
text-align: left;
198-
color: #ffffff;
199-
}
200-
201-
.column3 {
202-
margin-left: 155px;
203-
}
204-
205-
// .column4 {
206-
// margin-left: 153px;
207-
// }
208-
209-
.logoHome {
210-
width: 248px;
211-
height: 90px;
212-
}
213-
214-
.facebook, .twitter, .linkedIn, .pininterest {
215-
margin-right: 66px;
216-
}
217-
218-
.followUS {
219-
width: 127px;
220-
height: 15px;
221-
font-family: Gotham;
222-
font-family: Gotham;
223-
font-size: 15.6px;
224-
font-weight: bold;
225-
text-align: left;
226-
color: #ffffff;
227-
}
228-
229-
.column3 {
230-
margin-left: 155px;
231-
}
232-
233-
// .column4 {
234-
// margin-left: 153px;
235-
// }
236-
237-
.logoHome {
238-
width: 248px;
239-
height: 90px;
240-
}
241-
242-
.facebook, .twitter, .linkedIn, .pininterest {
243-
margin-right: 66px;
244-
}
245-
246-
.followUS {
247-
width: 127px;
248-
height: 15px;
249-
font-family: Gotham;
250-
font-family: Gotham;
251-
font-size: 15.6px;
252-
font-weight: bold;
253-
text-align: left;
254-
color: #ffffff;
255-
}
256-
257-
.column3 {
258-
margin-left: 155px;
259-
}
260-
261-
// .column4 {
262-
// margin-left: 153px;
263-
// }
264-
265-
.logoHome {
266-
width: 248px;
267-
height: 90px;
268-
}
269-
270-
.facebook, .twitter, .linkedIn, .pininterest {
271-
margin-right: 66px;
272-
}
273-
274-
.followUS {
275-
width: 127px;
276-
height: 15px;
277-
font-family: Gotham;
278-
font-family: Gotham;
279-
font-size: 15.6px;
280-
font-weight: bold;
281-
text-align: left;
282-
color: #ffffff;
28355
}

0 commit comments

Comments
 (0)