Skip to content

Commit fe6d437

Browse files
complete version1
1 parent 61355be commit fe6d437

27 files changed

+14330
-6417
lines changed

package-lock.json

Lines changed: 13765 additions & 6230 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"@testing-library/react": "^9.3.2",
1010
"@testing-library/user-event": "^7.1.2",
1111
"history": "^5.0.0",
12+
"netlify-cli": "^3.4.7",
1213
"node-sass": "^4.14.1",
1314
"react": "^16.13.1",
1415
"react-dom": "^16.13.1",

public/css/style.css

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ a:focus, .btn:focus, .btn:active:focus, .btn.active:focus, .btn.focus, .btn:acti
209209
opacity: 0.7;
210210
}
211211
.intro-text {
212-
padding-top: 250px;
212+
padding-top: 200px;
213213
padding-bottom: 200px;
214214
padding-right: 0;
215215
}
@@ -285,12 +285,12 @@ a:focus, .btn:focus, .btn:active:focus, .btn.active:focus, .btn.focus, .btn:acti
285285
transform: translate(-50%);
286286
}
287287
#about .onboard .hLine::after {
288-
width: 81%;
288+
width: 80%;
289289
content: "";
290290
position: absolute;
291291
top: 22.5px;
292-
left: 71.5%;
293-
border: 2px dashed #16005C;
292+
left: 72%;
293+
border: 1px dashed #16005C;
294294
transform: translate(-50%);
295295
}
296296
/* Services Section */
@@ -364,6 +364,7 @@ a:focus, .btn:focus, .btn:active:focus, .btn.active:focus, .btn.focus, .btn:acti
364364
background-size: cover;
365365
background-repeat: no-repeat;
366366
padding-bottom: 15px;
367+
background-size: 100%, 100%;
367368
}
368369
#portfolio .img-fun {
369370
position: absolute;
@@ -657,12 +658,12 @@ color: #777;
657658
width: 100%;
658659
}
659660
.onboard .hLine:after {
660-
width: 85%;
661+
width: 83%;
661662
content: "";
662663
position: absolute;
663664
top: 22.5px;
664-
left: 72.5%;
665-
border: 2px dashed #16005C;
665+
left: 73%;
666+
border: 1px dashed #16005C;
666667
transform: translate(-50%);
667668
}
668669
.onboard .line:after {

public/img/Illustration-2.png

1.2 MB
Loading
25.2 KB
Loading

public/img/user3.png

9.19 MB
Loading

public/js/main.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,12 @@ function main() {
4848

4949

5050
}
51-
main();
51+
main();
52+
53+
$(document).scroll(function() {
54+
if($(window).scrollTop() > 100){
55+
$("#menu").addClass("show-background");
56+
}else if($(window).scrollTop() < 100){
57+
$("#menu").removeClass("show-background");
58+
}
59+
});

src/assets/styles/App.scss

Lines changed: 46 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,26 @@
88
height: 40vmin;
99
pointer-events: none;
1010
}
11-
12-
.link-btns{
13-
display: flex;
14-
flex-direction: column;
15-
min-width: 175px;
11+
#footer{
12+
img{
13+
@include mq('phablet', max) {
14+
width: 70%;
15+
}
16+
}
17+
.link-wrapper{
18+
height: 145px;
19+
.link-btns{
20+
display: flex;
21+
flex-direction: column;
22+
min-width: 175px;
23+
top: 50%;
24+
position: absolute;
25+
transform: translate(0, -50%);
26+
@include mq('tablet-wide', max) {
27+
position: relative;
28+
}
29+
}
30+
}
1631
}
1732

1833
.normal-desc {
@@ -93,6 +108,12 @@
93108
}
94109
}
95110

111+
@include mq('tablet-small', max) {
112+
h1, h2{
113+
font-size: 28px!important;
114+
}
115+
}
116+
96117
.form-item{
97118
input, textarea{
98119
border-radius: 15px;
@@ -106,23 +127,6 @@
106127
}
107128
}
108129
}
109-
.onboard .circle{
110-
margin-left: 117px;
111-
}
112-
.onboard .line{
113-
height: 550px;
114-
}
115-
@include mq('desktop', max) {
116-
.onboard .circle{
117-
margin-left: 92px;
118-
}
119-
.onboard .line{
120-
height: 452px;
121-
&.first-line{
122-
height: 480px;
123-
}
124-
}
125-
}
126130

127131
#features, .faq-container{
128132
.intro-image-transparency, .intro-image{
@@ -151,6 +155,15 @@
151155
margin-top: -200px!important;
152156
.credit_card1-bk{
153157
top: 413px;
158+
width: 80%;
159+
}
160+
}
161+
}
162+
@include mq('tablet', max) {
163+
.img-container{
164+
margin-top: -200px!important;
165+
.credit_card1-bk{
166+
top: 50vw;
154167
}
155168
}
156169
}
@@ -171,45 +184,17 @@
171184
}
172185
}
173186

174-
#services {
175-
margin-left: 20px;
176-
.credit_card3-bk{
177-
top: 80px;
178-
left: -15px;
179-
}
180-
@include mq('tablet-wide', max) {
181-
.content-wrapper{
182-
display: flex;
183-
flex-direction: column-reverse;
184-
.img-container{
185-
margin-top: -400px!important;
186-
.credit_card3-bk{
187-
top: 537px;
188-
}
189-
}
190-
}
191-
}
187+
#menu{
188+
position: fixed;
189+
margin-bottom: -20px;
192190
}
193191

194-
#portfolio{
195-
.download-section{
196-
height: 350px;
197-
padding-top: 20px;
198-
}
199-
.img-fun{
200-
top: 0;
201-
}
202-
@include mq('desktop', max) {
203-
.download-section{
204-
padding-top: 0;
205-
}
206-
.left-section{
207-
width: 300px;
208-
}
209-
}
210-
@include mq('tablet', max) {
211-
.img-fun{
212-
top: -20px;
213-
}
214-
}
192+
p{
193+
position: relative;
194+
}
195+
196+
@include mq('phablet', max) {
197+
img.intro-hero{
198+
width: 80%!important;
199+
}
215200
}

src/components/footer.jsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ const Footer = () => <div>
88
<img src="img/logo.png" alt="" />
99
<p className="copyright">© 2019 Chore, a Marc Barnes Corp. | Patent Pending </p>
1010
</div>
11-
<div className="col-xs-12 col-md-2 col-md-offset-1 link-btns">
12-
<Link to="./privacy" className="list">Chore Privacy</Link>
13-
<Link to='./agreement' className="list">Terms and Conditions</Link>
14-
<Link to='./fee' className="list">Fees</Link>
11+
<div className="col-xs-12 col-md-2 col-md-offset-1 link-wrapper">
12+
<div className="link-btns">
13+
<Link to="./privacy" className="list">Chore Privacy</Link>
14+
<Link to='./agreement' className="list">Terms and Conditions</Link>
15+
</div>
1516
</div>
1617
</div>
1718
</div>

src/components/navigation.jsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ const Navigation = props => <nav id="menu" className="navbar navbar-default navb
2929
<li>
3030
<a href="/#features" className={props.isColorWhite ? "page-scroll color-white" : "page-scroll"}>How it works</a>
3131
</li>
32-
<li>
33-
<a href="/fee" className={props.isColorWhite ? "page-scroll color-white" : "page-scroll"}>Pricing</a>
34-
</li>
3532
<li>
3633
<a href="/contactus#faq" className={props.isColorWhite ? "page-scroll color-white" : "page-scroll"}>FAQ</a>
3734
</li>

0 commit comments

Comments
 (0)