Removed borders for restyle

apps/amo/templates/amo/site_nav.html

@@ -39,6 +39,15 @@
             <li><a href="{{ cat.get_url_path() }}">{{ cat.name }}</a></li>
           {% endfor %}
         </ul>
+        {% if not waffle.flag('restyle') %}
+        <div>
+          <a class="complete-themes" href="{{ url('browse.themes') }}">
+            {% trans %}
+              Want more customization? Try <b>Complete Themes</b>
+            {% endtrans %}
+          </a>
+        </div>
+        {% endif %}
       {% endif %}
     </li>
 

sites/prod/settings.py

@@ -208,12 +208,3 @@ READ_ONLY = env.bool('READ_ONLY', default=False)
 RAVEN_DSN = (
     'https://8c1c5936578948a9a0614cbbafccf049@sentry.prod.mozaws.net/78')
 RAVEN_WHITELIST = ['addons.mozilla.org', 'addons.cdn.mozilla.net']
-restyle = 'css/restyle.less'
-zamboni = tuple(list(MINIFY_BUNDLES['css']['zamboni/css']).remove(restyle))
-impala = tuple(list(MINIFY_BUNDLES['css']['zamboni/impala']).remove(restyle))
-devhub = tuple(list(MINIFY_BUNDLES['css']['zamboni/devhub_impala'])
-               .remove(restyle))
-
-MINIFY_BUNDLES['css']['zamboni/css'] = zamboni
-MINIFY_BUNDLES['css']['zamboni/impala'] = impala
-MINIFY_BUNDLES['css']['zamboni/devhub'] = devhub

static/css/impala/header.less

@@ -41,7 +41,6 @@
 .site-title img {
     float: left;
     margin-right: 10px;
-    width: 62px;
 }
 .html-rtl .site-title img {
     float: right;

static/css/restyle.less

@@ -333,7 +333,9 @@ button.search-button {
     display: block !important;
     opacity: 1 !important;
 }
-#promos, #promos li > div, #promos > div {
+#promos,
+#promos li > div,
+#promos > div {
     border-radius: 0;
 }
 #promos .feature {
@@ -415,7 +417,7 @@ button.search-button {
         left: 0;
     }
     .next {
-         right: 0;
+        right: 0;
     }
 
     h2, h3 {
@@ -464,7 +466,10 @@ button.search-button {
 }
 
 /*  */
-#featured-addon > div, #go-mobile > div, #monthly > div, .addons li > a {
+#featured-addon > div,
+#go-mobile > div,
+#monthly > div,
+.addons li > a {
     border: 0;
     border-radius: 0;
     box-shadow: none;
@@ -472,7 +477,9 @@ button.search-button {
     background-color: rgba(255, 255, 255, 0.0);
     transition-property: background-color;
 }
-.addons li > a:active, .addons li > a:focus, .addons li > a:hover {
+.addons li > a:active,
+.addons li > a:focus,
+.addons li > a:hover {
     box-shadow: none;
     background-color: rgba(255, 255, 255, 0.2);
     transition-property: background-color;
@@ -482,7 +489,9 @@ button.search-button {
     margin-right: 8px;
     margin-bottom: 3px;
 }
-.addons h3, #featured-addon h3, #monthly h3 {
+.addons h3,
+#featured-addon h3,
+#monthly h3 {
     font-size: 1.2rem;
     line-height: 1.3rem;
     max-height: 1.2rem;
@@ -557,7 +566,7 @@ button.good {
     }
 
     li {
-        border-color: lighten(desaturate(@primary-blue, 50%), 20%);
+        border: none;
     }
 }
 
@@ -599,6 +608,7 @@ button.good {
 #page #breadcrumbs {
     display: none;
 }
+
 .addon-details .primary,
 .addon-details .secondary {
     font-family: @primary-font !important;
@@ -633,7 +643,8 @@ button.good {
     margin-top: -5px;
 }
 /* Re-colors links on top of details page to white */
-#addon a, .author a,
+#addon a,
+.author a,
 .addon-vitals .widgets .widget {
     color: #FFFFFF;
 }
@@ -695,7 +706,10 @@ button.good {
     background: 0;
 
     .hovercard.addon {
-         &:hover, &:hover:before, &:hover .icon, &:hover .summary,
+         &:hover,
+         &:hover:before,
+         &:hover .icon,
+         &:hover .summary,
          &:hover .more {
             background: none;
             border-color: transparent;
@@ -704,7 +718,9 @@ button.good {
 
          .more {
              display: block !important;
-             .addon-summary, .byline, .vitals {
+             .addon-summary,
+             .byline,
+             .vitals {
                 display: none;
              }
          }
@@ -719,13 +735,28 @@ button.good {
 
 /* font issues on addon-details */
 .addon-details {
-    .version-number, h4.author, h4.author a, #addon-summary, a.privacy-policy,
-    .notice h3, .notice p, .notice p a, .notice p b, .category.more-info,
-    .vital a, #reviews-link, #daily-users a {
+    .version-number, 
+    h4.author, 
+    h4.author a,
+    #addon-summary,
+    a.privacy-policy,
+    .notice h3,
+    .notice p,
+    .notice p a,
+    .notice p b,
+    .category.more-info,
+    .vital a,
+    #reviews-link,
+    #daily-users a {
         color: #fff;
     }
-    .version-number, h4.author, a.privacy-policy, #contribution.notice p a,
-    .category.more-info, .vital a, #reviews-link {
+    .version-number,
+    h4.author,
+    a.privacy-policy,
+    #contribution.notice p a,
+    .category.more-info,
+    .vital a,
+    #reviews-link {
         opacity: 0.4;
     }
     .version-number {

static/js/impala/addon_details.js

@@ -1,9 +1,11 @@
 $(function () {
     if (!$("body").hasClass('addon-details')) return;
-    if ($('#background-wrapper').css('position') === 'absolute') {
-        $('#background-wrapper').css('height',
+
+    if($("body#restyle").length === 1) {
+        $('#background-wrapper').height(
             $('.amo-header').height() +
-            $('#addon-description-header').height() + 20 + 'px');
+            $('#addon-description-header').height() + 20
+        );
     }
 
     $(".previews").zCarousel({

static/js/impala/promos.js

@@ -31,16 +31,16 @@ function initPromos($context, module_context, version, platform) {
             $promos.trigger('promos_shown', [$promos]);
             $('.persona-preview', $promos).previewPersona(true);
         }
-        // Hide panel if we have no promos to show and it's the redesign
-        if (resp !== ''
-            && $('#background-wrapper').css('position') === 'absolute') {
+        // Hide panel is we have no promos to show
+        if (resp !== '' && $('body#restyle').length === 1) {
             $('#page > .secondary').addClass('shift-secondary');
             $('#background-wrapper').addClass('carousel-header');
             $('#promos').addClass('show');
             $('#side-nav').addClass('expanded');
-            $('#background-wrapper').css('height',
+            $('#background-wrapper').height(
                 $('.amo-header').height() +
-                $('#promos').height() + 40 + 'px');
+                $('#promos').height() + 40
+            );
         }
     });
 }

templates/base.html

@@ -57,10 +57,15 @@
         data-static-url="{{ STATIC_URL }}"
         data-raven-dsn="{{ settings.RAVEN_DSN }}"
         data-raven-urls="{{ settings.RAVEN_WHITELIST }}"
+        {% if waffle.flag('restyle') %}
+          class="restyle"
+        {% endif %}
         {% block bodyattrs %}{% endblock %}>
 
     <div id="main-wrapper">
-      <div id="background-wrapper"></div>
+      {% if waffle.flag('restyle') %}
+        <div id="background-wrapper"></div>
+      {% endif %}
       {% if ADMIN_MESSAGE or settings.READ_ONLY %}
         <div id="site-notice">
           {% if ADMIN_MESSAGE %}

templates/impala/base.html

@@ -60,10 +60,15 @@
         {% if switch_is_active('fxa-auth') %}
           data-fxa-config="{{ fxa_config()|json }}"
         {% endif %}
+        {% if waffle.flag('restyle') %}
+          class="restyle"
+        {% endif %}
         {% block bodyattrs %}{% endblock %}>
 
     <div id="main-wrapper">
-      <div id="background-wrapper"></div>
+      {% if waffle.flag('restyle') %}
+        <div id="background-wrapper"></div>
+      {% endif %}
       <div id="page" class="c">
         {% block site_header %}
           {% include "tabzilla.html" %}

templates/impala/header_title.html

@@ -1,7 +1,11 @@
 <h1 class="site-title">
 {% macro heading(app, text, icon) -%}
 <a href="{{ url('home') }}" title="{{ _('Return to the {0} Add-ons homepage')|f(request.APP.pretty) }}">
+  {% if waffle.flag ('restyle') %}
   <img alt="" src="{{ static('img/icons/firefox.png')|safe }}">
+  {% else %}
+  <img alt="{{ APP.pretty }}" src="{{ static('img/app-icons/med/' + icon + '.png')|safe }}">
+  {% endif %}
   {{ text }}
 </a>
 {%- endmacro %}