diff --git a/README.md b/README.md index 80410ca..706b225 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,12 @@ +<<<<<<< HEAD + # codEdu-website +<<<<<<< HEAD +======= # codEdu-website +>>>>>>> 1931c40 (Update README.md) +======= + +>>>>>>> f73008b (Update README.md) A website developed with Bootstrap, featuring the basic pages of the online coding education platform, CodeEdu. It offers a modern and user-friendly design to teach programming languages to students. + diff --git a/img/Dzelal.jpg b/img/Dzelal.jpg new file mode 100644 index 0000000..cf5de35 Binary files /dev/null and b/img/Dzelal.jpg differ diff --git a/img/imren.jpg b/img/imren.jpg new file mode 100644 index 0000000..da48140 Binary files /dev/null and b/img/imren.jpg differ diff --git a/img/nur.jpeg b/img/nur.jpeg new file mode 100644 index 0000000..afbe6de Binary files /dev/null and b/img/nur.jpeg differ diff --git a/img/team1.jpeg b/img/team1.jpeg deleted file mode 100644 index 269fd14..0000000 Binary files a/img/team1.jpeg and /dev/null differ diff --git a/img/team2.jpeg b/img/team2.jpeg deleted file mode 100644 index 201c020..0000000 Binary files a/img/team2.jpeg and /dev/null differ diff --git a/img/team3.jpeg b/img/team3.jpeg deleted file mode 100644 index c7d30a2..0000000 Binary files a/img/team3.jpeg and /dev/null differ diff --git a/img/team4.jpeg b/img/team4.jpeg deleted file mode 100644 index 95b1445..0000000 Binary files a/img/team4.jpeg and /dev/null differ diff --git a/img/team5.jpeg b/img/team5.jpeg deleted file mode 100644 index 0d39c3b..0000000 Binary files a/img/team5.jpeg and /dev/null differ diff --git a/img/team6.jpeg b/img/team6.jpeg deleted file mode 100644 index cbfa10f..0000000 Binary files a/img/team6.jpeg and /dev/null differ diff --git a/img/team7.jpeg b/img/team7.jpeg deleted file mode 100644 index 1bd0a93..0000000 Binary files a/img/team7.jpeg and /dev/null differ diff --git a/img/team8.jpeg b/img/team8.jpeg deleted file mode 100644 index d665d13..0000000 Binary files a/img/team8.jpeg and /dev/null differ diff --git a/img/wiseman.png b/img/wiseman.png new file mode 100644 index 0000000..e92332a Binary files /dev/null and b/img/wiseman.png differ diff --git a/img/yavuzahmet.jpg b/img/yavuzahmet.jpg new file mode 100644 index 0000000..3948add Binary files /dev/null and b/img/yavuzahmet.jpg differ diff --git a/img/zbahar.png b/img/zbahar.png new file mode 100644 index 0000000..82ef1ac Binary files /dev/null and b/img/zbahar.png differ diff --git a/index.html b/index.html index 8863a92..36f3356 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,649 @@ +<<<<<<< HEAD + + + + + + Bootstrap demo + + + + + + + + + + + + + + + +
+ +
+ + +
+
+
+
+

About Us

+

+ Welcome to CodEdu Collective, a community-driven organization + founded to inspire, collaborate, and create innovative solutions + in the tech world. We are a group of passionate developers united + by the desire to share knowledge, learn together, and push the + boundaries of technology. Our diverse skill sets and collective + experience allow us to tackle challenges with creativity and + purpose. +

+
+

Meet Our Team

+
    +
  • + Dzelal
    + A dedicated Fullstack Developer with a strong foundation in + JavaScript and a passion for problem-solving. Celal's focus on + clean code and efficient solutions makes him a valuable asset + to any project. +
    • +
  • + Nur
    + A detail-oriented and driven developer, Nur brings fresh + perspectives to coding challenges. With a commitment to + continuous learning, she excels at turning ideas into reality. +
    • +
  • + wiseweb-works
    + A creative problem-solver with expertise in web development. + Known for their innovative mindset and practical approach, + they bridge the gap between functionality and design. +
    • +
  • + yavuzahmet1
    + A forward-thinking developer with a knack for building + scalable and efficient applications. Yavuz is always ready to + explore new technologies and drive progress. +
    • +
  • + Zbaharyilmaz
    + An ambitious and motivated developer who thrives on + collaboration. Zbaharyilmaz is passionate about leveraging + code to create meaningful and impactful projects. +
    • +
  • + İmrenR
    + A curious and enthusiastic developer eager to expand her + knowledge. İmren combines creativity with a methodical + approach to achieve remarkable results. +
    • +
+
+

+ At CodEdu Collective, we believe in the power of community, + continuous improvement, and the limitless potential of technology. + Together, we aim to make a lasting impact while inspiring others + to join us on this journey. Let’s code, create, and collaborate! +

+
+
+
+
+ + +
+

Our Team

+
+
+
+ ... +
+
Dzelal
+

+ Solution-Focused
+ Developer +

+
+
+
+
+
+ ... +
+
Nur
+

+ Detail-Oriented
+ Coder +

+
+
+
+
+
+ ... +
+
wiseweb-works
+

+ Creative Problem
+ Solver +

+
+
+
+
+
+ ... +
+
yavuzahmet1
+

+ Forward-Thinking
+ Programmer +

+
+
+
+
+
+ ... +
+
Zbaharyilmaz
+

+ Ambitious Team
+ Player +

+
+
+
+
+
+ ... +
+
İmrenR
+

+ Curious and
+ Enthusiastic +

+
+
+
+
+
+ + +
+

+ Student Opinions +

+ +
+
+
+
+
+ ... +
+
+
+
Name - Surname
+

+ Lorem ipsum dolor sit amet consectetur adipisicing elit. +

+
+
+
+
+
+ +
+
+
+
+ ... +
+
+
+
Name - Surname
+

+ Lorem ipsum dolor sit amet consectetur adipisicing elit. +

+
+
+
+
+
+ +
+
+
+
+ ... +
+
+
+
Name - Surname
+

+ Lorem ipsum dolor sit amet consectetur adipisicing elit. +

+
+
+
+
+
+ +
+
+
+
+ ... +
+
+
+
Name - Surname
+

+ Lorem ipsum dolor sit amet consectetur adipisicing elit. +

+
+
+
+
+
+ +
+
+
+
+ ... +
+
+
+
Name - Surname
+

+ Lorem ipsum dolor sit amet consectetur adipisicing elit. +

+
+
+
+
+
+ +
+
+
+
+ ... +
+
+
+
Name - Surname
+

+ Lorem ipsum dolor sit amet consectetur adipisicing elit. +

+
+
+
+
+
+
+
+ + +
+

Courses

+
+
+
+ ... +
+
+
+
+ ... +
+
+
+
+ ... +
+
+
+
+ ... +
+
+
+
+ ... +
+
+
+
+ ... +
+
+
+
+ + +
+

Contact Us

+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+
+ + +
+
+ + cod<E>du + +
+
+

All Rights Reserved © | 2024

+

Designed by Djelal

+
+
+ + + + + + + + + + + + +
+
+ + + + + +======= + @@ -618,3 +1262,4 @@

Contact Us

> +>>>>>>> 57ab28c (Update index.html) diff --git a/style.css b/style.css index b8d42eb..9b67383 100644 --- a/style.css +++ b/style.css @@ -1,7 +1,105 @@ +<<<<<<< HEAD +body { + background-color: silver; + font-family: "Syne Mono", monospace; +} + +.navbarLinks { + background-color: #940f03; + color: white; +} + +.container { + width: 70%; + margin: 0 auto; + padding: 0; +} + +.sliderImg { + height: 80vh; + object-fit: cover; +} + +.container2 { + background-color: #171c21; + width: 70%; + min-height: 100vh; + margin: 0 auto; + padding: 0; +} + +.container3 { + background-color: #940f03; + width: 70%; + min-height: 100vh; + margin: 0 auto; + padding: 20px 20px; +} + +.teamCard { + max-width: 200px; + max-height: 300px; +} + +.teamCard:hover { + opacity: 0.5; + cursor: pointer; +} + +.container4 { + background-color: #171c21; + width: 70%; + min-height: 100vh; + margin: 0 auto; + padding: 10px 20px; +} + +.cardStd { + width: 100%; /* Esnek genişlik */ + max-width: 250px; /* Maksimum genişlik */ + min-height: 100px; /* Maksimum yükseklik */ +} + +.cardbg { + background-color: #940f03; + cursor: pointer; + /* padding: 5px; */ +} + +.container5 { + background-color: #940f03; + width: 70%; + min-height: 100vh; + margin: 0 auto; + padding: 10px 20px; +} + +.cardCourse { + cursor: pointer; +} + +.cardCourse:hover { + opacity: 0.5; +} + +.container6 { + background-color: #171c21; + width: 70%; + min-height: 100vh; + margin: 0 auto; + padding: 10px 20px; +} + +.footer { + background-color: #940f03; +} +======= body { background-color: silver; } + +.navbar .navbarLinks { background-color: #940f03; color: white; @@ -91,3 +189,4 @@ body { .footer { background-color: #940f03; } +>>>>>>> ac64d2e (Update style.css)