Remove mzp-c-newsletter from places where its styles were overridden

alexgibson · Sep 16, 2019 · 0c8c156 · 0c8c156
1 parent 5f14e64
commit 0c8c156
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 49 deletions.
diff --git a/bedrock/firefox/templates/firefox/developer/index.html b/bedrock/firefox/templates/firefox/developer/index.html
@@ -76,22 +76,20 @@ <h2 class="mzp-c-card-feature-title">{{ _('Download the Firefox browser made for
   </section>
   <section class="t-newsletter">
     <div class="mzp-l-content">
-      <div class="mzp-c-newsletter">
-        {% if LANG.startswith('en-') %}
-          {{ email_newsletter_form(
-            'app-dev',
-            title='Get the most out of Firefox Developer Edition',
-            subtitle='Learn about Dev Edition and subscribe to the Mozilla Developer Newsletter.',
-            button_class='mzp-t-product mzp-t-small',
-            include_language=False,
-            protocol_component=True) }}
-        {% else %}
-          {{ email_newsletter_form(
-            protocol_component=True,
-            spinner_color='#fff',
-            button_class='mzp-c-button mzp-t-product') }}
-        {% endif %}
-      </div>
+      {% if LANG.startswith('en-') %}
+        {{ email_newsletter_form(
+          'app-dev',
+          title='Get the most out of Firefox Developer Edition',
+          subtitle='Learn about Dev Edition and subscribe to the Mozilla Developer Newsletter.',
+          button_class='mzp-t-product mzp-t-small',
+          include_language=False,
+          protocol_component=True) }}
+      {% else %}
+        {{ email_newsletter_form(
+          protocol_component=True,
+          spinner_color='#fff',
+          button_class='mzp-c-button mzp-t-product') }}
+      {% endif %}
     </div>
   </section>
 </main>

diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx67.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx67.html
@@ -137,14 +137,12 @@ <h2 class="c-sticky-signup-title">{{ _('Get a Firefox Account and all the benefi
         <h2 class="c-sticky-signup-title">{{ _('Get the latest news from Mozilla and Firefox right in your inbox.') }}</h2>
         <button type="button" class="sticky-dismiss" data-parent="newsletter-sticky-form">{{ _('Close') }}</button>
       </div>
-      <div class="mzp-c-newsletter">
-        {{ email_newsletter_form(
-          protocol_component=True,
-          include_title=False,
-          spinner_color='#fff',
-          button_class='mzp-c-button mzp-t-product mzp-t-small')
-        }}
-      </div>
+      {{ email_newsletter_form(
+        protocol_component=True,
+        include_title=False,
+        spinner_color='#fff',
+        button_class='mzp-c-button mzp-t-product mzp-t-small')
+      }}
     </div>
     {% endif %}
   </section>

diff --git a/media/css/firefox/developer/includes/newsletter.scss b/media/css/firefox/developer/includes/newsletter.scss
@@ -18,11 +18,9 @@
         max-width: $content-sm;
     }
 
-    .mzp-c-newsletter {
-        display: block;
-        margin-bottom: 0;
-        padding: 0;
-        text-align: center;
+    .mzp-c-newsletter-form {
+        padding-top: 0;
+        @include font-size(14px);
 
         input[type=email] {
             border: 2px solid $color-gray-30;
@@ -39,11 +37,6 @@
         }
     }
 
-    .mzp-c-newsletter-form {
-        padding-top: 0;
-        @include font-size(14px);
-    }
-
     .mzp-c-newsletter-title {
         @include font-size(24px);
         margin-bottom: $layout-2xs;
@@ -88,10 +81,6 @@
             max-width: $content-xl;
         }
 
-        .mzp-c-newsletter {
-            text-align: left;
-        }
-
         .mzp-c-newsletter-form {
             display: grid;
             grid-column-gap: $layout-md;

diff --git a/media/css/firefox/whatsnew/whatsnew-67.scss b/media/css/firefox/whatsnew/whatsnew-67.scss
@@ -383,13 +383,6 @@ main {
         }
     }
 
-    .mzp-c-newsletter {
-        @include bidi(((text-align, left, right),));
-        display: block;
-        padding: 0;
-        margin: 0 auto;
-    }
-
     .mzp-c-newsletter-form {
         padding-top: 0;
     }
@@ -431,10 +424,6 @@ main {
     }
 
     @media #{$mq-md} {
-        .mzp-c-newsletter {
-            margin: 0;
-        }
-
         .mzp-c-newsletter-content {
             @include bidi(((padding-right, 40%, padding-left, 0),));
             position: relative;