Merge branch 'master' of github.com:jamesturk/fowl

This commit is contained in:
James Turk 2012-05-28 00:41:21 -04:00
commit 4d5cb7a5ea
2 changed files with 11 additions and 7 deletions

View File

@ -5,19 +5,21 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>{% block title %} {% endblock %}</title> <title>{% block title %} {% endblock %}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="shortcut icon" href="{% static "favicon.ico" %}" />
<link href="{% static "css/bootstrap.css" %}" rel="stylesheet"> <link href="{% static "css/bootstrap.css" %}" rel="stylesheet">
<style type="text/css"> <style type="text/css">
body { body {
padding-top: 60px; padding-top: 60px;
padding-bottom: 40px; padding-bottom: 40px;
} }
.event-title { font-size: 125%; } .accordion-heading .event-title { font-size: 125%; display: inline;}
.accordion-heading { padding: 10px 0px;}
.match-notes { font-size: 80%; color: #999999; } .match-notes { font-size: 80%; color: #999999; }
.belt-img img { display: block; margin-left: auto; margin-right: auto } .belt-img img { display: block; margin-left: auto; margin-right: auto }
.raw { float: right; margin-right:12em; background-color: #900000;} .raw { float: right; margin-right:12em; background-color: #900000;}
.divas { float: right; margin-right:11em; background-color: #900099;} .divas { float: right; margin-right:11em; background-color: #900099;}
.smackdown { float: right; margin-right:8em; background-color: #003090;} .smackdown { float: right; margin-right:8em; background-color: #003090;}
.score-container { float: right; margin-right:20em;}
</style> </style>
<link href="{% static "assets/css/bootstrap-responsive.css" %}" rel="stylesheet"> <link href="{% static "assets/css/bootstrap-responsive.css" %}" rel="stylesheet">

View File

@ -15,14 +15,16 @@ PPVs, since the creation of this league.</p>
<div class="accordion-heading"> <div class="accordion-heading">
<a class="accordion-toggle event-title" data-toggle="collapse" <a class="accordion-toggle event-title" data-toggle="collapse"
data-parent="#accordion" href="#event-{{event.id}}"> data-parent="#accordion" href="#event-{{event.id}}">
{{event.name}} - {{event.date}} {{event.name}} - {{event.date}}
</a> </a>
{% for team,score in event.scores.iteritems %} <span class="score-container">
{{team}}: {{score}} {% for team,score in event.scores.iteritems %}
{% endfor %} <span class="label" style="background-color: #00aa00;">{{team}}: {{score}}</span>
{% endfor %}
</span>
</div> </div>
<div id="event-{{event.id}}" class="accordion-body collapse in"> <div id="event-{{event.id}}" class="accordion-body collapse">
<div class="accordion-inner"> <div class="accordion-inner">
<table class="table"> <table class="table">
<thead> <thead>