Skip to content

Commit ddca237

Browse files
imetheones1imetheones1
committed
put some info in
needs to be styled, images need to be added
1 parent 240fbee commit ddca237

6 files changed

Lines changed: 84 additions & 18 deletions

File tree

‎css/base.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
--nerd-herd-blue: #0D3F81ff;
55
--nerd-herd-light-blue: #e6fafaff;
66
--nerd-herd-yellow: #d0B174ff;
7-
--min-width: 5000px;
7+
--min-width: 1500px;
88
}
99

1010
/* Poppins is licensed under the SIL Open Font License */

‎css/main.css‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ html, body {
99

1010
.main-content {
1111
width: min(var(--min-width),calc(100% - 40px));
12-
min-height: 100%;
1312
}
1413

1514
/* body */

‎seasons/crescendo.html‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<link rel="stylesheet" type="text/css" href="../css/header.css">
99
<link rel="stylesheet" type="text/css" href="../css/main.css">
1010
<link rel="stylesheet" type="text/css" href="../css/footer.css">
11+
<link rel="stylesheet" type="text/css" href="../seasons/season.css">
1112
<script src="../js/header.js" defer></script>
1213
<link rel="icon" href="../images/nerd.svg">
1314
<meta property="og:title" content="NerdHerd"/>
@@ -71,11 +72,26 @@
7172
</div>
7273
</header>
7374
<div class="body">
74-
75-
76-
77-
78-
75+
<div class="robotinfo">
76+
<div style="width:200px;aspect-ratio:1/1;background-color:red">
77+
<p>ISME</p>
78+
<!-- image placeholder -->
79+
</div>
80+
<div>
81+
<p>Yap about robot design. Yap about robot design. Yap about robot design. Yap about robot design. Yap about robot design. Yap about robot design. </p>
82+
</div>
83+
</div>
84+
<br>
85+
<p>2023 marked the __ competition season for 687. Our best season? Ended our season by making an appearance on Einstein with alliance partners 6328, blah blah, blah blah.</p>
86+
<br>
87+
<p>Awards:</p>
88+
<ul>
89+
<li><p>Event Winner, Los Angeles Regional</p></li>
90+
<li><p>Division Winner, Archimedes Division, Worlds Championship</p></li>
91+
<li><p>Industrial Design Award, Los Angeles Regional</p></li>
92+
<li><p>FIRST Dean’s List Finalist (Brianna Adweinmbi), Los Angeles Regional</p></li>
93+
<li><p>FIRST Dean’s List Winner (Brianna Adewinmbi), Einstein Field</p></li>
94+
</ul>
7995
</div>
8096
<footer>
8197
<div>

‎seasons/rebuilt.html‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<link rel="stylesheet" type="text/css" href="../css/header.css">
99
<link rel="stylesheet" type="text/css" href="../css/main.css">
1010
<link rel="stylesheet" type="text/css" href="../css/footer.css">
11+
<link rel="stylesheet" type="text/css" href="../seasons/season.css">
1112
<script src="../js/header.js" defer></script>
1213
<link rel="icon" href="../images/nerd.svg">
1314
<meta property="og:title" content="NerdHerd"/>
@@ -18,7 +19,6 @@
1819
<body>
1920
<div class="main-content">
2021
<header>
21-
2222
<div class="nav" id="nav">
2323
<div class="subtabs">
2424
<a href="../index.html"><img src="../images/nerd.svg" height="100%"></a>
@@ -72,10 +72,6 @@
7272
</header>
7373
<div class="body">
7474

75-
76-
77-
78-
7975
</div>
8076
<footer>
8177
<div>

‎seasons/reefscape.html‎

Lines changed: 45 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<link rel="stylesheet" type="text/css" href="../css/header.css">
99
<link rel="stylesheet" type="text/css" href="../css/main.css">
1010
<link rel="stylesheet" type="text/css" href="../css/footer.css">
11+
<link rel="stylesheet" type="text/css" href="../seasons/season.css">
1112
<script src="../js/header.js" defer></script>
1213
<link rel="icon" href="../images/nerd.svg">
1314
<meta property="og:title" content="NerdHerd"/>
@@ -18,7 +19,6 @@
1819
<body>
1920
<div class="main-content">
2021
<header>
21-
2222
<div class="nav" id="nav">
2323
<div class="subtabs">
2424
<a href="../index.html"><img src="../images/nerd.svg" height="100%"></a>
@@ -71,11 +71,50 @@
7171
</div>
7272
</header>
7373
<div class="body">
74-
75-
76-
77-
78-
74+
<div class="robotinfo">
75+
<div style="width:200px;aspect-ratio:1/1;background-color:red">
76+
<p>Abruticus</p>
77+
<!-- image placeholder -->
78+
</div>
79+
<div>
80+
<p>Yap about robot design. Yap about robot design. Yap about robot design. Yap about robot design. Yap about robot design. Yap about robot design. </p>
81+
</div>
82+
</div>
83+
<br>
84+
<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/qZN4iUNxiVg" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
85+
<br>
86+
<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/Kwxz9v-WoYA?start=25" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
87+
<br>
88+
<p>2024</p>
89+
<br>
90+
<p>Awards:</p>
91+
<ul>
92+
<li>
93+
<p>Team Sustainability Award, Ventura County Regional </p>
94+
</li>
95+
<li>
96+
<p>FIRST Dean's List Finalist (Daniela S), Ventura County Regional </p>
97+
</li>
98+
<li>
99+
<p>Regional Engineering Inspiration Award, Los Angeles Regional </p>
100+
</li>
101+
<li>
102+
<p>Regional Finalists, Los Angeles Regional </p>
103+
</li>
104+
<li>
105+
<p>Regional Finalists, Las Vegas Regional </p>
106+
</li>
107+
<li>
108+
<p>Event Finalist, Beach Blitz </p>
109+
</li>
110+
</ul>
111+
<br>
112+
<p>
113+
Alliance at Worlds: <br>
114+
2046, 5809, 1781
115+
</p>
116+
<br>
117+
<p><a href="https://www.canva.com/design/DAF9ET7l2M8/UwuXj85fuOanNDbh361Gsg/view">2024 Tech Binder</a></p>
79118
</div>
80119
<footer>
81120
<div>

‎seasons/season.css‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
.robotinfo {
2+
display: flex;
3+
flex-direction: row;
4+
width: 100%;
5+
justify-content: center;
6+
padding-top: 10px;
7+
}
8+
9+
/* Uncomment following to style robot image */
10+
/* .robotinfo *:first-child{
11+
12+
} */
13+
14+
.robotinfo *:nth-child(2) {
15+
width: 30%;
16+
}

0 commit comments

Comments
 (0)