Skip to content

Commit af08c8c

Browse files
iciclicicl
authored
Add files via upload
1 parent 916fd6e commit af08c8c

33 files changed

+6844
-5924
lines changed

‎2020.html

+39-74
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,40 @@
1-
<!DOCTYPE HTML>
2-
<html lang="en" style="scroll-behavior:smooth">
3-
<head>
4-
<title>ACHSRobotics</title>
5-
<link rel="stylesheet" href=css/2020Stylesheet.css>
6-
<script src="https://kit.fontawesome.com/16c4754272.js" crossorigin="anonymous"></script>
7-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
8-
<meta name="viewport" content="width=device-width, initial-scale=1">
9-
<meta charset="UTF-8">
10-
<style>
11-
12-
</style>
13-
14-
</head>
15-
<body>
16-
<header>
17-
<nav>
18-
<!--<img src="assets/scorps-techv2.png" id="logo"> -->
19-
<div class="navbar-left">
20-
<div class="cam-logo">
21-
<img src="assets/ACHS-Logo-Circle-Final.png" id="cam-logo-picture">
22-
</div>
23-
<p><a href="IndexV2.html" id="name"><i>SCORPS</i></a></p>
24-
</div>
25-
<div class="nav-container">
26-
<ul class="navbar-right">
27-
<li><a href="2020.html"><i>THE CHALLENGE</i></a></li>
28-
<li><a href="team.html"> <i>THE TEAM</i></a></li>
29-
<li>
30-
<div class="memory-pulldown">
31-
<a>
32-
<i>MEMORIES</i>
33-
<i class="fas fa-chevron-down"></i>
34-
</a>
35-
</div>
36-
<ul>
37-
<li><a href="gallery2019.html"> <i>2019 Season</i></a></li>
38-
<li><a href="gallery2020.html"> <i>2020 Season</i></a></li>
39-
</ul>
40-
</li>
41-
<li><a href="#"><i>SPONSORS</i></a></li>
42-
43-
</ul>
44-
</div>
45-
</nav>
46-
</header>
47-
<main>
48-
<section>
49-
<div class="text">The 2020 season competition is not yet released. We do know it is called infinite recharge, and is sponsored by Stat Wars. This page will be updated
50-
when the actual competition drops.
51-
<a href="https://www.firstinspires.org/robotics/frc/game-and-season"class="button1">Learn More</a></div>
52-
</section>
53-
<section>
54-
</section>
55-
</main>
56-
57-
<footer>
58-
<div class="footer-links">
59-
<div class="footer-icons">
60-
<!-- <a href="#" target="_blank" rel="noopener"><i class="fab fa-facebook fa-3x"></i></a>-->
61-
<a href="#" target="_blank" rel="noopener"><i class="fab fa-twitter fa-3x"></i></a>
62-
<a href="#" target="_blank" rel="noopener"><i class="fab fa-instagram fa-3x" aria-hidden="true"></i></a>
63-
<a href="#" target="_blank" rel="noopener"><i class="fab fa-youtube fa-3x"></i></a>
64-
<a href="https://github.com/Scorps6934" target="_blank" rel="noopener"><i class="fab fa-github fa-3x"></i></a>
65-
<a href="#" ><i class="fas fa-chevron-circle-up fa-3x"></i></a>
66-
</div>
67-
</div>
68-
</footer>
69-
<script src="https://cdnjs.cloudflare.com/ajax/libs/gsap/3.0.2/gsap.min.js"></script>
70-
<script src="https://cdnjs.cloudflare.com/ajax/libs/ScrollMagic/2.0.7/ScrollMagic.min.js"></script>
71-
<script src="https://cdnjs.cloudflare.com/ajax/libs/ScrollMagic/2.0.7/plugins/debug.addIndicators.min.js"></script>
72-
<script src="https://cdnjs.cloudflare.com/ajax/libs/ScrollMagic/2.0.7/plugins/animation.gsap.min.js"></script>
73-
<script src="2020Page.js"></script>
74-
</body>
1+
<!DOCTYPE HTML>
2+
<html lang="en">
3+
<head>
4+
<title>ACHSRobotics</title>
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6+
<meta name="viewport" content="width=device-width, initial-scale=1">
7+
<meta charset="UTF-8">
8+
9+
<style>
10+
11+
12+
body{height:100%;
13+
width:100%;
14+
background-image:url(http://muskegonrobotics.com/wp-content/uploads/2019/08/FRC-Infinite-Recharge-768x432.png);
15+
background-repeat:no-repeat;
16+
background-size:cover;
17+
}
18+
a {
19+
20+
background-color: #ccddff;
21+
text-decoration: none;
22+
}
23+
24+
25+
div.text {
26+
width:50%;
27+
margin-left:25%;
28+
background:white;
29+
font-family:Lucida Sans Unicode, Lucida Grande, sans-serif;
30+
text-align: center;
31+
padding: 10px 20px;
32+
}</style>
33+
34+
</head>
35+
<body>
36+
<div class="text">The 2020 season competition is not yet released. We do know it is called infinite recharge, and is sponsored by Stat Wars. This page will be updated
37+
when the actual competition drops. <a href="https://www.firstinspires.org/robotics/frc/game-and-season">Check it out on the official FIRST website.</a></div>
38+
39+
</body>
7540
</html>

‎2020Challenge.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en" style="scroll-behavior:smooth">
33
<head>
44
<meta charset="UTF-8">
5-
<title>ACHSRobotics</title>
5+
<title>FIRST Competition</title>
66
<link rel="stylesheet" href=css/2020Stylesheet.css>
77
<meta http-equiv="X-UA-Compatible" content="IE=edge">
88
<meta name="viewport" content="width=device-width, initial-scale=1">
@@ -21,7 +21,7 @@
2121
<!--<img src="assets/scorps-techv2.png" id="logo"> -->
2222
<div class="navbar-left">
2323
<div class="cam-logo">
24-
<img src="assets/scorps-logo.webp" id="cam-logo-picture">
24+
<img src="assets/scorps-logo.webp" id="cam-logo-picture" alt="6934 logo">
2525
</div>
2626
<p><a href="index.html" id="name" style="font-weight: 900"><i>scorps</i></a></p>
2727
</div>

‎2020Team.html

+19-21
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22
<html lang="en" style="scroll-behavior:smooth">
33
<head>
44
<meta charset="UTF-8">
5-
<title>ACHSRobotics</title>
5+
<title>Team 6934</title>
66
<meta http-equiv="X-UA-Compatible" content="IE=edge">
77
<meta name="viewport" content="width=device-width, initial-scale=1">
88
<link rel="stylesheet" href=css/Teamstylesheet.css>
99
<link rel="stylesheet" href="fontawesome-free-5.12.0-web/css/all.min.css">
1010
<link rel="icon" type="image/png" href="http://achsrobotics.com/favicon.png">
1111

12-
</style>
13-
1412
</head>
1513

1614
<body>
@@ -20,7 +18,7 @@
2018
<!--<img src="assets/scorps-techv2.png" id="logo"> -->
2119
<div class="navbar-left">
2220
<div class="cam-logo">
23-
<img src="assets/scorps-logo.webp" id="cam-logo-picture">
21+
<img src="assets/scorps-logo.webp" id="cam-logo-picture" alt="6934 logo">
2422
</div>
2523
<p><a href="index.html" id="name"style="font-weight: 900"><i>scorps</i></a></p>
2624
</div>
@@ -47,7 +45,7 @@
4745
</header>
4846
<main>
4947
<div class=grayout id=grayout>
50-
<img src="team/tl80.png">
48+
<img src="team/tl80.png" alt="Default">
5149
</div>
5250
<div class=popup id=maincard>
5351
<div class=name></div>
@@ -59,7 +57,7 @@
5957
<div class=pcontainer><i>Faculty and Mentors</i></div><!-- pcontainer is what I use for heading the different sections-->
6058
<!-- you need an empty pcontainer div every 5 people so that if their text was different lengths the pcontainer makes all 5 of the next people start at the same height.-->
6159
<div class=member-container>
62-
<div class=person onclick="show(this)"><img src="team/jjackson.JPG">
60+
<div class=person onclick="show(this)"><img src="team/jjackson.JPG" alt="Jeff Jackson">
6361
<div class=name>Jeff Jackson</div>
6462
<div class=about>I teach computer science and robotics and like surfing.</div>
6563
</div>
@@ -69,31 +67,31 @@
6967
<section>
7068
<div class=pcontainer><i>Current Members</i></div>
7169
<div class=member-container>
72-
<div class=person onclick="show(this)"><img src="team/Huy.jpg">
70+
<div class=person onclick="show(this)"><img src="team/Huy.jpg" alt="Huy">
7371
<div class=name>Huy Nguyen</div>
7472
<div class=team>Programming</div>
7573
<div class=about >I am a senior, and am the co-president of the club. This is my third year on the team.</div>
7674
</div>
7775

78-
<div class=person onclick="show(this)"><img src="team/Trev.JPG">
76+
<div class=person onclick="show(this)"><img src="team/Trev.JPG" alt="Trevor">
7977
<div class=name>Trevor Lopez</div>
8078
<div class=team>Programming</div>
8179
<div class=about>I am a senior, and am the co-president of the club. This is my third year on the team.</div>
8280
</div>
8381

84-
<div class=person onclick="show(this)"><img src="team/dak.jpg">
82+
<div class=person onclick="show(this)"><img src="team/dak.jpg" alt="Dakota">
8583
<div class=name>Dakota Frost</div>
8684
<div class=team>Mechanical, Electrical</div>
8785
<div class=about>I am a senior, and am co-leading the mechanical team with Freddy. This is my third year on the team. I am also vice president.</div>
8886
</div>
8987

90-
<div class=person onclick="show(this)"><img src="team/freddy3.jpg">
88+
<div class=person onclick="show(this)"><img src="team/freddy3.jpg" alt="Freddy">
9189
<div class=name>Freddy Stacy</div>
9290
<div class=team>Mechanical, Fundraising</div>
9391
<div class=about>I am a senior, and am co-leading the mechanical team with Dakota. This is my third year on the team. I am also treasurer.</div>
9492
</div>
9593

96-
<div class=person onclick="show(this)"><img src="team/Ewang.JPG">
94+
<div class=person onclick="show(this)"><img src="team/Ewang.JPG" alt="Edward">
9795
<div class=name>Edward Wang</div>
9896
<div class=team>Programming</div>
9997
<div class=about>Calcy, take it!</div>
@@ -103,31 +101,31 @@
103101
</section>
104102
<section>
105103
<div class="member-container">
106-
<div class=person onclick="show(this)"><img src="team/katelynr.jpg">
104+
<div class=person onclick="show(this)"><img src="team/katelynr.jpg" alt="Katelyn">
107105
<div class=name>Katelyn Raney</div>
108106
<div class=team>Scouting</div>
109107
<div class=about>I joined Robotics because I wanted a fun last two years of high school and to learn more about the math and engineering behind making robots!</div>
110108
</div>
111109

112-
<div class=person onclick="show(this)"><img src="team/Marcella.jpg">
110+
<div class=person onclick="show(this)"><img src="team/Marcella.jpg" alt="Marcella">
113111
<div class=name>Marcella Barneclo</div>
114112
<div class=team>Design</div>
115113
<div class=about>I am a senior and this is my first year in Robotics. I mainly take pictures. </div>
116114
</div>
117115

118-
<div class=person onclick="show(this)"><img src="team/Ryan.jpg">
116+
<div class=person onclick="show(this)"><img src="team/Ryan.jpg" alt="Ryan">
119117
<div class=name>Ryan Jones</div>
120118
<div class=team>Mechanical</div>
121-
<div class=about>This is my first year in robotics, and I help out to construct the robot.</div>
119+
<div class=about>Pizza. Dodgeball. Blowtorches... 'Nuff said.</div>
122120
</div>
123121

124-
<div class=person onclick="show(this)"><img src="team/PHOTO.jpg">
125-
<div class=name></div>
126-
<div class=team></div>
127-
<div class=about></div>
122+
<div class=person onclick="show(this)"><img src="team/maggie.jpg" alt="Maggie">
123+
<div class=name>Maggie Qian</div>
124+
<div class=team>Programming</div>
125+
<div class=about>This is my first year in robotics, i learnt a lot this year and mainly helped on Limelight</div>
128126
</div>
129127

130-
<div class=person onclick="show(this)"><img src="team/PHOTO.jpg">
128+
<div class=person onclick="show(this)"><img src="team/PHOTO.jpg" alt="Default Pic">
131129
<div class=name></div>
132130
<div class=team></div>
133131
<div class=about></div>
@@ -138,7 +136,7 @@
138136

139137
<div class=pcontainer><i>Graduates</i></div>
140138
<div class="member-container">
141-
<div class=person onclick="show(this)"><img src="team/PHOTO.jpg">
139+
<div class=person onclick="show(this)"><img src="team/PHOTO.jpg" alt="Default Pic">
142140
<div class=name>Name McName</div>
143141
<div class=about>Joined 2017<br />Graduated 2019</div>
144142
</div>

‎TeamPage.js

-9
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,6 @@ navbarRight.addEventListener("click",(e)=>{
3939
extendedDown=!extendedDown;
4040
console.log("var is " + extendedDown);
4141
});
42-
if( navigator.userAgent.match(/Android/i)
43-
|| navigator.userAgent.match(/webOS/i)
44-
|| navigator.userAgent.match(/iPhone/i)
45-
|| navigator.userAgent.match(/iPad/i)
46-
|| navigator.userAgent.match(/iPod/i)
47-
|| navigator.userAgent.match(/BlackBerry/i)
48-
|| navigator.userAgent.match(/Windows Phone/i)
49-
){location.href="team_mobile.html"}
50-
5142
let gray=document.getElementById('grayout');
5243
let card=document.getElementById('maincard');
5344
let c_img,c_name,c_team,c_about;

0 commit comments

Comments
 (0)