Skip to content

Prahalad's addition #60

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

Open
JoshCWHQ wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Prahalad's addition #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4f83297
added team member
JoshCWHQ Jul 7, 2026
d157f15
New team member
prj316 Jul 7, 2026
06f9ed0
merged Prahalad
JoshCWHQ Jul 7, 2026
bfefa3a
test
prj316 Jul 14, 2026
409575f
inital
AhrianV Jul 25, 2026
64125dc
Added name and profile pic
JoshCWHQ Jul 25, 2026
7e0adcb
added profile picture
AhrianV Jul 25, 2026
beec9e4
added profile pic #2
AhrianV Jul 25, 2026
997c150
Merge conflict fixed
AhrianV Jul 25, 2026
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 lesson_06/img/josh.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lesson_06/img/joshcpap.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lesson_06/img/mii_01.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
121 changes: 67 additions & 54 deletions lesson_06/team.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,76 +1,89 @@
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Team page</title>
<link rel="stylesheet" href="style.css">
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Bree+Serif&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Josefin+Sans:wght@500&family=Lato&display=swap" rel="stylesheet">
</head>
<body>
<div class="container">

<div class='navbar'>
<p class="logo">Logo</p>
<a href="index.html"><p class='nav-button'>Home</p></a>
<a href="about.html"><p class='nav-button'>About</p></a>
<a href="team.html"><p class='nav-button selected'>Team</p></a>
<a href="contact.html"><p class='nav-button'>Contact</p></a>
</div>

<div class='main team'>
<h1 class="header1 header">
Team members
</h1>
<div class="team-members">
<div class="member">
<p><img class="member-pic" src="img/guido.png"></p>
<p>Guido van Rossum</p>
</div>
<div class="member">
<p><img class="member-pic" src="img/Alex_001.png"></p>
<p>John Mastercoder</p>
</div>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Team page</title>
<link rel="stylesheet" href="style.css">
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Bree+Serif&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Josefin+Sans:wght@500&family=Lato&display=swap" rel="stylesheet">
</head>

<body>
<div class="container">

<div class='navbar'>
<p class="logo">Logo</p>
<a href="index.html">
<p class='nav-button'>Home</p>
</a>
<a href="about.html">
<p class='nav-button'>About</p>
</a>
<a href="team.html">
<p class='nav-button selected'>Team</p>
</a>
<a href="contact.html">
<p class='nav-button'>Contact</p>
</a>
</div>

<div class="member">
<!-- student 01 -->
<div class='main team'>
<h1 class="header1 header">
Team members
</h1>
<div class="team-members">
<div class="member">
<p><img class="member-pic" src="img/guido.png"></p>
<p>Guido van Rossum</p>
</div>
<div class="member">
<p><img class="member-pic" src="img/Alex_001.png"></p>
<p>John Mastercoder</p>
</div>

</div>
<div class="member">
<p><img class="member-pic" src="boy_01.png"></p>
<p>Prahalad</p>
</div>

<div class="member">
<!-- student 02 -->
<div class="member">
<p><img class="member-pic" src="img/mii_01.png"></p>
<p>Ahrian</p>

</div>
</div>

<div class="member">
<!-- student 03 -->

</div>
<h2>Joshua Ennis</h2>
<img src="img/joshcpap.png" alt="I think it looks like me">

<div class="member">
<!-- student 04 -->
</div>

</div>
<div class="member">
<!-- student 04 -->

<div class="member">
<!-- student 05 -->
</div>

</div>
<div class="member">
<!-- student 05 -->

<div class="member">
<!-- student 06 -->
</div>

</div>
<div class="member">
<!-- student 06 -->

<div class="member">
<!-- student 06 -->

</div>
</div>

<div class="member">
<!-- student 06 -->

</div>


</div>

</div>
</body>
</div>
</body>

</html>
Empty file added test.html
View file
Open in desktop
Empty file.