Merge pull request #2486 from sgarrity/bug-1095176-dev-newsletter

Use hacks newsletter for English/Spanish locales
mozilla · Nov 17, 2014 · 70d4852 · 70d4852
2 parents cd372f9 + 7e42a98
commit 70d4852
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/bedrock/firefox/templates/firefox/developer.html b/bedrock/firefox/templates/firefox/developer.html
@@ -172,7 +172,14 @@ <h2>{{_('Style Editor')}}</h2>
       <h3>{{ _('Choose Firefox') }}</h3>
       {{ download_firefox('aurora', icon=False, small=True, simple=True) }}
     </div>
-  {{ super() }}
+    {# See Bug 1095176 #}
+    {% if LANG.startswith('en-') %}
+      {{ email_newsletter_form('app-dev', 'Firefox Apps & Hacks') }}
+    {% elif LANG.startswith('es-') %}
+      {{ email_newsletter_form('app-dev', 'Firefox Apps y Hacks') }}
+    {% else %}
+      {{ super() }}
+    {% endif %}
   </div>
 </section>
 {% endblock %}

diff --git a/media/css/firefox/developer.less b/media/css/firefox/developer.less
@@ -208,7 +208,7 @@
 .dev-footer {
     background: #094377;
     h3 {
-        font-size: 36px;
+        font-size: 30px;
         margin-top: 5px;
         margin-bottom: @baseLine;
     }
@@ -231,7 +231,8 @@
     }
 }
 
-#newsletter-form {
+#newsletter-form,
+#newsletter-form-thankyou {
     .span(4);
     .offset(1);
     background: none;
@@ -289,7 +290,8 @@
         font-size: 28px;
         margin-bottom: @baseLine;
     }
-    #newsletter-form {
+    #newsletter-form,
+    #newsletter-form-thankyou {
         .span_narrow(5);
         padding-left: 0;
         padding-right: 0;
@@ -333,7 +335,8 @@
         font-size: 28px;
         margin-bottom: @baseLine;
     }
-    #newsletter-form {
+    #newsletter-form,
+    #newsletter-form-thankyou {
         .span-all();
         padding-left: 0;
         padding-right: 0;