Skip to content

Commit

Permalink
Added to the competition page and updated the CSS slightly
Browse files Browse the repository at this point in the history
  • Loading branch information
Danyc0 committed May 16, 2013
1 parent 0c45ab9 commit dc32af1
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion aboutTheBoat.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ <h1>Aber SailBot - About The Boat</h1>
</div>
</div>
<div id="content">
<img id="boatLab" src="img/boatLab.jpg" alt="The Boat in the lab"/>
<img class="floatRightImage" src="img/boatLab.jpg" alt="The Boat in the lab"/>
<h2>Overview</h2>
<p>Our entry this year is a 1.3 meter long custom built fibreglass boat. It uses a combination of an electronic compass, a GPS receiver and a wind sensor to detect its orientation, position and the wind direction. These are connected to a Raspberry Pi, which is a cheap single board ARM based computer, running Linux, and an Arduino Uno micro-controller board. The sail is controlled by an electronic winch and the rudder by a servo motor, both controlled by the Arduino.</p>
<h2>Specifics</h2>
Expand Down
7 changes: 5 additions & 2 deletions aboutTheCompetition.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@ <h1>Aber SailBot - About The Competition</h1>
</div>
</div>
<div id="content">
<p>The Sailbot competition is an annual competition between student teams, we are the only one of the 16 teams competing that are entering from outside of the US and Canada. Among the other competing teams are the US Naval Academy and the University of British Columbia. Sailing robots need a variety of skills from computer science, naval architecture, and engineering in order to be successful. They have a wide variety of applications such as pollution monitoring, marine biology and border surveillance.</p>

<img class="floatRightImage" src="img/sailbotLogo.png" alt="The Sailbot 2013 Logo"/>
<p>The Sailbot competition is an annual competition between student teams.</p>
<p>We are the only one of the 16 teams competing this year that are entering from outside of the US and Canada. Among the other competing teams are the US Naval Academy and the University of British Columbia.</p>
<p>The competition prides itself on how well rounded it's competitors need to be to succeed. A good robotic sailing team need a variety of key skills varying from computer science, naval architecture, engineering, team working and team management, as well as the sailing experience which gives a key advantage to any team, like ours, that has it.</p>
<p>Sailing robots themselves have a wide variety of applications, which the competition, whether intentional or not, promts inovation into. These include pollution monitoring, marine biology, oceanographic mapping, border surveillance, and in the future (as with robotic cars) even transport.</p>
<p>This year Sailbot is being held in the city of Gloucester, near Boston, Massachusetts, in June 2013.</p>
</div>
<div id="foot">
Expand Down
2 changes: 1 addition & 1 deletion meetTheTeam.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ <h2>The Team</h2>
</div>

<div id="intros">
<img src="img/theTeam.jpg" alt="Meet The Team"/>
<img class="floatRightImage" src="img/theTeam.jpg" alt="Meet The Team"/>
<h2>Intro's</h2>
<h3>Louis Taylor</h3>
<ul>
Expand Down
5 changes: 2 additions & 3 deletions style.css
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ a.current, a.menuItem:hover
padding-left: 14em;
}


#intros img, #boatLab
.floatRightImage
{
float: right;
margin-bottom: 1em;
Expand All @@ -92,7 +91,7 @@ a.current, a.menuItem:hover

form
{
padding-left: 1em;
padding-left:1em;
padding-right: 1em;
}

Expand Down

0 comments on commit dc32af1

Please sign in to comment.