Skip to content
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

Jump to bottom

Part1 #1

Open
wants to merge 3 commits into
base: part1
Choose a base branch
from
Open

Part1 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2019f6
Initial
brandonkhor Oct 23, 2024
90cd9af
HTML/CSS code
brandonkhor Oct 23, 2024
e71e9bb
Changes
brandonkhor Oct 30, 2024
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
47 changes: 47 additions & 0 deletions html-css-exercises/addActivity.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,51 @@
<!DOCTYPE html>
<html lang="en">
<<<<<<< HEAD
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
<link rel="stylesheet" href="styles.css">
</head>
<body>
<div id = "navbar">
<div class="title">
<a href="index.html">HackTravels</a>
</div>
<div class="navButtons">
<a href="addTrip.html">Add Trip</a>
<a href="addActivity.html">Add Activity</a>
</div>
</div>

<div class = "container">
<form class="tripForm">
<h2>Add an Activity</h2>
<p>What fun things did you do on your trip? Sky-diving? Hiking? Kayaking?</p>
<label for="trip">Choose your trip:</label>
<select id="trip" name="trip"></select>

<label for="activity">Activity</label>
<textarea id="activity" name="activity"></textarea>

<label for="rate">Rating (1-5):</label>
<select id="rate" name="rate">
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
</select>

<label for="review">Review:</label>
<textarea id="review" name="review"></textarea>

<button type="submit">Add Activity</button>
</form>
</div>
</body>
</html>
=======
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
Expand Down Expand Up @@ -47,3 +93,4 @@ <h2>Add an Activity</h2>

</body>
</html>
>>>>>>> bfea9bb2cf15f7d7f162a943b9d41bf5917f4864
2 changes: 1 addition & 1 deletion html-css-exercises/addTrip.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ <h2>Add a Trip</h2>
</div>

</body>
</html>
</html>
2 changes: 1 addition & 1 deletion html-css-exercises/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ <h3>Activities</h3>
</div>
</div>
</body>
</html>
</html>
14 changes: 14 additions & 0 deletions html-css-exercises/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,11 @@ select, input, textarea {
border: 1px solid white;
border-radius: 10px;
color: white;
<<<<<<< HEAD
font-size: 25px;
=======
font-size: 20px;
>>>>>>> bfea9bb2cf15f7d7f162a943b9d41bf5917f4864
text-decoration: none;
}

Expand All @@ -80,11 +84,21 @@ h2 {
- Add a 20px space between each trip box
*/
display: flex;
<<<<<<< HEAD

align-items: center;
justify-content: center;
margin: 0 auto;
width: 80%;
gap: 20px

=======
justify-content: center;
align-items: center;
margin: 0 auto;
width: 80%;
gap: 20px;
>>>>>>> bfea9bb2cf15f7d7f162a943b9d41bf5917f4864
}


Expand Down