Skip to content

web dev friday 6pm - Justin Chen - updated #113

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
justinyc1 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

web dev friday 6pm - Justin Chen - updated #113

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
e9747e3
back up
justinyc1 Sep 17, 2024
16c1c72
styling adjustments to index.html and alternating.html
justinyc1 Sep 21, 2024
1e66bf6
modified pull request template
justinyc1 Sep 21, 2024
761c601
updated mobile view for alternating.html
justinyc1 Sep 21, 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
6 changes: 3 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ TITLE: Include your section in the pull request title
- [ ] Wednesday
- [ ] Thursday
- [ ] Friday 3pm
- [ ] Friday 6pm
- [x] Friday 6pm

**Is the solution complete?**

[Yes/No]
[Yes]

**Did you run into any problems?**

[Describe...]
[No]

**Did you collaborate with others on this solution?**

Expand Down
61 changes: 47 additions & 14 deletions alternating.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,60 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Cookie Store</title>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
</head>
<body>
<main>
<h2>Our Cookies</h2>
<p>Checkout our latest and delicious cookies.</p>

<div class="text-center mt-5">
<h2>Our Cookies</h2>
<p>Checkout our latest and delicious cookies.</p>
</div>

<h3>Mint Chocolate</h3>
<p>Tasty mint chocolate cookies</p>
<img src="images/mint-cookie.png" alt="A single mint chocolate cookie" />
<div>

<h3>Peanut Butter</h3>
<p>Yummy peanut buttery goodness</p>
<img src="images/peanut-cookie.png" alt="A single peanut butter cookie" />
<div class="row mt-5 align-items-center">
<div class="col-md-5 order-md-2 text-center">
<h3 >Mint Chocolate</h3>
<p>Tasty mint chocolate cookies</p>
</div>
<div class="col-md-3 order-md-1 offset-md-2">
<img src="images/mint-cookie.png" alt="A single mint chocolate cookie" class="d-block mx-auto rounded-circle img-fluid"/>
</div>
</div>

<h3>Oatmeal</h3>
<p>Your fitness instructors favorite</p>
<img src="images/oatmeal-cookie.png" alt="A single oatmeal cookie" />
<div class="row mt-5 align-items-center">
<div class="col-md-5 order-md-1 offset-md-2 text-center">
<h3>Peanut Butter</h3>
<p>Yummy peanut buttery goodness</p>
</div>
<div class="col-md-3 order-md-2">
<img src="images/peanut-cookie.png" alt="A single peanut butter cookie" class="d-block mx-auto rounded-circle img-fluid"/>
</div>
</div>

<div class="row mt-5 align-items-center">
<div class="col-md-5 order-md-2 text-center">
<h3>Oatmeal</h3>
<p>Your fitness instructors favorite</p>
</div>
<div class="col-md-3 order-md-1 offset-md-2">
<img src="images/oatmeal-cookie.png" alt="A single oatmeal cookie" class="d-block mx-auto rounded-circle img-fluid"/>
</div>
</div>

<div class="row mt-5 align-items-center">
<div class="col-md-5 order-md-1 offset-md-2 text-center">
<h3>Chocolate Chip</h3>
<p>Gooey chocolate you'll love</p>
</div>
<div class="col-md-3 order-md-2">
<img src="images/chip-cookie.png" alt="A single chocolate chip cookie" class="d-block mx-auto rounded-circle img-fluid"/>
</div>
</div>

</div>

<h3>Chocolate Chip</h3>
<p>Gooey chocolate you'll love</p>
<img src="images/chip-cookie.png" alt="A single chocolate chip cookie" />
</main>
</body>
</html>
53 changes: 53 additions & 0 deletions css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,54 @@
/* Add custom css styles here */
body.center {
text-align: center;
}

main {
margin: 50px auto;
}

header {
height: 400px;
background-size: cover;
background-image: url('./../images/coffee-biscuits.jpg');

}

.in-header {
background-color: rgba(0, 0, 0, 50%);
border-radius: 20px;
color: rgb(200, 200, 200);
display: inline-block;
padding: 10px;
margin-top: 125px;
}

.in-header h1 {
font-weight: 350;
}

.in-header p {
font-size: 20px;
font-weight: 350;
}

.img-fluid {
border-radius: 100%;
}

.about-us {
background-color: rgb(240, 240, 240);
padding: 30px;
}

.baker {
height: 100px;
float: left;
border-radius: 100%;
}

footer {
background-color: rgb(60, 112, 255);
padding: 40px;
color: white;
}
104 changes: 69 additions & 35 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,87 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Cookie Store</title>
<link href='css/styles.css' rel='stylesheet'>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
</head>
<body>
<header>
<h1>Cookie Store</h1>
<p>Buy our awesome cookies. All proceeds go to charity!</p>
<header class="text-center">
<div class="w-50 in-header">
<h1>Cookie Store</h1>
<p>Buy our awesome cookies. All proceeds go to charity!</p>
</div>
</header>

<main>
<h2>Our Cookies</h2>
<p>Checkout our latest and delicious cookies.</p>

<h3>Mint Chocolate</h3>
<p>Tasty mint chocolate cookies</p>
<img src="images/mint-cookie.png" alt="A single mint chocolate cookie" />

<h3>Peanut Butter</h3>
<p>Yummy peanut buttery goodness</p>
<img src="images/peanut-cookie.png" alt="A single peanut butter cookie" />
<div class="text-center">
<h2>Our Cookies</h2>
<p>Checkout our latest and delicious cookies.</p>
</div>

<h3>Oatmeal</h3>
<p>Your fitness instructors favorite</p>
<img src="images/oatmeal-cookie.png" alt="A single oatmeal cookie" />
<div class="container text-center">
<div class="row">
<div class="col-12 col-md-6 col-lg-3">
<h3>Mint Chocolate</h3>
<p>Tasty mint chocolate cookies</p>
<img src="images/mint-cookie.png" class="img-fluid" alt="A single mint chocolate cookie" />
</div>
<div class="col-12 col-md-6 col-lg-3">
<h3>Peanut Butter</h3>
<p>Yummy peanut buttery goodness</p>
<img src="images/peanut-cookie.png" class="img-fluid" alt="A single peanut butter cookie" />
</div>
<div class="col-12 col-md-6 col-lg-3">
<h3>Oatmeal</h3>
<p>Your fitness instructors favorite</p>
<img src="images/oatmeal-cookie.png" class="img-fluid" alt="A single oatmeal cookie" />
</div>
<div class="col-12 col-md-6 col-lg-3">
<h3>Chocolate Chip</h3>
<p>Gooey chocolate you'll love</p>
<img src="images/chip-cookie.png" class="img-fluid" alt="A single chocolate chip cookie" />
</div>
</div>
</div>

<h3>Chocolate Chip</h3>
<p>Gooey chocolate you'll love</p>
<img src="images/chip-cookie.png" alt="A single chocolate chip cookie" />
</main>
<div>
<h2>About us</h2>

<img src="images/bakers.svg" alt="illustrations of two people baking" />

<div class="about-us text-center">
<div>
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint
occaecat cupidatat non proident, sunt in culpa qui officia deserunt
mollit anim id est laborum.
<h2>About us</h2>
<div class="row">
<div class="col-3 col-lg-2">
<img src="images/bakers.svg" class='baker' alt="illustrations of two people baking" />
</div>
<div class="text-start col-9 col-lg-10">
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint
occaecat cupidatat non proident, sunt in culpa qui officia deserunt
mollit anim id est laborum.
</div>
</div>
</div>
</div>

<footer>
<h2>Contact us</h2>
<div>
100 Broadway Avenue,<br />
New York, NY 10001 <br />
(212) 555-1234
<div class="container text-center">
<div class="row">
<div class="col">

</div>
<div class="col-12 col-md-6 col-lg-4">
<h2>Contact us</h2>
<div>
100 Broadway Avenue,<br />
New York, NY 10001 <br />
(212) 555-1234
</div>
</div>
<div class="col">
</div>
</div>
</div>
</footer>
</body>
Expand Down