Skip to content

Commit 29d4993

Browse files
jellywisegracejellywisegrace
committed
Merge remote-tracking branch 'origin/main' into jelly
2 parents 194bae8 + dda6aa8 commit 29d4993

File tree

8 files changed

+140
-41
lines changed

8 files changed

+140
-41
lines changed

‎2024/BeaBergst/IMG_5308.jpg

117 KB
Loading

‎2024/BeaBergst/index.html

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ <h1>Bea Bergst</h1>
1919
<!-- Hi there these are the wordle and connections https://www.nytimes.com/games/wordle/index.html https://www.nytimes.com/games/connections -->
2020
<section>
2121
<h2>Hi </h2>
22+
<img src="/2024/BeaBergst/IMG_5308.jpg"/>
2223
<p></p>
2324
</section>
2425
</main>

‎2024/ColeStinson/IMG_20240520_153239.jpg

131 KB
Loading

‎2024/ColeStinson/index.html

+18-6
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
</head>
4242
<body>
4343
<div class="container">
44-
<h1>Cole's Bio</h1>
45-
<p>Hello! My name is <strong>Cole</strong>, about me MR. MISHKIN IS G.O.A.T HE IS AMAZING.</p>
44+
<h1>Cole's Bio MR. MISHKIN IS THE BEST </h1>
45+
<p>Hello! My name is <strong>Cole</strong>, and I'm thrilled to share a bit about myself.</p>
4646
<h2>About Me</h2>
4747
<ul>
4848
<li><strong>Grade:</strong> 7th grade</li>
@@ -54,9 +54,21 @@ <h2>About Me</h2>
5454
</ul>
5555
</li>
5656
</ul>
57-
<img src="./IMG_20240422_150422.jpg" alt="Cole's Photo">
57+
<img src="/2024/ColeStinson/IMG_20240520_153239.jpg" alt="Cole's Photo">
5858
<p>Let's play! Check out this awesome game:</p>
5959
<a href="./ponggame.html" class="game-button">Play the Awesome Game!</a>
60-
</div>
61-
</body>
62-
</html>
60+
<!-- Add the provided iframe here -->
61+
<iframe width="110" height="200" src="https://www.myinstants.com/instant/discord-notification-38119/embed/" frameborder="0" scrolling="no"></iframe>
62+
<iframe width="110" height="200" src="https://www.myinstants.com/instant/taco-bell-bong-42481/embed/" frameborder="0" scrolling="no"></iframe>
63+
<iframe width="110" height="200" src="https://www.myinstants.com/instant/nfl-bass-boosted-79045/embed/" frameborder="0" scrolling="no"></iframe>
64+
<iframe width="110" height="200" src="https://www.myinstants.com/instant/iphone-notification-71441/embed/" frameborder="0" scrolling="no"></iframe>
65+
<iframe width="110" height="200" src="https://www.myinstants.com/instant/iphone-ringtone-72544/embed/" frameborder="0" scrolling="no"></iframe>
66+
<iframe width="110" height="200" src="https://www.myinstants.com/instant/iphone-sent-message/embed/" frameborder="0" scrolling="no"></iframe>
67+
<iframe width="110" height="200" src="https://www.myinstants.com/instant/iphone-camera-shutter-fast-83107/embed/" frameborder="0" scrolling="no"></iframe>
68+
<iframe width="110" height="200" src="https://www.myinstants.com/instant/scream-meme-11955/embed/" frameborder="0" scrolling="no"></iframe>
69+
<iframe width="110" height="200" src="https://www.myinstants.com/instant/mario-kart-wii-theme-song/embed/" frameborder="0" scrolling="no"></iframe>
70+
<iframe width="110" height="200" src="https://www.myinstants.com/instant/womp-womp-56634/embed/" frameborder="0" scrolling="no"></iframe>
71+
<iframe width="110" height="200" src="https://www.myinstants.com/instant/samsung-spaceline-notification-60280/embed/" frameborder="0" scrolling="no"></iframe>
72+
</div
73+
</html>
74+

‎2024/KurtisCollins/index.html

+14-4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,18 @@
99
</head>
1010
<body>
1111

12+
13+
<div class="cover-image">
14+
<a class="FBILogo" href="https://fbi.gov" target="_blank"></a>
15+
<a class="DOJLogo" href="https://justice.gov" target="_blank"></a>
16+
<a class="NCALogo" href="https://www.nationalcrimeagency.gov.uk/" target="_blank"></a>
17+
<a class="DCISLogo" href="https://www.dodig.mil/Components/DCIS/" target="_blank"></a>
18+
<a class="POLITIELogo" href="https://www.politie.nl/en" target="_blank"></a>
19+
20+
</div>
21+
22+
23+
1224
<header class="header-container">
1325
<div class="logo" id="logo">Kurtis Collins</div>
1426
<nav class="navigation">
@@ -34,7 +46,7 @@
3446
<div class="item__info">
3547
<!--p class="item__year"><span>Happy Little Accidents</span></p-->
3648
<p class="item__name"><span>Happy Little Accidents</span></p>
37-
<a href="http://happylittleaccidents.net:1111/" class="btn"><span>Discover more</span></a>
49+
<a href="https://gpcs.live" class="btn"><span>Discover more</span></a>
3850
</div>
3951
</div>
4052

@@ -57,9 +69,7 @@ <h2>Graduation Countdown</h2>
5769
<div id="countdown"></div>
5870
</section>
5971

60-
<div class="cover-image">
61-
<img src="Images/seized.png" alt="Cover Image"/>
62-
</div>
72+
6373

6474
</body>
6575
</html>

‎2024/KurtisCollins/styles.css

+58-9
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,67 @@
11

22
/*Seized*/
33
.cover-image {
4-
position: fixed;
5-
top: 0;
6-
left: 0;
7-
width: 100%;
4+
/* Full height and width */
5+
background-image: url("Images/seized.png");
6+
background-size: contain;
87
height: 100%;
9-
z-index: 9999; /* Ensure the image is above other elements */
8+
width: 100%;
9+
background-position: center;
10+
background-repeat: no-repeat;
11+
background-color: black;
12+
margin: 0;
13+
padding: 0;
14+
overflow: hidden;
15+
position: fixed;
16+
display: flex;
17+
justify-content: center;
18+
align-items: center;
19+
z-index: 9999;
1020
}
1121

12-
.cover-image img {
13-
width: 100%;
14-
height: 100%;
15-
object-fit: cover; /* Ensure the image covers the entire area */
22+
.FBILogo {
23+
position: fixed;
24+
top: 47.5%;
25+
left: 43%;
26+
width: 14vw;
27+
height: 14vw;
28+
border-radius: 50%;
29+
z-index: 101;
30+
}
31+
.DOJLogo {
32+
position: fixed;
33+
top: 62%;
34+
left: 29%;
35+
width: 8vw;
36+
height: 8vw;
37+
border-radius: 50%;
38+
z-index: 101;
39+
}
40+
.NCALogo {
41+
position: fixed;
42+
top: 62%;
43+
left: 66%;
44+
width: 8vw;
45+
height: 8vw;
46+
border-radius: 50%;
47+
z-index: 101;
48+
}
49+
50+
.DCISLogo {
51+
position: fixed;
52+
top: 42%;
53+
left: 27%;
54+
width: 10vw;
55+
height: 5vw;
56+
z-index: 101;
57+
}
58+
.POLITIELogo {
59+
position: fixed;
60+
top: 42%;
61+
left: 63%;
62+
width: 14vw;
63+
height: 5vw;
64+
z-index: 101;
1665
}
1766

1867
/* Header */

‎2024/MichelleAchuba/index.html

+23-21
Original file line numberDiff line numberDiff line change
@@ -3,58 +3,60 @@
33
<head>
44
<meta charset="UTF-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6-
<title>Michelle - Personal Website</title>
6+
<title>Michelle's Delulu Pookie Kingdom</title>
77
<link rel="stylesheet" href="styles.css">
88
</head>
99
<body>
10-
<audio autoplay loop>
11-
<source src="https://www.youtube.com/embed/k3alCp0VGH4" type="audio/mp3">
12-
Your browser does not support the audio element.
13-
</audio>
14-
1510
<header>
1611
<div class="container">
17-
<h1>Michelle</h1>
18-
<p>Number one rizzler | Video Enthusiast | Roblox Player</p>
12+
<h1>Welcome to My Delulu Kingdom</h1>
13+
<p>Number 1 Rizzler | Roblox Player | Kpop Stan</p>
1914
</div>
2015
</header>
2116

22-
<section class="about">
17+
18+
<section class="photo">
2319
<div class="container">
24-
<h2>HEY POOKIES</h2>
25-
<p>I LUV POOKIES </p>
26-
<!-- Add more content as needed -->
20+
<h2>Me and My Pookie</h2>
21+
<img src="https://mail.google.com/mail/u/0?ui=2&ik=2c3177b249&attid=0.1&permmsgid=msg-f:1797065920596156700&th=18f075eefb18211c&view=att&disp=safe" alt="User's Photo">
2722
</div>
2823
</section>
2924

3025
<section class="youtube">
3126
<div class="container">
32-
<h2>YouTube Picks</h2>
33-
<!-- Add YouTube video embed code here -->
34-
<div class="youtube-embed">
35-
<iframe width="100%" height="400px" src="https://www.youtube.com/embed/CtpdMkKvB6U" frameborder="0" allowfullscreen></iframe>
27+
<h2>Featured YouTube Video</h2>
28+
<div class="video-container">
29+
<iframe width="560" height="315" src="https://www.youtube.com/embed/CtpdMkKvB6U" frameborder="0" allowfullscreen></iframe>
3630
</div>
3731
</div>
3832
</section>
3933

4034
<section class="roblox">
4135
<div class="container">
42-
<h2>Roblox Game</h2>
43-
<!-- Add link to Roblox game here -->
44-
<a href="https://www.roblox.com/" target="_blank">Play Roblox Game</a>
36+
<h2>Play My Roblox Game</h2>
37+
<a href="https://www.roblox.com/" target="_blank" class="roblox-link">Play Now</a>
4538
</div>
4639
</section>
4740

4841
<section class="roblox-friend">
4942
<div class="container">
5043
<h2>Friend Me on Roblox and Give Me Robux!</h2>
44+
<p>Roblox Username: Mimiheart247i</p>
5145
</div>
5246
</section>
47+
<p>STAN STRAY KIDS!!! omg! THIS HAS AWAKENEDD MY ALFA POWERS!! 🐺🐺🐺🐺🐺🐺⛓️⛓️⛓️⛓️⛓️🥀🥀🥀🥀 *tunrs itno alpha demon hybrid*AWOWOOOOOO!!!!’ I AM TBE SIGMA MALE AND I WIL AVENGE MY KITTEN?!!;’wnwajwwj” “OMG!” *sees volumptuous gyatt* “WILL U BE MY NEW E KITTEN?!” “yes pookie princess i will!” AWOOOOOOOOOOOOOOOOOOOOOOOOOO!!!!!!!! 🥀🥀🥀⛓️⛓️⛓️⛓️🐺🐺🐺🐺🐺🌑🌑🌑🌑:</p>
48+
<ul>
49+
<li><a href="https://www.youtube.com/channel/UC9rMiEjNaCSsebs31MRDCRA">YouTube</a></li>
50+
<li><a href="https://twitter.com/Stray_Kids">Twitter</a></li>
51+
<li><a href="https://instagram.com/realstraykids">Instagram</a></li>
52+
<li><a href="https://tiktok.com/@jypestraykids">TikTok</a></li>
5353

5454
<footer>
5555
<div class="container">
56-
<p>&copy; 2024 Mitchell. All rights reserved.</p>
56+
<p>&copy; 2024 Michelle. cutie pookie.</p>
5757
</div>
5858
</footer>
5959
</body>
60-
</html>
60+
</html>
61+
62+

‎README.md

+26-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,29 @@
44
Hold down the `control` key and press the `~` key (right below the `esc` key).
55

66
## How to see your changes in a new tab:
7-
`php -S localhost:3006 -t ./`
7+
`php -S localhost:3006 -t ./`
8+
9+
## The right way to use git:
10+
- `git checkout main`
11+
- `git pull`
12+
- `git checkout <the name of your branch>`
13+
- `git merge main`
14+
- (fix any "merge conflicts" if they exist)
15+
- *DO WORK*
16+
- `git add .`
17+
- `git commit -m "<tell people what you just did with your code>"`
18+
- `git push` (may need to do `git push origin <the name of your branch>` if that failed)
19+
- Go to github.com and create a *pull request* (from your branch into the main branch)
20+
- Rinse and repeat
21+
22+
## Another way to use git:
23+
- `git checkout <the name of your branch>`
24+
- *DO WORK*
25+
- `git add .`
26+
- `git commit -m "<tell people what you just did with your code>"`
27+
- `git fetch`
28+
- `git merge origin/main`
29+
- (fix any "merge conflicts" if they exist)
30+
- `git push` (may need to do `git push origin <the name of your branch>` if that failed)
31+
- Go to github.com and create a *pull request* (from your branch into the main branch)
32+
- Rinse and repeat

0 commit comments

Comments
 (0)