Skip to content

Commit

Permalink
Merge pull request #5 from 3492PARTs/DEV
Browse files Browse the repository at this point in the history 
New Nav and 404 Page
  • Loading branch information
@bduke-dev
bduke-dev committed May 16, 2016
2 parents 6f38b1a + 5a86db1 commit 29e63fc
Show file tree
Hide file tree
Showing 24 changed files with 671 additions and 861 deletions.
1 change: 1 addition & 0 deletions .htaccess
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ErrorDocument 404 /notFound.html
64 changes: 22 additions & 42 deletions Calendar/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,46 +13,27 @@
<link rel='stylesheet' media='screen and (min-width: 1001px)' href='../css/wideScreen.css'/>
</head>
<body id="top">
<table class="navigation">
<thead>

</thead>
<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>
</td>
<td class="homeWord" style="width: 14em; height:5em;">
<!--Spacer for mobile nav, not displayed on desktop-->
</td>
<td class="homeWord">
<p><a href="../">HOME</a></p>
</td>
<td>
<p><a href="../Contact-Us/">CONTACT US</a></p>
</td>
<td>
<p><a href="../Sponsoring/">SPONSORING</a></p>
</td>
<td>
<p><a href="../About-PARTs/">ABOUT PARTs</a></p>
</td>
<td>
<p><a href="../Media/">MEDIA</a></p>
</td>
<td>
<p><a href="../Team-Resources/">FOR MEMBERS</a></p>
</td>
<td>
<p><a style="color: #808080;" href="../Calendar/">CALENDAR</a></p>
</td>
<td>
<p><a href="../FIRST/">ABOUT FIRST & THE GAME</a></p>
</td>
</tr>
</tbody>
</table>

<header id="headerNav">
<a href="../"><img src="../contents/webImages/Robots/BeanieBot.svg" onerror="this.src='../contents/webImages/Robots/BeanieBot.png'; this.onerror=null;"/></a>
<nav id="nav">
<ul>
<li id="navHome"><p>-</p></li> <!--Spacer for mobile nav-->
<li id="navHome"><p><a href="../">HOME</a></p></li>
<li><p><a href="../contact/">CONTACT US</a></p>
<ul id="subNav1">
<li><p><a href="../join/">JOIN</a></p></li>
</ul>
</li>
<li><p><a href="../sponsoring/">SPONSORING</a></p></li>
<li><p><a href="../about/">ABOUT PARTs</a></p></li>
<li><p><a href="../media/">MEDIA</a></p></li>
<li><p><a href="../resources/">RESOURCES</a></p></li>
<li><p><a class="currentPage" href="../calendar/">CALENDAR</a></p></li>
<li><p><a href="../first/">FIRST</a></p></li>
</ul>
</nav>
</header>

<input type="checkbox" id="nav-trigger" class="nav-trigger"/>

<div class="clear-menu-btn">
Expand All @@ -62,8 +43,7 @@
<span class="circle"></span>
</div>

<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="blueBlock"></div>

<div id="wrapper">
<div id="moverBlock"></div>
Expand Down
64 changes: 22 additions & 42 deletions Competition/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,46 +13,27 @@
<link rel='stylesheet' media='screen and (min-width: 1001px)' href='../css/wideScreen.css'/>
</head>
<body id="top">
<table class="navigation">
<thead>

</thead>
<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>
</td>
<td class="homeWord" style="width: 14em; height:5em;">
<!--Spacer for mobile nav, not displayed on desktop-->
</td>
<td class="homeWord">
<p><a href="../">HOME</a></p>
</td>
<td>
<p><a href="../Contact-Us/">CONTACT US</a></p>
</td>
<td>
<p><a href="../Sponsoring/">SPONSORING</a></p>
</td>
<td>
<p><a href="../About-PARTs/">ABOUT PARTs</a></p>
</td>
<td>
<p><a href="../Media/">MEDIA</a></p>
</td>
<td>
<p><a href="../Team-Resources/">FOR MEMBERS</a></p>
</td>
<td>
<p><a href="../Calendar/">CALENDAR</a></p>
</td>
<td>
<p><a href="../FIRST/">ABOUT FIRST & THE GAME</a></p>
</td>
</tr>
</tbody>
</table>

<header id="headerNav">
<a href="../"><img src="../contents/webImages/Robots/BeanieBot.svg" onerror="this.src='../contents/webImages/Robots/BeanieBot.png'; this.onerror=null;"/></a>
<nav id="nav">
<ul>
<li id="navHome"><p>-</p></li> <!--Spacer for mobile nav-->
<li id="navHome"><p><a href="../">HOME</a></p></li>
<li><p><a href="../contact/">CONTACT US</a></p>
<ul id="subNav1">
<li><p><a href="../join/">JOIN</a></p></li>
</ul>
</li>
<li><p><a href="../sponsoring/">SPONSORING</a></p></li>
<li><p><a href="../about/">ABOUT PARTs</a></p></li>
<li><p><a href="../media/">MEDIA</a></p></li>
<li><p><a href="../resources/">RESOURCES</a></p></li>
<li><p><a href="../calendar/">CALENDAR</a></p></li>
<li><p><a href="../first/">FIRST</a></p></li>
</ul>
</nav>
</header>

<input type="checkbox" id="nav-trigger" class="nav-trigger"/>

<div class="clear-menu-btn">
Expand All @@ -62,8 +43,7 @@
<span class="circle"></span>
</div>

<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="blueBlock"></div>

<div id="wrapper">
<div id="moverBlock"></div>
Expand Down
64 changes: 22 additions & 42 deletions EGG/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,46 +12,27 @@
<link rel='stylesheet' media='screen and (min-width: 1001px)' href='../css/wideScreen.css'/>
</head>
<body id="top">
<table class="navigation">
<thead>

</thead>
<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>
</td>
<td class="homeWord" style="width: 14em; height:5em;">
<!--Spacer for mobile nav, not displayed on desktop-->
</td>
<td class="homeWord">
<p><a href="../">HOME</a></p>
</td>
<td>
<p><a href="../Contact-Us/">CONTACT US</a></p>
</td>
<td>
<p><a href="../Sponsoring/">SPONSORING</a></p>
</td>
<td>
<p><a href="../About-PARTs/">ABOUT PARTs</a></p>
</td>
<td>
<p><a href="../Media/">MEDIA</a></p>
</td>
<td>
<p><a href="../Team-Resources/">FOR MEMBERS</a></p>
</td>
<td>
<p><a href="../Calendar/">CALENDAR</a></p>
</td>
<td>
<p><a href="../FIRST/">ABOUT FIRST & THE GAME</a></p>
</td>
</tr>
</tbody>
</table>

<header id="headerNav">
<a href="../"><img src="../contents/webImages/Robots/BeanieBot.svg" onerror="this.src='../contents/webImages/Robots/BeanieBot.png'; this.onerror=null;"/></a>
<nav id="nav">
<ul>
<li id="navHome"><p>-</p></li> <!--Spacer for mobile nav-->
<li id="navHome"><p><a href="../">HOME</a></p></li>
<li><p><a href="../contact/">CONTACT US</a></p>
<ul id="subNav1">
<li><p><a href="../join/">JOIN</a></p></li>
</ul>
</li>
<li><p><a href="../sponsoring/">SPONSORING</a></p></li>
<li><p><a href="../about/">ABOUT PARTs</a></p></li>
<li><p><a href="../media/">MEDIA</a></p></li>
<li><p><a href="../resources/">RESOURCES</a></p></li>
<li><p><a href="../calendar/">CALENDAR</a></p></li>
<li><p><a href="../first/">FIRST</a></p></li>
</ul>
</nav>
</header>

<input type="checkbox" id="nav-trigger" class="nav-trigger"/>

<div class="clear-menu-btn">
Expand All @@ -61,8 +42,7 @@
<span class="circle"></span>
</div>

<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="blueBlock"></div>

<div id="wrapper">
<div id="moverBlock"></div>
Expand Down
68 changes: 24 additions & 44 deletions FIRST/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>About FIRST & The Game | PARTs</title>
<title>FIRST | PARTs</title>
<meta name="FIRST" content="A brief history of FIRST Robotics"/>
<meta name="theme-color" content="#808080">
<meta name="viewport" content="width=device-width, initial-scale=1">
Expand All @@ -13,46 +13,27 @@
<link rel='stylesheet' media='screen and (min-width: 1001px)' href='../css/wideScreen.css'/>
</head>
<body id="top">
<table class="navigation">
<thead>

</thead>
<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>
</td>
<td class="homeWord" style="width: 14em; height:5em;">
<!--Spacer for mobile nav, not displayed on desktop-->
</td>
<td class="homeWord">
<p><a href="../">HOME</a></p>
</td>
<td>
<p><a href="../Contact-Us/">CONTACT US</a></p>
</td>
<td>
<p><a href="../Sponsoring/">SPONSORING</a></p>
</td>
<td>
<p><a href="../About-PARTs/">ABOUT PARTs</a></p>
</td>
<td>
<p><a href="../Media/">MEDIA</a></p>
</td>
<td>
<p><a href="../Team-Resources/">FOR MEMBERS</a></p>
</td>
<td>
<p><a href="../Calendar/">CALENDAR</a></p>
</td>
<td>
<p><a style="color: #808080;" href="../FIRST/">ABOUT FIRST & THE GAME</a></p>
</td>
</tr>
</tbody>
</table>

<header id="headerNav">
<a href="../"><img src="../contents/webImages/Robots/BeanieBot.svg" onerror="this.src='../contents/webImages/Robots/BeanieBot.png'; this.onerror=null;"/></a>
<nav id="nav">
<ul>
<li id="navHome"><p>-</p></li> <!--Spacer for mobile nav-->
<li id="navHome"><p><a href="../">HOME</a></p></li>
<li><p><a href="../contact/">CONTACT US</a></p>
<ul id="subNav1">
<li><p><a href="../join/">JOIN</a></p></li>
</ul>
</li>
<li><p><a href="../sponsoring/">SPONSORING</a></p></li>
<li><p><a href="../about/">ABOUT PARTs</a></p></li>
<li><p><a href="../media/">MEDIA</a></p></li>
<li><p><a href="../resources/">RESOURCES</a></p></li>
<li><p><a href="../calendar/">CALENDAR</a></p></li>
<li><p><a class="currentPage" href="../first/">FIRST</a></p></li>
</ul>
</nav>
</header>

<input type="checkbox" id="nav-trigger" class="nav-trigger"/>

<div class="clear-menu-btn">
Expand All @@ -62,8 +43,7 @@
<span class="circle"></span>
</div>

<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="blueBlock"></div>

<div id="wrapper">
<div id="moverBlock"></div>
Expand All @@ -77,7 +57,7 @@
<tr>
<td>
<h2>What is FIRST?</h2>
<p>FIRST Robotics is an organization that was founded in 1989 by Dean Kamen. The mission of FIRST is to, "...inspire young people to be science and technology leaders, by engaging them in exciting mentor-based programs that build science, engineering and technology skills, that inspire innovation, and that foster well-rounded life capabilities including self-confidence, communication, and leadership..." (USFIRST website). It offers opportunities for scholarships and promotes good sportsmanship and cooperation.</p>
<p>FIRST Robotics is an organization that was founded in 1989 by Dean Kamen. The mission of FIRST is to, "...inspire young people to be science and technology leaders, by engaging them in exciting mentor-based programs that build science, engineering and technology skills, that inspire innovation, and that foster well-rounded life capabilities including self-confidence, communication, and leadership..." <a target="_blank" href="http://www.firstinspires.org/">(FIRST website)</a>. It offers opportunities for scholarships and promotes good sportsmanship and cooperation.</p>
<h2>What does FIRST stand for?</h2>
<ul>
<li><p>For</p></li>
Expand Down
Loading

0 comments on commit 29e63fc

Please sign in to comment.