Merge branch 'develop'

mozilla · May 17, 2012 · 36b168b · 36b168b
2 parents 6079b3b + c402cdc
commit 36b168b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/flicks/base/templates/shared/header.html b/flicks/base/templates/shared/header.html
@@ -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') }}"

diff --git a/flicks/base/templates/shared/macros.html b/flicks/base/templates/shared/macros.html
@@ -164,7 +164,7 @@ <h2>{{ _('Runner Ups') }}</h2>
 {% 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>

diff --git a/flicks/videos/views.py b/flicks/videos/views.py
@@ -23,6 +23,8 @@
 TWEET_TEXT = _lazy("Check out '%(video_title)s' on Firefox Flicks. %(link)s")
 log = commonware.log.getLogger('f.videos')
 
+WINNER_CATEGORIES = [c for c in CATEGORY_CHOICES if c[0] != 'new_technology']
+
 
 def winners(request):
     """Winners page."""
@@ -31,7 +33,7 @@ def winners(request):
 
     d = dict(
         awards={},
-        category_choices=CATEGORY_CHOICES,
+        category_choices=WINNER_CATEGORIES,
         page_type='winners'
     )
 

diff --git a/media/css/main.css b/media/css/main.css
@@ -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;
     }