Permalink
Browse files

Merge branch 'master' of github.com:mozilla/doozer

  • Loading branch information...
James Socol
James Socol committed Dec 2, 2010
2 parents e55468b + 78fc646 commit 321c363db5468b125523b3564a1b9589755b97ff
@@ -5,7 +5,7 @@ def nav(request):
'menu' : [
('Competition Home', 'home'),
('Rules', 'rules'),
('Judging', 'judging'),
('Judges', 'judges'),
('Prizes', 'prizes'),
('Resources', 'resources'),
],

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -429,6 +429,7 @@ body.errorpage h3 {
header:after,
article:after,
.judges:after,
.judges div:after,
#content:after,
.game:after {
content: ".";
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
View
@@ -70,4 +70,4 @@ $(document).ready(function() {
$(window).resize(positionSmoke);
setTimeout(positionSmoke, 100);
}
});
});
View
@@ -14,6 +14,7 @@
url(r'^rules$', direct_to_template, {'template': 'static/rules.html'}, name='rules'),
url(r'^fineprint$', direct_to_template, {'template': 'static/fineprint.html'}, name='fineprint'),
url(r'^prizes$', direct_to_template, {'template': 'static/prizes.html'}, name='prizes'),
url(r'^judges$', direct_to_template, {'template': 'static/judges.html'}, name='judges'),
url(r'^judging$', direct_to_template, {'template': 'static/judging.html'}, name='judging'),
url(r'^resources$', direct_to_template, {'template': 'static/resources.html'}, name='resources'),
)

0 comments on commit 321c363

Please sign in to comment.