Skip to content

Commit 6731dcb

Browse files
committed
fix join
1 parent be48e04 commit 6731dcb

2 files changed

Lines changed: 38 additions & 19 deletions

File tree

css/main.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,10 @@ header {
126126
position: absolute;
127127
}
128128

129+
.section-spacer {
130+
height: 10vh;
131+
}
132+
129133
}
130134

131135
#impact-video-div {
@@ -205,10 +209,6 @@ hr{
205209
margin: 0;
206210
}
207211

208-
.section-spacer {
209-
height: 10vh;
210-
}
211-
212212

213213
@media screen and (width < 760px){
214214
.nav {

programs/join.html

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -102,26 +102,45 @@ <h1>Subteams</h1>
102102
<p>Nerd Herd 687 consists of 5 main sub teams: </p>
103103

104104
<ul>
105-
<li><p>Assembly: Assembly is one of the most underrated sub teams out there! They make sure that the robot is always able to run at its maximum performance.</p>
106-
<li><p>Design: This sub team makes or breaks the season and is the foundation for how well the robot is going to perform.</p>
107-
<li><p>Manufacturing: We always make our machined parts in house. Allowing students to get the experience using TM1s, Mini Mills, Lathes, and CNC Routers.</p>
108-
<li><p>Programming: This sub team dictates the robot from good to great. The programming team works in close coordination with the design team to ensure that they will have the necessary support to program the robot.</p>
109-
<li><p>Admin/BUS: This Sub Teams ensures that we have the funding, sponsorships, and are the reason why we are able to keep this team alive.</p>
105+
<li><p>Assembly: Assembly is one of the most underrated sub teams out there! They make sure that the robot is always able to run at its maximum performance.</p>
106+
<li><p>Design: This sub team makes or breaks the season and is the foundation for how well the robot is going to perform.</p>
107+
<li><p>Manufacturing: We always make our machined parts in house. Allowing students to get the experience using TM1s, Mini Mills, Lathes, and CNC Routers.</p>
108+
<li><p>Programming: This sub team dictates the robot from good to great. The programming team works in close coordination with the design team to ensure that they will have the necessary support to program the robot.</p>
109+
<li><p>Admin/BUS: This Sub Teams ensures that we have the funding, sponsorships, and are the reason why we are able to keep this team alive.</p>
110110
</ul>
111111

112-
<p><br>687 also has numerous competition-based sub team roles: <br>
113-
<br> -Scout & Strategy: This sub team ensures that the necessary intel is gained for each team that we will be playing against and with. The information gained and the right usage of it is a big key in securing victories for the team!
114-
<br> -Awards/Impact: We don’t just build robots, but we also impact the community with FIRST! This sub team holds outreach events, makes documentation, and wins us awards in competitions for qualification.
115-
<br> -Spirit: This sub team ensures that the morale of our team is always at a high. No matter the circumstance, our members in this team will cheer on Nerd Herd towards its victory.</p>
112+
<p>687 also has numerous competition-based sub team roles:</p>
113+
<ul>
114+
<li>
115+
<p>Scout & Strategy: This sub team ensures that the necessary intel is gained for each team that we will be playing against and with. The information gained and the right usage of it is a big key in securing victories for the team!</p>
116+
</li>
117+
<li>
118+
<p>Awards/Impact: We don’t just build robots, but we also impact the community with FIRST! This sub team holds outreach events, makes documentation, and wins us awards in competitions for qualification.</p>
119+
</li>
120+
<li>
121+
<p>Spirit: This sub team ensures that the morale of our team is always at a high. No matter the circumstance, our members in this team will cheer on Nerd Herd towards its victory.</p>
122+
</li>
123+
</ul>
116124
<h2>Leadership:</h2>
117-
<p> -Captain: The captains oversee and manage everything that occurs in the team. Starting from the agenda, content, and organization. They are a prime example of leaders, taking initiative to ensure the team’s success. Having an excellent Captain is crucial for the success of the team.
118-
<br> -Technical Managers: Technical manager is the title given to the member that has shown the most proficiency in their respective sub team. They are responsible for maintaining quality in the technical aspects.
119-
<br> -Leads: Leaders are titles given to experienced individuals of their sub team that have shown enough experience to be able to teach and lead members.
120-
<br> -Members: IDK</p>
121-
122-
<p> <br>Subteam designation is chosen during the application process and students have opportunities to train interdisciplinarity until on season.</p>
125+
<ul>
126+
<li>
127+
<p>Captain: The captains oversee and manage everything that occurs in the team. Starting from the agenda, content, and organization. They are a prime example of leaders, taking initiative to ensure the team’s success. Having an excellent Captain is crucial for the success of the team. </p>
128+
</li>
129+
<li>
130+
<p>Technical Managers: Technical manager is the title given to the member that has shown the most proficiency in their respective sub team. They are responsible for maintaining quality in the technical aspects.</p>
131+
</li>
132+
<li>
133+
<p>Leads: Leaders are titles given to experienced individuals of their sub team that have shown enough experience to be able to teach and lead members.</p>
134+
</li>
135+
<li>
136+
<p>Members: IDK</p>
137+
</li>
138+
</ul>
139+
140+
<p>Subteam designation is chosen during the application process and students have opportunities to train interdisciplinarity until on season.</p>
123141

124142
<div class="section-spacer"></div>
143+
<br>
125144
<h1>California Academy of Mathematics and Science – Getting In </h1>
126145

127146
<p>The California Academy of Mathematics and Sciences (CAMS) is a small competitive magnet school located in Carson, California with a large focus on STEM-based education. With a consortium of more than 10 school districts, CAMS is open to many students, and acceptances are based on academic rigor and achievement. </p>

0 commit comments

Comments
 (0)