Skip to content

Commit 0ffd4ae

Browse files
author
Sketched Doughnut
committed
some refactoring, fixed an issue!
1 parent d09d55a commit 0ffd4ae

File tree

13 files changed

+215
-219
lines changed

13 files changed

+215
-219
lines changed

‎5970/index.html‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎DLC/CSS/school-construction.css‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
/* affects the entire body, and the HTML */
1+
/* body */
22
body, html {
3-
43
width: 100%;
54
height: 100%;
65
background-color: black;
76
}
87

8+
/* removes scrolling in HTML, plus anything else */
9+
html {
10+
overflow: hidden;
11+
}
12+
913
/* affects all paragraph text entries */
1014
p {
1115
color: white;

‎DLC/index.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
-->
3737
<body>
3838
<!--
39-
the links below all link to DLC pages
40-
...
39+
the links below all link to DLC pages...
4140
there is currently only one
4241
-->
4342
<h1>

‎DLC/school-construction.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ <h1 class="center link-container">
4545

4646
<!--
4747
This contains the slideshow
48-
access point of you scroll down
48+
access point if you scroll down
4949
-->
5050
<iframe
5151
type="link"

‎credits/credits.css‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
1-
/* for the disclaimer text at the top */
1+
/*
2+
for the disclaimer text at the top
3+
*/
24
.centered{
35
text-align: center;
4-
/* padding-bottom: 2.5%; */
56
}
67

7-
/* for the div of contributors
8-
just shifts to the right a little? */
8+
/*
9+
for the div of contributors
10+
just shifts to the right a little?
11+
*/
912
.shifted_right {
1013
padding-left: 1%;
1114
}
1215

13-
/* the bottom text that for some reason has a different amount of padding */
14-
.silly_bottom_text{
16+
/*
17+
spacing to have the footer be normal and not at the top of the screen
18+
*/
19+
.spacer{
1520
padding-bottom: 5%;
1621
}

‎credits/index.html‎

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
<!DOCTYPE html>
22
<html lang="en">
33

4+
<!--
5+
Disable the credits page for now, without deleting / removing it
6+
-->
7+
<script>
8+
window.location.href = "/maintenance"
9+
</script>
10+
11+
412
<!--
513
things that link to different files
614
such as CSS or Javascript
@@ -59,30 +67,7 @@ <h3>CONTRIBUTORS</h3>
5967
<div>
6068
ok - <a href="https://github.com/BubbleShade" target="_blank">Github</a>
6169
</div>
62-
<p id="silly_bottom_text"></p>
63-
64-
<!--
65-
design info
66-
-->
67-
<!-- <h3>PREFACE</h3>
68-
<p><b>Original transfer from old website:</b> ap, cw</p>
69-
70-
<h3>DESIGN (BY FOLDER)</h3>
71-
<p><i><b>does not include:</b> ignore/, currently-inactive/, assets/</i></p>
72-
<p><b>mobile pages/:</b> ap</p>
73-
<p><b>shared/:</b> ok</p>
74-
<p><b>DLC/</b> ap</p>
75-
<p><b>extra/</b> ap</p>
76-
77-
<h3>DESIGN (BY FILE)</h3>
78-
<p><i><b>does not include:</b> README.md, todo.txt</i></p>
79-
<p><b>DLC page:</b> ap</p>
80-
<p><b>Main page:</b> cw, wk, ap</p>
81-
<p><b>Robots page:</b> ap</p>
82-
<p><b>Outreach page:</b> ap</p>
83-
<p><b>Resources page:</b> ok</p>
84-
<p><b>Javascript:</b> cw, ap, ok</p>
85-
<p id="silly_bottom_text"><b>CSS:</b> cw, wk, ap</p> -->
70+
<p id="spacer"></p>
8671
</div>
8772
</body>
8873

‎index.html‎

Lines changed: 4 additions & 169 deletions
Original file line numberDiff line numberDiff line change
@@ -1,171 +1,6 @@
1-
<!DOCTYPE html>
2-
<html lang="en">
3-
4-
<!--
5-
things that link to different files
6-
such as CSS or Javascript
7-
The page title (that you see on the top of the tab) and the image displayed
8-
is also assigned here.
9-
-->
10-
<head>
11-
<meta charset="UTF-8">
12-
<meta Content-Type="text/css">
13-
<meta name="viewport" content="width=device-width, initial-scale=1.0">
14-
<link rel="icon" type="image/png" href="/assets/header/ravioli.png"/>
15-
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
16-
<script src="/shared/JS/script.js"></script>
17-
<script src="/index.js"></script>
18-
<script src="/shared/JS/slideshow.js"></script>
19-
<link rel="stylesheet" href="/shared/css/fonts.css"/>
20-
<link rel="stylesheet" href="/shared/css/style.css"/>
21-
<link rel="stylesheet" href="/shared/css/slideshow.css"/>
22-
<title>Beavertronics</title>
23-
</head>
24-
25-
261
<!--
27-
there is javascript (in /shared/JS/script.js) that injects a header
28-
that is used on every page. this header includes:
29-
- the dropdown menu,
30-
- links to pages on top bar
31-
- beavertronics icon
32-
- beavertronics title
2+
Redirects to the home page
333
-->
34-
<header id = "header" class = "header"></header>
35-
<div class="dropdown-links hidden" id="DropdownMenu"></div>
36-
37-
<!--
38-
this is the main body that contains everything
39-
-->
40-
<body>
41-
42-
<!--
43-
this contains the image slideshow at the top of the screen
44-
which slides between different images
45-
-->
46-
<div class="slideshow-container prevent-select">
47-
48-
<!--
49-
these are all of the images that are displayed on the image slideshow
50-
they are positioned individually and moved via the Javascript in /shared/JS/slideshow.js
51-
-->
52-
<div class="mySlides">
53-
<img src="/assets/main/1-edit-splash-screen.jpg" style="width:100%; margin-top: -20%;">
54-
</div>
55-
<div class="mySlides">
56-
<img src="/assets/main/2-edit-splashscreen.jpg" style="width:100%; margin-top: -1%;">
57-
</div>
58-
<div class="mySlides">
59-
<img src="/assets/main/3-splashscreen.png" style="width:100%; margin-top: -2%">
60-
</div>
61-
62-
<!--
63-
this is the text that goes above the image that says
64-
"We Are BEAVERTRONICS"
65-
As of documenting this (9/30/24) I am not sure why there are two versions of this
66-
but they are there
67-
-->
68-
<div class = "splashTextTop" id = "top1"> <h2 id = "splashTopText"> We Are </h1> </div>
69-
<div class = "splashTextBottom" id = bot1> <h1 id = "splashBotText"> BEAVERTRONICS </h1> </div>
70-
<div class = "splashTextTop hide" id = "top2"> <h2 id = "splashTopText"> We Are </h1> </div>
71-
<div class = "splashTextBottom hide" id = bot2> <h1 id = "splashBotText"> BEAVERTRONICS </h1> </div>
72-
73-
<!--
74-
these are buttons that move the thing left and right
75-
however I believe it slides automatically by itself
76-
-->
77-
<a class="prev" onclick="prevSlides()">&#10094;</a>
78-
<a class="next" onclick="nextSlide()">&#10095;</a>
79-
<div class = "dotContainer">
80-
<span class="dot" onclick="currentSlide(0)"></span>
81-
<span class="dot" onclick="currentSlide(1)"></span>
82-
<span class="dot" onclick="currentSlide(2)"></span>
83-
</div>
84-
</div>
85-
86-
<!-- splash screen at top of page
87-
<div class="splash-screen-wrapper">
88-
<img class="splash-screen" src="./assets/main/2-edit-splashscreen.jpg" alt="Team picture">
89-
</div>-->
90-
91-
<!--
92-
Below is a bunch of information regarding our team including a brief summary
93-
-->
94-
<h1>
95-
ABOUT OUR TEAM
96-
</h1>
97-
<p class="text-content">
98-
We compete in the FIRST Robotics Competition to learn lessons in perseverance, teamwork, and a plethora of technical skills. Our team, <b>which is 100% student led</b>, spends 6 short weeks every year working almost around the clock to design and build a competitive robot. Beyond this, we participate in a variety of community outreach events to engage those around us in STEM fields because we know the importance of getting young people excited and interested.
99-
</p>
100-
101-
<!--
102-
below are the 6 info cards which scale (via CSS) depending on the size of the screen
103-
-->
104-
<div id="info-card-holder" class="info-card-holder" style="--gap-amount: 2%">
105-
<div class="info-card">
106-
<div class="info-card-overlay">
107-
<b>SAFTEY</b>
108-
<br><br>
109-
We dedicate ourselves to preserving the safety of our team members. Power tools are the most fun when used safely! The Safety Captain oversees safety tests and the enforcement of safety regulations.
110-
</div>
111-
<img src="https://static.wixstatic.com/media/cbe77e_13e422cfa1ec47e092ded8cf8fd5691f~mv2.jpg/v1/fill/w_284,h_420,al_c,q_80,usm_1.20_1.00_0.01,enc_auto/cbe77e_13e422cfa1ec47e092ded8cf8fd5691f~mv2.jpg" class="img">
112-
</div>
113-
<div class="info-card">
114-
<div class="info-card-overlay">
115-
<b>BUILD</b>
116-
<br><br>
117-
Team members fabricate parts using our band saw, miter saw, drill presses, CNC router, and 3D printer. We also assemble parts using a variety of fasteners.</div>
118-
<img src="https://static.wixstatic.com/media/cbe77e_bad328631b8a45efa236b1265a13b569~mv2.jpg/v1/fill/w_284,h_420,al_c,q_80,usm_1.20_1.00_0.01,enc_auto/cbe77e_bad328631b8a45efa236b1265a13b569~mv2.jpg" class="img">
119-
</div>
120-
<div class="info-card">
121-
<div class="info-card-overlay">
122-
<b>CONTROL SYSTEMS</b>
123-
<br><br>
124-
Students and mentors partner to teach incoming members to wire electrical boards and program in Kotlin. The electrical and programming subteams work in tandem with the goal of a smoothly functioning control system.</div>
125-
<img src="https://static.wixstatic.com/media/cbe77e_8110a7825dfc4a1f82d60bdcb8a40177~mv2.jpg/v1/fill/w_284,h_420,al_c,q_80,usm_1.20_1.00_0.01,enc_auto/cbe77e_8110a7825dfc4a1f82d60bdcb8a40177~mv2.jpg" class="img">
126-
</div>
127-
<div class="info-card">
128-
<div class="info-card-overlay">
129-
<b>DESIGN</b>
130-
<br><br>
131-
Our team strategically designs each robot with feasability, simplicity, and awesomeness all in mind, based on a thorough analysis of each year's game. We experiment with ideas by making prototypes out of scrap wood. Once we have a good idea of what we want the robot to do and how we want it to do it, we flesh out the details using Onshape, a cloud-based CAD software. Finally, the CAD is thoroughly reviewed, both by students and by our experienced mentors, before manufacturing and assembly take place.</div>
132-
<img src="https://static.wixstatic.com/media/cbe77e_85f3406992e241ef9988ef2bc1cbbeb2~mv2.jpg/v1/fill/w_284,h_420,al_c,q_80,usm_1.20_1.00_0.01,enc_auto/cbe77e_85f3406992e241ef9988ef2bc1cbbeb2~mv2.jpg" class="img">
133-
</div>
134-
<div class="info-card">
135-
<div class="info-card-overlay">
136-
<b>MARKETING</b>
137-
<br><br>
138-
Students learn first-hand how to create consistent branding, talk to sponsors, write grants, and empower a team. Our marketing team spreads word of our program throughout the community of FIRST and beyond.</div>
139-
<img src="https://static.wixstatic.com/media/cbe77e_8e783eac4ef54a13b61999a50ed63382~mv2.jpg/v1/fill/w_284,h_420,al_c,q_80,usm_1.20_1.00_0.01,enc_auto/cbe77e_8e783eac4ef54a13b61999a50ed63382~mv2.jpg" class="img">
140-
</div>
141-
<div class="info-card">
142-
<div class="info-card-overlay">
143-
<b>COMMUNITY DEVELOPMENT</b>
144-
<br><br>
145-
Integral to our team mission is the idea of exposing our community to STEM and FIRST. We believe that all deserve the opportunity to participate in the scientific development of our world; the earlier we can make a difference, the better! For this reason, our team has <b>zero</b> participation fees, despite the high cost of building a robot and participating in FRC.</div>
146-
<img src="https://static.wixstatic.com/media/cbe77e_31ae767b94c24dfdb2c4337c17eecf90~mv2_d_3600_2400_s_4_2.jpg/v1/fill/w_284,h_419,al_c,q_80,usm_1.20_1.00_0.01,enc_auto/cbe77e_31ae767b94c24dfdb2c4337c17eecf90~mv2_d_3600_2400_s_4_2.jpg" class="img">
147-
</div>
148-
</div>
149-
150-
<!--
151-
this is the link to the calendar that is on the bottom
152-
there is also Javascript that should, in theory delete the iframe if the screen is too small
153-
and instead display the text entry below it that links them externally to the calendar
154-
however that code does not seem to be working so...
155-
-->
156-
<h1><a style="color: black; text-decoration: underline;" target="_blank" href="https://calendar.google.com/calendar/u/0/[email protected]">Calendar</a></h1>
157-
<iframe class="calendar" style="width: 40vw; height: 30vw;" scrolling="no" id="google calendar" src="https://calendar.google.com/calendar/embed?src=beavertronics5970%40gmail.com&ctz=America%2FLos_Angeles"></iframe>
158-
<p id="alt calendar text" style="text-align: center;" class="hidden">Sorry, the screen is too small for the calendar to be displayed. Please click the "Calendar" text above, or click <a style="color: blue;" target="_blank" href="https://calendar.google.com/calendar/u/0/[email protected]">here</a> to open the calendar in a different page!</p>
159-
</body>
160-
161-
<!--
162-
similar to above with the header, there is Javascript that injects a universal footer
163-
this footer includes:
164-
- links to socials
165-
- link to Dr. Meirings email
166-
- access to credits page
167-
- access to feedback page
168-
- access to old website
169-
-->
170-
<footer id = "footer" class="footer"></footer>
171-
</html>
4+
<script>
5+
window.location.href = '/landing'
6+
</script>

0 commit comments

Comments
 (0)