-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3 from 3492PARTs/DEV
Dev changes going stable
- Loading branch information
Showing
31 changed files
with
387 additions
and
249 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,7 +20,7 @@ | |
| <tbody> | ||
| <tr> | ||
| <td id="homeBot"> | ||
| <p style="padding: 0; margin:0;"><a href="/"><img src="../contents/webImages/Robots/BeanieBot.png"/></a></p> | ||
| <p style="padding: 0; margin:0;"><a href="/"><img src="../contents/webImages/Robots/BeanieBot.svg" onerror="this.src='../contents/webImages/Robots/BeanieBot.png'; this.onerror=null;"/></a></p> | ||
| </td> | ||
| <td class="homeWord" style="width: 14em; height:5em;"> | ||
| <!--Spacer for mobile nav, not displayed on desktop--> | ||
|
|
@@ -62,7 +62,7 @@ | |
| <span class="circle"></span> | ||
| </div> | ||
|
|
||
| <div id="blueBlock"> <a href="/"><img src="../contents/webImages/Robots/BeanieBot.png"/></a> | ||
| <div id="blueBlock"> <a href="/"><img src="../contents/webImages/Robots/BeanieBot.svg" onerror="this.src='../contents/webImages/Robots/BeanieBot.png'; this.onerror=null;"/></a> | ||
| </div> | ||
|
|
||
| <div id="wrapper"> | ||
|
|
@@ -79,7 +79,7 @@ <h1>P.A.R.T.s History</h1> | |
| <tbody> | ||
| <tr> | ||
| <td><h2>Jump to Year</h2></td> | ||
| <td><img id="yearDown" src="../contents/webImages/Down.png"/></td> | ||
| <td><img id="yearDown" src="../contents/webImages/expand.svg" onerror="this.src='../contents/webImages/expand.png'; this.onerror=null;" alt="Expand"/></td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
|
|
@@ -119,7 +119,7 @@ <h2><a href="#2016">2016</a></h2> | |
| <table> | ||
| <tr> | ||
| <td> | ||
| <img src="../contents/webImages/Robots/BeanieBot.svg" onerror="this.src='../contents/webImages/Robots/BeanieBot.png'; this.onerror=null;"> | ||
| <img src="../contents/webImages/Robots/BeanieBot.svg" onerror="this.src='../contents/webImages/Robots/BeanieBot.png'; this.onerror=null;"/> | ||
| </td> | ||
| <td> | ||
| <h2>A Brief History...</h2> | ||
|
|
@@ -205,26 +205,26 @@ <h2>2015</h2> | |
| <h2>2016</h2> | ||
| <p>"Beanie the Barbarian", named after our team mascot "BeanieBot" and this year's game, was our sixth robot designed to play the 2016 game FIRST STRONGHOLD. He was designed with a shooting mechanism in the center to make top goals, and an arm on the back to get trough defenses. It is also out first robot to use vision processing, the camera with the blue ring, to find goals, line up, and make a shot.</p> | ||
| <p>FIRST STRONGHOLD is played on a 27' x 54' field. Each alliance commands one tower, five defenses, and a 'secret passage' which allows their robots to restock on ammunition, called boulders. One defense in each alliance's set of five, the low bar, is a permanent part of the field. Three defenses are selected strategically by the alliance prior to the start of their match. The final defense changes periodically by audience selection. During the 2 minutes and 15 second match, robots are controlled by student drivers from behind their castle wall at the end of the field. Teams on an alliance work together to cross defenses, weaken the opposing tower by scoring boulders in it, and finally surround, scale and capture the tower.</p> | ||
| <p>Beanie the Barbarian will compete in the 2016 Queen City Regional, in Cincinnati, OH.</p> | ||
| <p>Beanie the Barbarian competed in the 2016 Queen City Regional, in Cincinnati, OH. There we were ranked 34 out of 56. Although we did not get selected for an alliance, we cheered for our friends form Logan, WV team 337 (Hard Working Hard Hats) who played hard in their final matches.</p> | ||
| </td> | ||
| </tr> | ||
| </table> | ||
| </div> | ||
| </div> | ||
| <div id="footer"> | ||
| <div id="footer_accent"> | ||
| <a id="footerArrow" href="#top"><img src="../contents/webImages/UpAlt.png"/></a> | ||
| <a id="footerArrow" href="#top"><img src="../contents/webImages/return.svg" onerror="this.src='../contents/webImages/return.png'; this.onerror=null;" alt="Return to Top"/></a> | ||
| </div> | ||
| <div id="footerContent"> | ||
| <div id="connect"> | ||
| <h2>CONNECT WITH PARTs</h2> | ||
| </div> | ||
| <div id="connectSocial"> | ||
| <a target="_blank" href="https://www.facebook.com/team3492"><img src="../contents/webImages/SocialIcons/Facebook.svg" onerror="this.src='../contents/webImages/SocialIcons/Facebook.png'; this.onerror=null;"></a> | ||
| <a target="_blank" href="https://twitter.com/parts3492"><img src="../contents/webImages/SocialIcons/Twitter.svg" onerror="this.src='../contents/webImages/SocialIcons/Twitter.png'; this.onerror=null;"></a> | ||
| <a target="_blank" href="https://www.youtube.com/channel/UCIq35DtgjUsKJB3blFbSXrQ"><img src="../contents/webImages/SocialIcons/YouTube.svg" onerror="this.src='../contents/webImages/SocialIcons/YouTube.png'; this.onerror=null;"></a> | ||
| <a target="_blank" href="https://github.com/3492PARTs"><img src="../contents/webImages/SocialIcons/GitHub.svg" onerror="this.src='../contents/webImages/SocialIcons/GitHub.png'; this.onerror=null;"></a> | ||
| <a href="mailto:[email protected]"><img src="../contents/webImages/SocialIcons/Email.svg" onerror="this.src='../contents/webImages/SocialIcons/Email.png'; this.onerror=null;"></a> | ||
| <a target="_blank" href="https://www.facebook.com/team3492"><img src="../contents/webImages/SocialIcons/Facebook.svg" onerror="this.src='../contents/webImages/SocialIcons/Facebook.png'; this.onerror=null;"/></a> | ||
| <a target="_blank" href="https://twitter.com/parts3492"><img src="../contents/webImages/SocialIcons/Twitter.svg" onerror="this.src='../contents/webImages/SocialIcons/Twitter.png'; this.onerror=null;"/></a> | ||
| <a target="_blank" href="https://www.youtube.com/channel/UCIq35DtgjUsKJB3blFbSXrQ"><img src="../contents/webImages/SocialIcons/YouTube.svg" onerror="this.src='../contents/webImages/SocialIcons/YouTube.png'; this.onerror=null;"/></a> | ||
| <a target="_blank" href="https://github.com/3492PARTs"><img src="../contents/webImages/SocialIcons/GitHub.svg" onerror="this.src='../contents/webImages/SocialIcons/GitHub.png'; this.onerror=null;"/></a> | ||
| <a href="mailto:[email protected]"><img src="../contents/webImages/SocialIcons/Email.svg" onerror="this.src='../contents/webImages/SocialIcons/Email.png'; this.onerror=null;"/></a> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,7 +20,7 @@ | |
| <tbody> | ||
| <tr> | ||
| <td id="homeBot"> | ||
| <p style="padding: 0; margin:0;"><a href="/"><img src="../contents/webImages/Robots/BeanieBot.svg" onerror="this.src='../contents/webImages/Robots/BeanieBot.png'; this.onerror=null;"></a></p> | ||
| <p style="padding: 0; margin:0;"><a href="/"><img src="../contents/webImages/Robots/BeanieBot.svg" onerror="this.src='../contents/webImages/Robots/BeanieBot.png'; this.onerror=null;"/></a></p> | ||
| </td> | ||
| <td class="homeWord" style="width: 14em; height:5em;"> | ||
| <!--Spacer for mobile nav, not displayed on desktop--> | ||
|
|
@@ -62,7 +62,7 @@ | |
| <span class="circle"></span> | ||
| </div> | ||
|
|
||
| <div id="blueBlock"> <a href="/"><img src="../contents/webImages/Robots/BeanieBot.png"/></a> | ||
| <div id="blueBlock"> <a href="/"><img src="../contents/webImages/Robots/BeanieBot.svg" onerror="this.src='../contents/webImages/Robots/BeanieBot.png'; this.onerror=null;"/></a> | ||
| </div> | ||
|
|
||
| <div id="wrapper"> | ||
|
|
@@ -74,18 +74,18 @@ | |
| </div> | ||
| <div id="footer"> | ||
| <div id="footer_accent"> | ||
| <a id="footerArrow" href="#top"><img src="../contents/webImages/UpAlt.png"/></a> | ||
| <a id="footerArrow" href="#top"><img src="../contents/webImages/return.svg" onerror="this.src='../contents/webImages/return.png'; this.onerror=null;" alt="Return to Top"/></a> | ||
| </div> | ||
| <div id="footerContent"> | ||
| <div id="connect"> | ||
| <h2>CONNECT WITH PARTs</h2> | ||
| </div> | ||
| <div id="connectSocial"> | ||
| <a target="_blank" href="https://www.facebook.com/team3492"><img src="../contents/webImages/SocialIcons/Facebook.svg" onerror="this.src='../contents/webImages/SocialIcons/Facebook.png'; this.onerror=null;"></a> | ||
| <a target="_blank" href="https://twitter.com/parts3492"><img src="../contents/webImages/SocialIcons/Twitter.svg" onerror="this.src='../contents/webImages/SocialIcons/Twitter.png'; this.onerror=null;"></a> | ||
| <a target="_blank" href="https://www.youtube.com/channel/UCIq35DtgjUsKJB3blFbSXrQ"><img src="../contents/webImages/SocialIcons/YouTube.svg" onerror="this.src='../contents/webImages/SocialIcons/YouTube.png'; this.onerror=null;"></a> | ||
| <a target="_blank" href="https://github.com/3492PARTs"><img src="../contents/webImages/SocialIcons/GitHub.svg" onerror="this.src='../contents/webImages/SocialIcons/GitHub.png'; this.onerror=null;"></a> | ||
| <a href="mailto:[email protected]"><img src="../contents/webImages/SocialIcons/Email.svg" onerror="this.src='../contents/webImages/SocialIcons/Email.png'; this.onerror=null;"></a> | ||
| <a target="_blank" href="https://www.facebook.com/team3492"><img src="../contents/webImages/SocialIcons/Facebook.svg" onerror="this.src='../contents/webImages/SocialIcons/Facebook.png'; this.onerror=null;"/></a> | ||
| <a target="_blank" href="https://twitter.com/parts3492"><img src="../contents/webImages/SocialIcons/Twitter.svg" onerror="this.src='../contents/webImages/SocialIcons/Twitter.png'; this.onerror=null;"/></a> | ||
| <a target="_blank" href="https://www.youtube.com/channel/UCIq35DtgjUsKJB3blFbSXrQ"><img src="../contents/webImages/SocialIcons/YouTube.svg" onerror="this.src='../contents/webImages/SocialIcons/YouTube.png'; this.onerror=null;"/></a> | ||
| <a target="_blank" href="https://github.com/3492PARTs"><img src="../contents/webImages/SocialIcons/GitHub.svg" onerror="this.src='../contents/webImages/SocialIcons/GitHub.png'; this.onerror=null;"/></a> | ||
| <a href="mailto:[email protected]"><img src="../contents/webImages/SocialIcons/Email.svg" onerror="this.src='../contents/webImages/SocialIcons/Email.png'; this.onerror=null;"/></a> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,7 +20,7 @@ | |
| <tbody> | ||
| <tr> | ||
| <td id="homeBot"> | ||
| <p style="padding: 0; margin:0;"><a href="/"><img src="../contents/webImages/Robots/BeanieBot.svg" onerror="this.src='../contents/webImages/Robots/BeanieBot.png'; this.onerror=null;"></a></p> | ||
| <p style="padding: 0; margin:0;"><a href="/"><img src="../contents/webImages/Robots/BeanieBot.svg" onerror="this.src='../contents/webImages/Robots/BeanieBot.png'; this.onerror=null;"/></a></p> | ||
| </td> | ||
| <td class="homeWord" style="width: 14em; height:5em;"> | ||
| <!--Spacer for mobile nav, not displayed on desktop--> | ||
|
|
@@ -62,7 +62,7 @@ | |
| <span class="circle"></span> | ||
| </div> | ||
|
|
||
| <div id="blueBlock"> <a href="/"><img src="../contents/webImages/Robots/BeanieBot.png"/></a> | ||
| <div id="blueBlock"> <a href="/"><img src="../contents/webImages/Robots/BeanieBot.svg" onerror="this.src='../contents/webImages/Robots/BeanieBot.png'; this.onerror=null;"/></a> | ||
| </div> | ||
|
|
||
| <div id="wrapper"> | ||
|
|
@@ -195,18 +195,18 @@ <h4>89</h4> | |
| </div> | ||
| <div id="footer"> | ||
| <div id="footer_accent"> | ||
| <a id="footerArrow" href="#top"><img src="../contents/webImages/UpAlt.png"/></a> | ||
| <a id="footerArrow" href="#top"><img src="../contents/webImages/return.svg" onerror="this.src='../contents/webImages/return.png'; this.onerror=null;" alt="Return to Top"/></a> | ||
| </div> | ||
| <div id="footerContent"> | ||
| <div id="connect"> | ||
| <h2>CONNECT WITH PARTs</h2> | ||
| </div> | ||
| <div id="connectSocial"> | ||
| <a target="_blank" href="https://www.facebook.com/team3492"><img src="../contents/webImages/SocialIcons/Facebook.svg" onerror="this.src='../contents/webImages/SocialIcons/Facebook.png'; this.onerror=null;"></a> | ||
| <a target="_blank" href="https://twitter.com/parts3492"><img src="../contents/webImages/SocialIcons/Twitter.svg" onerror="this.src='../contents/webImages/SocialIcons/Twitter.png'; this.onerror=null;"></a> | ||
| <a target="_blank" href="https://www.youtube.com/channel/UCIq35DtgjUsKJB3blFbSXrQ"><img src="../contents/webImages/SocialIcons/YouTube.svg" onerror="this.src='../contents/webImages/SocialIcons/YouTube.png'; this.onerror=null;"></a> | ||
| <a target="_blank" href="https://github.com/3492PARTs"><img src="../contents/webImages/SocialIcons/GitHub.svg" onerror="this.src='../contents/webImages/SocialIcons/GitHub.png'; this.onerror=null;"></a> | ||
| <a href="mailto:[email protected]"><img src="../contents/webImages/SocialIcons/Email.svg" onerror="this.src='../contents/webImages/SocialIcons/Email.png'; this.onerror=null;"></a> | ||
| <a target="_blank" href="https://www.facebook.com/team3492"><img src="../contents/webImages/SocialIcons/Facebook.svg" onerror="this.src='../contents/webImages/SocialIcons/Facebook.png'; this.onerror=null;"/></a> | ||
| <a target="_blank" href="https://twitter.com/parts3492"><img src="../contents/webImages/SocialIcons/Twitter.svg" onerror="this.src='../contents/webImages/SocialIcons/Twitter.png'; this.onerror=null;"/></a> | ||
| <a target="_blank" href="https://www.youtube.com/channel/UCIq35DtgjUsKJB3blFbSXrQ"><img src="../contents/webImages/SocialIcons/YouTube.svg" onerror="this.src='../contents/webImages/SocialIcons/YouTube.png'; this.onerror=null;"/></a> | ||
| <a target="_blank" href="https://github.com/3492PARTs"><img src="../contents/webImages/SocialIcons/GitHub.svg" onerror="this.src='../contents/webImages/SocialIcons/GitHub.png'; this.onerror=null;"/></a> | ||
| <a href="mailto:[email protected]"><img src="../contents/webImages/SocialIcons/Email.svg" onerror="this.src='../contents/webImages/SocialIcons/Email.png'; this.onerror=null;"/></a> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,7 +20,7 @@ | |
| <tbody> | ||
| <tr> | ||
| <td id="homeBot"> | ||
| <p style="padding: 0; margin:0;"><a href="/"><img src="../contents/webImages/Robots/BeanieBot.svg" onerror="this.src='../contents/webImages/Robots/BeanieBot.png'; this.onerror=null;"></a></p> | ||
| <p style="padding: 0; margin:0;"><a href="/"><img src="../contents/webImages/Robots/BeanieBot.svg" onerror="this.src='../contents/webImages/Robots/BeanieBot.png'; this.onerror=null;"/></a></p> | ||
| </td> | ||
| <td class="homeWord" style="width: 14em; height:5em;"> | ||
| <!--Spacer for mobile nav, not displayed on desktop--> | ||
|
|
@@ -62,13 +62,14 @@ | |
| <span class="circle"></span> | ||
| </div> | ||
|
|
||
| <div id="blueBlock"> <a href="/"><img src="../contents/webImages/Robots/BeanieBot.png"/></a> | ||
| <div id="blueBlock"> <a href="/"><img src="../contents/webImages/Robots/BeanieBot.svg" onerror="this.src='../contents/webImages/Robots/BeanieBot.png'; this.onerror=null;"/></a> | ||
| </div> | ||
|
|
||
| <div id="wrapper"> | ||
| <div id="moverBlock"></div> | ||
| <div id="content"> | ||
| <div id="contact"> | ||
| <h2><a href="../Join/">Interested in Joining P.A.R.T.s?</a></h2> | ||
| <h2>CONTACT US THROUGH ANY SOCIAL MEDIA OR EMAIL <a href="mailto:[email protected]">[email protected]</a></h2> | ||
| <h2>FIND US ON THURSDAYS AT PCTC IN ELEANOR!</h2> | ||
| <div id="mapWrapper"> | ||
|
|
@@ -78,18 +79,18 @@ <h2>FIND US ON THURSDAYS AT PCTC IN ELEANOR!</h2> | |
| </div> | ||
| <div id="footer"> | ||
| <div id="footer_accent"> | ||
| <a id="footerArrow" href="#top"><img src="../contents/webImages/UpAlt.png"/></a> | ||
| <a id="footerArrow" href="#top"><img src="../contents/webImages/return.svg" onerror="this.src='../contents/webImages/return.png'; this.onerror=null;" alt="Return to Top"/></a> | ||
| </div> | ||
| <div id="footerContent"> | ||
| <div id="connect"> | ||
| <h2>CONNECT WITH PARTs</h2> | ||
| </div> | ||
| <div id="connectSocial"> | ||
| <a target="_blank" href="https://www.facebook.com/team3492"><img src="../contents/webImages/SocialIcons/Facebook.svg" onerror="this.src='../contents/webImages/SocialIcons/Facebook.png'; this.onerror=null;"></a> | ||
| <a target="_blank" href="https://twitter.com/parts3492"><img src="../contents/webImages/SocialIcons/Twitter.svg" onerror="this.src='../contents/webImages/SocialIcons/Twitter.png'; this.onerror=null;"></a> | ||
| <a target="_blank" href="https://www.youtube.com/channel/UCIq35DtgjUsKJB3blFbSXrQ"><img src="../contents/webImages/SocialIcons/YouTube.svg" onerror="this.src='../contents/webImages/SocialIcons/YouTube.png'; this.onerror=null;"></a> | ||
| <a target="_blank" href="https://github.com/3492PARTs"><img src="../contents/webImages/SocialIcons/GitHub.svg" onerror="this.src='../contents/webImages/SocialIcons/GitHub.png'; this.onerror=null;"></a> | ||
| <a href="mailto:[email protected]"><img src="../contents/webImages/SocialIcons/Email.svg" onerror="this.src='../contents/webImages/SocialIcons/Email.png'; this.onerror=null;"></a> | ||
| <a target="_blank" href="https://www.facebook.com/team3492"><img src="../contents/webImages/SocialIcons/Facebook.svg" onerror="this.src='../contents/webImages/SocialIcons/Facebook.png'; this.onerror=null;"/></a> | ||
| <a target="_blank" href="https://twitter.com/parts3492"><img src="../contents/webImages/SocialIcons/Twitter.svg" onerror="this.src='../contents/webImages/SocialIcons/Twitter.png'; this.onerror=null;"/></a> | ||
| <a target="_blank" href="https://www.youtube.com/channel/UCIq35DtgjUsKJB3blFbSXrQ"><img src="../contents/webImages/SocialIcons/YouTube.svg" onerror="this.src='../contents/webImages/SocialIcons/YouTube.png'; this.onerror=null;"/></a> | ||
| <a target="_blank" href="https://github.com/3492PARTs"><img src="../contents/webImages/SocialIcons/GitHub.svg" onerror="this.src='../contents/webImages/SocialIcons/GitHub.png'; this.onerror=null;"/></a> | ||
| <a href="mailto:[email protected]"><img src="../contents/webImages/SocialIcons/Email.svg" onerror="this.src='../contents/webImages/SocialIcons/Email.png'; this.onerror=null;"/></a> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
Oops, something went wrong.