Skip to content

main into develop: equalizing branches #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lauraperroni merged 4 commits into from
Dec 26, 2025
Merged

main into develop: equalizing branches #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e03b2f
fix: adjust nav links
lauraperroni Dec 26, 2025
19adfd2
fix: img links and more
lauraperroni Dec 26, 2025
691309d
Merge pull request #1 from lauraperroni/fix/github-pages-images
lauraperroni Dec 26, 2025
6f6cba6
Merge pull request #2 from lauraperroni/release/1.0.0
lauraperroni Dec 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added img/icons/favicon.ico
View file
Open in desktop
Binary file not shown.
33 changes: 17 additions & 16 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Document</title>
<title>Devflix</title>
<link rel="stylesheet" href="style/main.css" />
<link rel="stylesheet" href="style/responsive.css" />
<link rel="stylesheet" href="style/owl/owl.theme.default.min.css" />
<link rel="stylesheet" href="style/owl/owl.carousel.min.css" />
<link rel="icon" type="image/x-icon" href="img/icons/favicon.ico">
</head>

<body>
Expand All @@ -19,12 +20,12 @@
alt="Devflix logo image"
/>
<nav>
<a href="index.html">Menu</a>
<a href="#">Courses</a>
<a href="#">Bootcamps</a>
<a href="#">Tools</a>
<a href="#">Careers</a>
<a href="#">Jobs</a>
<a href="/">Menu</a>
<a href="pages/courses.html">Courses</a>
<a href="pages/bootcamps.html">Bootcamps</a>
<a href="pages/tools.html">Tools</a>
<a href="pages/careers.html">Careers</a>
<a href="pages/jobs.html">Jobs</a>
</nav>
</div>
</header>
Expand All @@ -43,10 +44,10 @@ <h3 class="title">
</p>
<div class="buttons">
<button role="button" class="button">
<img class="icon" src="/img/icons/play.svg" />Watch now
<img class="icon" src="img/icons/play.svg" />Watch now
</button>
<button role="button" class="button">
<img class="icon" src="/img/icons/info.svg" />More info
<img class="icon" src="img/icons/info.svg" />More info
</button>
</div>
</div>
Expand All @@ -56,25 +57,25 @@ <h3 class="title">
<div class="carousel">
<div class="owl-carousel owl-theme">
<div class="item">
<img class="box-course" src="/img/couses/1.jpg" alt="" />
<img class="box-course" src="img/couses/1.jpg" alt="" />
</div>
<div class="item">
<img class="box-course" src="/img/couses/2.jpg" alt="" />
<img class="box-course" src="img/couses/2.jpg" alt="" />
</div>
<div class="item">
<img class="box-course" src="/img/couses/3.jpg" alt="" />
<img class="box-course" src="img/couses/3.jpg" alt="" />
</div>
<div class="item">
<img class="box-course" src="/img/couses/4.jpg" alt="" />
<img class="box-course" src="img/couses/4.jpg" alt="" />
</div>
<div class="item">
<img class="box-course" src="/img/couses/5.jpg" alt="" />
<img class="box-course" src="img/couses/5.jpg" alt="" />
</div>
<div class="item">
<img class="box-course" src="/img/couses/6.jpg" alt="" />
<img class="box-course" src="img/couses/6.jpg" alt="" />
</div>
<div class="item">
<img class="box-course" src="/img/couses/7.jpg" alt="" />
<img class="box-course" src="img/couses/7.jpg" alt="" />
</div>
</div>
</div>
Expand Down
41 changes: 41 additions & 0 deletions pages/bootcamps.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>Bootcamps</title>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link href="css/style.css" rel="stylesheet" />
<link rel="stylesheet" href="/style/main.css" />
<link rel="stylesheet" href="/style/responsive.css" />
<link rel="icon" type="image/x-icon" href="/img/icons/favicon.ico" />
</head>
<body>
<header>
<div class="container">
<img
class="logo"
src="/img/logos/devflix.png"
alt="Devflix logo image"
/>
<nav>
<a href="/">Menu</a>
<a href="courses.html">Courses</a>
<a href="bootcamps.html">Bootcamps</a>
<a href="tools.html">Tools</a>
<a href="careers.html">Careers</a>
<a href="jobs.html">Jobs</a>
</nav>
</div>
</header>

<main>
<div class="main-course">
<div class="container">
<h3 class="title">Bootcamps for you</h3>
</div>
</div>
</main>

<p style="justify-self: center">Under construction</p>
</body>
</html>
41 changes: 41 additions & 0 deletions pages/careers.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>Careers</title>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link href="css/style.css" rel="stylesheet" />
<link rel="stylesheet" href="/style/main.css" />
<link rel="stylesheet" href="/style/responsive.css" />
<link rel="icon" type="image/x-icon" href="/img/icons/favicon.ico" />
</head>
<body>
<header>
<div class="container">
<img
class="logo"
src="/img/logos/devflix.png"
alt="Devflix logo image"
/>
<nav>
<a href="/">Menu</a>
<a href="courses.html">Courses</a>
<a href="bootcamps.html">Bootcamps</a>
<a href="tools.html">Tools</a>
<a href="careers.html">Careers</a>
<a href="jobs.html">Jobs</a>
</nav>
</div>
</header>

<main>
<div class="main-course">
<div class="container">
<h3 class="title">Careers in tech</h3>
</div>
</div>
</main>

<p style="justify-self: center">Under construction</p>
</body>
</html>
41 changes: 41 additions & 0 deletions pages/courses.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>Courses</title>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link href="css/style.css" rel="stylesheet" />
<link rel="stylesheet" href="/style/main.css" />
<link rel="stylesheet" href="/style/responsive.css" />
<link rel="icon" type="image/x-icon" href="/img/icons/favicon.ico" />
</head>
<body>
<header>
<div class="container">
<img
class="logo"
src="/img/logos/devflix.png"
alt="Devflix logo image"
/>
<nav>
<a href="/">Menu</a>
<a href="courses.html">Courses</a>
<a href="bootcamps.html">Bootcamps</a>
<a href="tools.html">Tools</a>
<a href="careers.html">Careers</a>
<a href="jobs.html">Jobs</a>
</nav>
</div>
</header>

<main>
<div class="main-course">
<div class="container">
<h3 class="title">Courses for you</h3>
</div>
</div>
</main>

<p style="justify-self: center">Under construction</p>
</body>
</html>
41 changes: 41 additions & 0 deletions pages/jobs.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>Jobs</title>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link href="css/style.css" rel="stylesheet" />
<link rel="stylesheet" href="/style/main.css" />
<link rel="stylesheet" href="/style/responsive.css" />
<link rel="icon" type="image/x-icon" href="/img/icons/favicon.ico" />
</head>
<body>
<header>
<div class="container">
<img
class="logo"
src="/img/logos/devflix.png"
alt="Devflix logo image"
/>
<nav>
<a href="/">Menu</a>
<a href="courses.html">Courses</a>
<a href="bootcamps.html">Bootcamps</a>
<a href="tools.html">Tools</a>
<a href="careers.html">Careers</a>
<a href="jobs.html">Jobs</a>
</nav>
</div>
</header>

<main>
<div class="main-course">
<div class="container">
<h3 class="title">Browse job sites</h3>
</div>
</div>
</main>

<p style="justify-self: center">Under construction</p>
</body>
</html>
41 changes: 41 additions & 0 deletions pages/tools.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>Tools</title>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link href="css/style.css" rel="stylesheet" />
<link rel="stylesheet" href="/style/main.css" />
<link rel="stylesheet" href="/style/responsive.css" />
<link rel="icon" type="image/x-icon" href="/img/icons/favicon.ico" />
</head>
<body>
<header>
<div class="container">
<img
class="logo"
src="/img/logos/devflix.png"
alt="Devflix logo image"
/>
<nav>
<a href="/">Menu</a>
<a href="courses.html">Courses</a>
<a href="bootcamps.html">Bootcamps</a>
<a href="tools.html">Tools</a>
<a href="careers.html">Careers</a>
<a href="jobs.html">Jobs</a>
</nav>
</div>
</header>

<main>
<div class="main-course">
<div class="container">
<h3 class="title">Tools for you</h3>
</div>
</div>
</main>

<p style="justify-self: center">Under construction</p>
</body>
</html>