Skip to content

Commit bf23d7c

Browse files
committed
adding motion to logo in home,task
1 parent f6fdd77 commit bf23d7c

19 files changed

+133
-37
lines changed

src/App.css

+11-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
padding: 0;
3535
margin: 0;
3636
scroll-behavior: smooth;
37-
text-align: center;
3837
}
3938

4039
body {
@@ -74,6 +73,7 @@ h1,
7473
/* ------------------ */
7574
.btn-gradient,
7675
.btn-green {
76+
text-align: center;
7777
font-size: 1.2rem;
7878
padding: 0.4rem 1rem;
7979
cursor: pointer;
@@ -205,9 +205,17 @@ h1,
205205
/* .section-padding {
206206
padding: 4rem 2rem;
207207
}
208-
209-
210208
.section-margin {
211209
margin: 1rem;
212210
}*/
211+
section h1 {
212+
font-size: 1.4rem;
213+
}
214+
}
215+
@media screen and (max-width: 330px) {
216+
.btn-gradient,
217+
.btn-green {
218+
font-size: 1rem;
219+
padding: 0.2rem 0.4rem;
220+
}
213221
}

src/assest/logoOnMan.png

11.2 KB
Loading

src/assest/logoOnTask.png

20.7 KB
Loading

src/assest/man.png

63.1 KB
Loading

src/assest/manBackground.png

40.3 KB
Loading

src/assest/taskBack.png

90.1 KB
Loading

src/assest/winners/mohamedSaid.jpg

43.7 KB
Loading

src/assest/winners/yousefTarek.jpg

42.9 KB
Loading

src/component/about/About.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const About = () => {
1212
}, []);
1313
return (
1414
<div className="about" id="about">
15-
<div className="about-container">
15+
<section className="about-container">
1616
<h1>عن المسابقة</h1>
1717
<div className="about-items">
1818
<div
@@ -91,7 +91,7 @@ const About = () => {
9191
</div>
9292
</div>
9393
</div>
94-
</div>
94+
</section>
9595
</div>
9696
);
9797
};

src/component/about/about.css

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
.about {
22
background: var(--color-bg);
33
/* height: 100vh; */
4-
padding: 3rem;
5-
margin: 2rem 0;
4+
/* padding: 3rem; */
5+
/* margin: 2rem 0; */
66
}
77
.about-container h1 {
88
font-size: 2rem;
@@ -71,8 +71,8 @@
7171
flex-direction: row-reverse;
7272
} */
7373
}
74-
@media screen and (max-width: 600px) {
74+
/* @media screen and (max-width: 600px) {
7575
.about {
7676
padding: 2rem;
7777
}
78-
}
78+
} */

src/component/home/Home.css

+37-3
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,25 @@
2929
font-size: 1rem;
3030
color: var(--color-one);
3131
}
32-
33-
.home-img img {
32+
.home-img {
33+
display: flex;
34+
align-items: center;
35+
justify-content: center;
36+
}
37+
.home-img-background {
3438
width: 100%;
3539
height: 70vh;
40+
position: relative;
41+
}
42+
.home-img-man {
43+
position: absolute;
44+
width: 100%;
45+
}
46+
.home-img-logo {
47+
position: absolute;
48+
width: 100%;
49+
animation: vibrate-1 1.5s linear infinite both;
3650
}
37-
3851
.home-content-buttons {
3952
margin-top: 2rem;
4053
display: flex;
@@ -46,6 +59,27 @@
4659
margin-top: 3rem;
4760
}
4861

62+
@keyframes vibrate-1 {
63+
0% {
64+
transform: translate(0);
65+
}
66+
20% {
67+
transform: translate(-2px, 2px);
68+
}
69+
40% {
70+
transform: translate(-2px, -2px);
71+
}
72+
60% {
73+
transform: translate(2px, 2px);
74+
}
75+
80% {
76+
transform: translate(2px, -2px);
77+
}
78+
100% {
79+
transform: translate(0);
80+
}
81+
}
82+
4983
@media screen and (max-width: 1100px) {
5084
.home-content h1 {
5185
font-size: 2rem;

src/component/home/Home.jsx

+24-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import React, { useEffect } from "react";
22
import AOS from "aos";
33
import "aos/dist/aos.css";
44
import "./Home.css";
5-
import banner from "../../assest/banner.png";
5+
import manBackground from "../../assest/manBackground.png";
6+
import man from "../../assest/man.png";
7+
import logoOnMan from "../../assest/logoOnMan.png";
68

79
const Home = () => {
810
useEffect(() => {
@@ -33,8 +35,27 @@ const Home = () => {
3335
</a>
3436
</div>
3537
</div>
36-
<div data-aos="fade-right" className="home-img">
37-
<img src={banner} alt="banner of home page" />
38+
39+
<div className="home-img" data-aos="fade-up">
40+
<img
41+
className="home-img-background"
42+
src={manBackground}
43+
alt="background of man"
44+
data-aos="fade-down"
45+
data-aos-duration="3000"
46+
/>
47+
<img
48+
className="home-img-man"
49+
src={man}
50+
alt="man writing on computer "
51+
data-aos="fade-right"
52+
/>
53+
<img
54+
className="home-img-logo"
55+
src={logoOnMan}
56+
alt="logo"
57+
data-aos="fade-left"
58+
/>
3859
</div>
3960
</div>
4061
);

src/component/navbar/Navbar.jsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React, { useState } from "react";
22
import { RiMenu3Line, RiCloseLine } from "react-icons/ri";
3+
import { Link } from "react-router-dom";
34
import logo from "../../assest/logo.png";
45
import "./navbar.css";
56

@@ -34,9 +35,9 @@ const Navbar = () => {
3435
<div className="navbar">
3536
<div className="navbar-links">
3637
<div className="navbar-links-logo">
37-
<a href="#">
38+
<Link to="/kalbonyanElmarsosWebsite">
3839
<img src={logo} alt="logo" />
39-
</a>
40+
</Link>
4041
</div>
4142
<div className="navbar-links-container">
4243
<Menu />

src/component/tasks/Tasks.jsx

+18-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import React, { useEffect } from "react";
22
import AOS from "aos";
33
import "aos/dist/aos.css";
44
import "./tasks.css";
5-
import tasks from "../../assest/tasks.png";
5+
import taskBack from "../../assest/taskBack.png";
6+
import logoOnTask from "../../assest/logoOnTask.png";
67

78
const Tasks = () => {
89
useEffect(() => {
@@ -12,11 +13,22 @@ const Tasks = () => {
1213
<section className="tasks" id="tasks">
1314
<h1>تسليمات المسابقة</h1>
1415
<div className="tasks-contents">
15-
<img
16-
src={tasks}
17-
alt="hands of someone writing on computer"
18-
data-aos="fade-left"
19-
/>
16+
<div className="tasks-contents-images">
17+
<img
18+
src={taskBack}
19+
alt="hands of someone writing on computer"
20+
data-aos="fade-left"
21+
className="tasks-contents-images-task"
22+
/>
23+
<img
24+
src={logoOnTask}
25+
alt="logo"
26+
className="tasks-contents-images-logo"
27+
data-aos="fade-down"
28+
data-aos-easing="linear"
29+
data-aos-duration="1500"
30+
/>
31+
</div>
2032
<div className="tasks-contents-content">
2133
<ol data-aos="fade-up">
2234
<li>عشر شهادات من Linkedin Learning .</li>

src/component/tasks/tasks.css

+24-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
.tasks-contents {
22
display: flex;
33
align-items: flex-start;
4-
gap: 3rem;
4+
margin-top: 4rem;
5+
/* gap: 3rem; */
56
}
67

78
.tasks-contents-content {
@@ -12,13 +13,29 @@
1213
box-shadow: var(--box-shadow);
1314
background: var(--color-white);
1415
border-top: 5px solid var(--color-two);
16+
flex: 1.1;
1517
}
1618

17-
.tasks-contents img {
19+
/* .tasks-contents img {
1820
width: 40%;
1921
height: 100%;
22+
} */
23+
.tasks-contents-images {
24+
flex: 1;
25+
display: flex;
26+
align-items: center;
27+
justify-content: center;
2028
}
2129

30+
.tasks-contents-images-task {
31+
position: relative;
32+
width: 60%;
33+
/* height: 100%; */
34+
}
35+
.tasks-contents-images-logo {
36+
position: absolute;
37+
width: 30%;
38+
}
2239
.tasks-contents-content ol li {
2340
margin-bottom: 0.5rem;
2441
font-size: 1.2rem;
@@ -67,20 +84,21 @@
6784
gap: 1rem;
6885
}
6986

70-
@media screen and (max-width: 1050px) {
87+
/* @media screen and (max-width: 1050px) {
7188
.tasks-contents img {
7289
width: 30%;
7390
}
74-
}
91+
} */
7592
@media screen and (max-width: 950px) {
76-
.tasks-contents img {
77-
width: 50%;
93+
.tasks-contents-images-task {
94+
width: 40%;
7895
}
7996
.tasks-contents {
8097
flex-direction: column;
8198
align-items: center;
8299
gap: 1rem;
83100
margin-bottom: 2rem;
101+
margin-top: 0;
84102
}
85103

86104
.tasks-contents-content ol li {

src/component/winners/Winners.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ const Winners = () => {
1414
<section className="winners" id="winner">
1515
{/* <h1>الفائزون بالمسابقة</h1> */}
1616
<img src={winners} alt=" winners" data-aos="fade-left" />
17+
1718
<Link
1819
className="btn-gradient winners-link"
1920
to="/kalbonyanElmarsosWebsite/winners"
20-
data-aos="fade-up"
2121
>
22-
<p>الذهاب إلي الفائزين والخريجين من المسابقة</p>
22+
<p data-aos="fade-up">الذهاب إلي الفائزين والخريجين من المسابقة</p>
2323
<TbArrowBigLeftLines className="winners-arrow-icon" />
2424
</Link>
2525
</section>

src/tools/card/Card.jsx

+6-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ const Card = ({ title, award, className }) => {
99
AOS.init();
1010
}, []);
1111
return (
12-
<div className={`card ${className}`} data-aos="fade-up">
13-
<FaAward className="card-icon" />
14-
<h4>{title}</h4>
15-
<p>{award} </p>
12+
<div data-aos="fade-up">
13+
<div className={`card ${className}`}>
14+
<FaAward className="card-icon" />
15+
<h4>{title}</h4>
16+
<p>{award} </p>
17+
</div>
1618
</div>
1719
);
1820
};

src/tools/cardWinners/CardWinners.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const CardWinners = ({ image, name, linkedInLink }) => {
1010
}, []);
1111
return (
1212
<div className="CardWinners" data-aos="fade-up">
13-
<img src={image} alt={name} />
13+
<img src={image} alt={name} loading="lazy" />
1414
<p>{name}</p>
1515
<a href={linkedInLink} target="_blank" rel="noreferrer">
1616
<BsLinkedin />

src/tools/scrollTop/scrolltop.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
animation: shake-vertical 7s ease-out infinite both;
77
}
88
.scroll:hover {
9-
background-color: var(--color-two);
9+
background-color: var(--color-two) !important;
1010
}
1111
.up-icon {
1212
color: var(--color-white);

0 commit comments

Comments
 (0)