make listing collection colorless and odorless (bug 1131402)

mozilla · Feb 12, 2015 · 4243143 · 4243143
1 parent cf5e07b
commit 4243143
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/src/media/css/feed/collections.styl b/src/media/css/feed/collections.styl
@@ -16,15 +16,14 @@
     // Header for listing collections on the homepage.
     display: block;
     height: 48px;
-    padding-top: 15px;
+    padding-top: 30px;
     position: relative;
     text-align: center;
 
     &:hover {
         text-decoration: none;
     }
     h3 {
-        color: $white;
         font-size: 20px;
         font-weight: 200;
         line-height: 20px;
@@ -33,13 +32,12 @@
 
 .collection-listing-desc {
     type_body();
+    padding-bottom: 10px;
     text-align: center;
-    padding-bottom: 5px;
 }
 
 .feed-landing-header .collection-listing-desc {
-    color: $white;
-    padding: 10px;
+    padding: 10px 10px 30px;
 }
 
 [data-page-type~="homepage"] .collection-listing-header {
@@ -60,6 +58,7 @@
 
 .collection-group-header {
     _h3();
+    padding-top: 30px;
 }
 
 .collection-landing-header-mobile {

diff --git a/src/media/css/feed/colors.styl b/src/media/css/feed/colors.styl
@@ -12,6 +12,13 @@ feed_background_color($color) {
     }
 }
 
+[data-collection-landing-color],
+[data-shelf-landing-carrier] {
+    h1,
+    .feed-landing-description {
+        color: $white;
+    }
+}
 [data-collection-landing-color="amber"] {
     collection_background_colors($color-collection--amber);
 }

diff --git a/src/media/css/feed/landing.styl b/src/media/css/feed/landing.styl
@@ -5,6 +5,9 @@
 */
 @import '../lib';
 
+.feed-landing.full > div {
+    padding-top: 0;
+}
 
 .feed-landing-header {
     display: block;
@@ -39,11 +42,6 @@
 .feed-landing-header-desktop {
     display: none;
     width: 100%;
-
-    h1,
-    .feed-landing-description {
-        color: $white;
-    }
 }
 
 
@@ -59,6 +57,9 @@
 }
 
 @media $base-tablet {
+    .feed-landing.full > div {
+        padding-top: 30px;
+    }
     .feed-landing-header {
         left: -10%;
         position: relative;

diff --git a/src/templates/_macros/feed_item.html b/src/templates/_macros/feed_item.html
@@ -157,15 +157,12 @@ <h1 class="name">{{ coll.name|translate(coll)|safe }}</h1>
 {% endmacro %}
 
 {% macro collection_listing_header(coll) %}
-   {% set color = coll.color or 'sapphire' %}
-
    <a class="collection-listing-header"
-      href="{{ url('feed/feed_collection', [coll.slug])|urlparams(src='collection-element') }}"
-      data-feed-color="{{ color }}">
+      href="{{ url('feed/feed_collection', [coll.slug])|urlparams(src='collection-element') }}">
      <h3>{{ coll.name|translate(coll)|safe }}</h3>
   </a>
   {% if coll.description %}
-    <p class="collection-listing-desc" data-collection-color="{{ color }}">
+    <p class="collection-listing-desc">
       {{ coll.description|translate(coll)|safe }}
     </p>
   {% endif %}
@@ -202,7 +199,7 @@ <h3>{{ coll.name|translate(coll)|safe }}</h3>
   {% set src = 'operator-shelf-element' if coll.carrier else 'collection-element' %}
 
   <div class="feed-landing-wrapper" data-tracking="{{ coll.slug }}"
-       {% if not coll.carrier %}
+       {% if not coll.carrier and coll.type != feed.COLL_LISTING %}
          data-collection-landing-color="{{ color }}"
        {% endif %}
        {% if coll.background_image %}data-collection-landing-has-background-image{% endif %}