diff --git a/README.md b/README.md index 706b225..80410ca 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,3 @@ -<<<<<<< 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/index.html b/index.html index 36f3356..94810a3 100644 --- a/index.html +++ b/index.html @@ -1,4 +1,3 @@ -<<<<<<< HEAD @@ -640,626 +639,3 @@

Contact Us

> -======= - - - - - - - Bootstrap demo - - - - - - - - - - - - -
- -
- - -
-
-
-
-

About Us

-

- Lorem, ipsum dolor sit amet consectetur adipisicing elit. Aliquam, - ab fuga neque harum esse eaque doloribus unde impedit iusto alias - cupiditate dolore possimus quasi magni repellendus necessitatibus - quidem accusamus qui. Lorem ipsum dolor sit amet consectetur - adipisicing elit. Dignissimos laboriosam deserunt velit, - reprehenderit, numquam inventore, explicabo assumenda est eum - consequatur iure cumque eos. Ratione, illo a maiores deleniti ea - perferendis? -

-

- Lorem, ipsum dolor sit amet consectetur adipisicing elit. Saepe, - consequuntur. Enim accusamus porro quos commodi, amet blanditiis - consectetur. Ipsum omnis unde laboriosam asperiores enim ex totam - praesentium quibusdam officiis aliquam! Lorem ipsum dolor, sit - amet consectetur adipisicing elit. Deserunt non excepturi eos - suscipit odit neque ipsum, natus molestias distinctio in? Iste - reiciendis provident nesciunt cum saepe porro aperiam rerum - tempore? -

-

- Lorem ipsum dolor sit amet consectetur adipisicing elit. Est - quaerat porro distinctio eveniet! Esse, in modi. Accusantium - veritatis laudantium, doloremque voluptatibus quo iste libero - fugiat itaque sit magni, inventore officia. Lorem ipsum dolor sit - amet consectetur adipisicing elit. Possimus ipsa assumenda - provident, atque tempora eos dolores. Animi sed ad earum inventore - provident quas eius libero obcaecati, nulla temporibus, mollitia - recusandae. -

-
-
-
-
- - -
-

Our Team

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

- Position
- Expertise -

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

- Position
- Expertise -

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

- Position
- Expertise -

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

- Position
- Expertise -

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

- Position
- Expertise -

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

- Position
- Expertise -

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

- Position
- Expertise -

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

- Position
- Expertise -

-
-
-
-
-
- - -
-

- 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

-
-
- - - - - - - - - - - - -
-
- - - - - ->>>>>>> 57ab28c (Update index.html) diff --git a/style.css b/style.css index 9b67383..e7253ad 100644 --- a/style.css +++ b/style.css @@ -1,4 +1,3 @@ -<<<<<<< HEAD body { background-color: silver; font-family: "Syne Mono", monospace; @@ -93,100 +92,3 @@ body { .footer { background-color: #940f03; } -======= -body { - background-color: silver; -} - - -.navbar -.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: 10px 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; -} ->>>>>>> ac64d2e (Update style.css)