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.

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

Bug fix #10

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 Git Intro/RandImage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions Git Intro/foo.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
def foo(x):
if x in [3, 6, 9, 12, 15, 18, 21, 24, 27, 30]:
if x % 3 == 0:
print("Foo")
else:
print("Bar")
print("Bar")
103 changes: 103 additions & 0 deletions HTML-CSS Intro/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ p {
margin-bottom: 20px;
}

.wrapper2 {
display: flex;
height: 60px;
background-color: red;
margin-bottom: 20px;
}

/*--- flex: 1 makes it so that the div takes up all available space left in the parent element ---*/

.redExample {
Expand All @@ -40,9 +47,105 @@ p {
flex-direction: row-reverse;
}

.emptyExample3 {
display: flex;
flex: 1;
flex-direction: row;
justify-content: space-between
}

.blueExample2 {
width: 80px;
background-color: blue;
}

.redExample2 {
display: flex;
justify-content: center;
align-items: center;
height: 60px;
width: 100px;
background-color: red;
}

.centerRect {
width: 35px;
height: 35px;
background-color: red;
justify-content: center;
}

.wrapper3 {
display: flex;
height: 60px;
background-color: green;
margin-bottom: 20px;
justify-content: center;
align-items: center;
}

.wrapper4 {
display: flex;
height: 60px;
background-color: red;
margin-bottom: 20px;
justify-content: space-between;
align-items: center;
}

.blueRect {
height: 60px;
width: 80px;
background-color: blue;
}

.wrapper5 {
display: flex;
height: 60px;
background-color: blue;
margin-bottom: 20px;
flex-direction: row;
justify-content: left;
align-items: center;
}

.greenCenter {
display: flex;
width: 100%;
height: 10px;
background-color: green;
}

.wrapper6 {
display: flex;
height: 60px;
background-color: green;
margin-bottom: 20px;
flex-direction: row;
justify-content: space-between;
align-items: center;
}

.yellowRect {
width: 80px; /* Adjust size as needed */
height: 60px; /* Adjust size as needed */
background-color: yellow; /* Yellow background */
}

.wrapper7 {
display: flex;
height: 60px;
background-color: yellow;
margin-bottom: 20px;
flex-direction: row;
justify-content: space-around;
align-items: center;
}

.greenRect {
width: 10px; /* Adjust size as needed */
height: 60px; /* Adjust size as needed */
background-color: green; /* Yellow background */
}

/* TODO: Add CSS for the rest of your solution below */
34 changes: 27 additions & 7 deletions HTML-CSS Intro/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<!-- TODO: Link your stylesheet -->
<link rel="stylesheet" href="index.css">
</head>
<body>
<p>Assignment 1</p>
Expand All @@ -21,24 +21,44 @@
<p>Student TODOs</p>
<p>Row 3</p>
<div class="wrapper">
<div class="emptyExample3">
<div class="redExample2"></div>
<div class="blueExample2"></div>
</div>
</div>
<p>Row 4</p>
<div class="wrapper">
<div class="wrapper2">
<div class="emptyExample2">
<div class="blueExample2"></div>
</div>
</div>
<p>Row 5</p>
<div class="wrapper">
<div class="wrapper3">
<div class = "centerRect"></div>
</div>
<p>Row 6</p>
<div class="wrapper">
<div class="wrapper4">
<div class = "blueRect"></div>
</div>
<p>Row 7</p>
<div class="wrapper">
<div class="wrapper5">
<div class = "redExample2"></div>
<div class = "greenCenter"></div>
</div>
<p>Row 8</p>
<div class="wrapper">
<div class="wrapper6">
<div class = "yellowRect"></div>
<div class = "yellowRect"></div>
<div class = "yellowRect"></div>
<div class = "yellowRect"></div>
<div class = "yellowRect"></div>
</div>
<p>Row 9</p>
<div class="wrapper">
<div class="wrapper7">
<div class = "greenRect"></div>
<div class = "greenRect"></div>
<div class = "greenRect"></div>
<div class = "greenRect"></div>
</div>
</body>
</html>