Merge branch 'master' into changes_for_2015_game

This commit is contained in:
Patrick Fairbank
2015-08-21 20:57:14 -07:00
11 changed files with 163 additions and 78 deletions

View File

@@ -24,7 +24,7 @@
{{template "ftaTeam" dict "color" "B" "position" 3 "data" .}}
</div>
<div class="col-lg-6 well well-darkred">
<div class="row form-group">
<div class="row form-group hidden-xs">
<div class="col-xs-3">Red Teams</div>
<div class="col-xs-1" data-toggle="tooltip" title="Driver Station (Tx/Rx MB/s)">DS</div>
<div class="col-xs-1" data-toggle="tooltip" title="Robot Status/Time Since Last Link">R</div>