Browse files

Merge branch 'master' of github.com:jtrain/nmt

merged Dan's junk into mainline

Conflicts:
	views/index.tpl
  • Loading branch information...
2 parents 4402e9a + d3f41ac commit b83ff44f6f7d6cc2435456a5a2171abdce8ee13b @jtrain committed Mar 12, 2012
Showing with 24 additions and 9 deletions.
  1. +16 −0 static/css/nmt.css
  2. +6 −8 views/index.tpl
  3. +2 −1 views/theme_base.tpl
View
16 static/css/nmt.css
@@ -0,0 +1,16 @@
+table.game{
+ width:100%;
+}
+td.home {
+ text-align:right;
+}
+td.score {
+ text-align:center;
+}
+td.away {
+ text-align:left;
+}
+
+td .btn, table {
+ width: 100%;
+}
View
14 views/index.tpl
@@ -1,16 +1,14 @@
%rebase theme_base title=title
<style>
-td .btn, table {
- width: 100%;
-}
+
</style>
<form class="pick hidden" method="POST" action="/">
<div class='row-fluid'>
<div class="span12">
<div class="hero-unit">
<h1>Pick your team!</h1>
- <table style="width: 100%;">
+ <table class='game'>
%for game in games:
<tr>
<td>
@@ -34,13 +32,13 @@ td .btn, table {
<div class="span12">
<div class="hero-unit">
<h1>Game Results</h1>
- <table class="table table-striped" style="width: 100%;">
+ <table class="game table table-striped">
%for game in games:
<tr>
- <td>
+ <td class='home'>
{{ game.home_name}}
</td>
- <td>
+ <td class='score'>
%if game.home_score == None:
vs
%else:
@@ -54,7 +52,7 @@ td .btn, table {
</div>
%end
</td>
- <td>
+ <td class='away'>
{{ game.away_name}}
</td>
</tr>
View
3 views/theme_base.tpl
@@ -17,6 +17,7 @@
}
</style>
<link href="{{ get_url('static', path="css/bootstrap-responsive.css") }}" rel="stylesheet">
+ <link rel="stylesheet" href="{{ get_url('static', path='css/nmt.css') }}">
</head>
<body>
@@ -29,7 +30,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
- <a class="brand" href="#">{{ sitename }}</a>
+ <a class="brand" href="{{ get_url('index') }}">{{ sitename }}</a>
<div class="nav-collapse">
<ul class="nav">
<li class="active"><a href="{{get_url('index')}}">Home</a></li>

0 comments on commit b83ff44

Please sign in to comment.