Permalink
Browse files

Merge remote-tracking branch 'craigcook/develop' into develop

  • Loading branch information...
2 parents 5b28a62 + 694ea03 commit c402cdc0144802acc4b645d13e36156b58237029 @pmac pmac committed May 17, 2012
Showing with 8 additions and 15 deletions.
  1. +0 −2 flicks/base/templates/shared/header.html
  2. +1 −1 flicks/base/templates/shared/macros.html
  3. +7 −12 media/css/main.css
@@ -12,8 +12,6 @@
{% endif %}
<li><a href="{{ url('flicks.videos.recent')}}"
title="{{ _('Videos') }}">{{ _('Videos') }}</a></li>
- <li><a href="{{ url('flicks.base.creative')}}"
- title="{{ _('Creative Brief') }}">{{ _('Creative Brief') }}</a></li>
<li><a href="{{ url('flicks.base.judges') }}"
title="{{ _('Judges') }}">{{ _('Judges') }}</a></li>
<li><a href="{{ url('flicks.base.prizes') }}"
@@ -164,7 +164,7 @@
{% macro large_award(award) -%}
<h2 class="title">
<a href="{{ award.video_href }}">
- <img src="{{ award.video_preview }}" alt="{{ award.video_title }}" width="600" height="342">
+ <img src="{{ award.video_preview }}" alt="{{ award.video_title }}" width="600">
{{ award.video_title }}
</a>
</h2>
View
@@ -344,7 +344,7 @@ html[lang="tr"] #header {
height: 86px;
}
-.winners #header {
+body.winners #header {
background-image: none;
}
@@ -414,18 +414,13 @@ body.winners #header {
.winners .winners-head h1 {
text-align: left;
float: none;
- color: #e25b31;
+ color: #fbae53;
font-size: 72px;
line-height: 1;
- padding: 30px 0 0 360px;
+ padding: 30px 100px 0 360px;
min-height: 165px;
}
-.winners .winners-head h1 span {
- display: block;
- color: #fbae53;
-}
-
.winner-mark {
position: absolute;
right: 10px;
@@ -649,7 +644,7 @@ body.winners #header {
}
.runnerups li {
- width: 22%;
+ width: 30%;
margin: 0 3% 0 0;
float: left;
}
@@ -733,7 +728,7 @@ body.winners #header {
}
.category li {
- width: 22%;
+ width: 30%;
margin: 0 3% 0 0;
float: left;
}
@@ -961,7 +956,7 @@ body.winners #header {
height: 116px;
}
- .winners #header {
+ body.winners #header {
background-image: none;
}
@@ -1107,7 +1102,7 @@ body.winners #header {
height: 116px;
}
- .winners #header {
+ body.winners #header {
background-image: none;
}

0 comments on commit c402cdc

Please sign in to comment.