Fix bug 1182720 - update Webmaker promos after Maker Party

bedrock/mozorg/templates/mozorg/home/home.html

@@ -157,13 +157,13 @@ <h2 class="go">{{ _('Download Firefox') }}</h2>
             <a class="fxos-link" href="{{ url('firefox.desktop.index') }}">{{ _('Learn more') }}</a>
           </div>
         </li>
-      {% if l10n_has_tag('webmaker_promo_makerparty2015') %}
-        <li id="promo-6" class="item promo-large-landscape makerparty" tabindex="0" data-name="Get creative at Maker Party">
-          <h2 class="primary go">{{ _('Get creative <br>at Maker Party') }}</h2>
-          <a class="panel-link" rel="external" href="https://teach.mozilla.org/events/">
+      {% if l10n_has_tag('webmaker_promo_introducing') %}
+        <li id="promo-6" class="item promo-large-landscape webmaker" tabindex="0" data-name="Introducing the new Webmaker">
+          <h2 class="primary go">{{ _('Introducing<br> the new Webmaker') }}</h2>
+          <a class="panel-link" rel="external" href="https://webmaker.org/">
             <div class="secondary">
-              <h3>{{ _('Join Mozilla <br>and help teach the Web.') }}</h3>
-              <p class="more">{{ _('Join the party') }}</p>
+              <h3>{{ _('Discover, create and share original content with the free Webmaker app.') }}</h3>
+              <p class="more">{{ _('Learn more') }}</p>
             </div>
           </a>
         </li>
@@ -191,10 +191,10 @@ <h3>{{ _('Let’s build a Web that’s open <br>and made by everyone.') }}</h3>
         <li id="promo-7" class="item promo-face">
           {{ promo_face(3) }}
         </li>
-      {% if l10n_has_tag('webmaker_promo_makerparty2015b') %}
-        <li id="promo-8" class="item promo-small-landscape webmaker" data-name="Try the new Webmaker">
-          <a class="panel-link" rel="external" href="https://beta.webmaker.org">
-            <h2>{{ _('Try the new Webmaker') }}</h2>
+      {% if l10n_has_tag('webmaker_promo_introducing') %}
+        <li id="promo-8" class="item promo-small-landscape webmaker" data-name="Teach the Web">
+          <a class="panel-link" rel="external" href="https://teach.mozilla.org">
+            <h2>{{ _('Teach<br> the Web') }}</h2>
           </a>
         </li>
       {% else %}

media/css/mozorg/home/home-promo.less

@@ -839,31 +839,6 @@ html[lang|="en"] {
     }
 }
 
-
-/****************************************************************************/
-// Maker Party
-.promo-large-landscape.makerparty {
-    background: #e14164; // pinkish red
-
-    h2 {
-        padding: 110px @baseLine 0 @baseLine;
-        margin-top: @baseLine;
-        background-image: url(/media/img/home/voices/promos/makerparty/maker-party.png);
-        background-position: top center;
-        background-repeat: no-repeat;
-        .background-size(105px, 105px);
-    }
-}
-
-html[lang|="en"] {
-    .promo-large-landscape.makerparty {
-        h3 {
-            padding: (@baseLine * 3) @baseLine 0 @baseLine;
-        }
-    }
-}
-
-
 /****************************************************************************/
 // Webmaker
 .promo-large-landscape.webmaker {
@@ -891,19 +866,12 @@ html[lang|="en"] {
     background: #0ad; // bright blue
 
     h2 {
-        padding: 35px 0 35px 130px;
-        min-height: 50px;
-        background: url(/media/img/home/voices/promos/webmaker/webmaker-logo.svg) 15px 15px no-repeat;
-        .background-size(100px, 100px);
+        padding: 30px 20px 10px 140px;
+        min-height: 64px;
+        background: url(/media/img/home/voices/promos/webmaker/webmaker-teacher.svg) 15px 35px no-repeat;
+        .background-size(95px, 64px);
     }
 }
-html[dir="rtl"] {
-	.promo-small-landscape.webmaker{
-		h2 {
-			padding: 12px 35px 35px 130px;
-		}
-	}
-}
 
 
 /****************************************************************************/
@@ -1745,14 +1713,6 @@ html[lang|="en"] {
        only screen and (                min-resolution: 1.5dppx),
        only screen and (                min-resolution: 144dpi) {
 
-    // Maker Party
-    .promo-large-landscape.makerparty {
-        h2 {
-            background-image: url(/media/img/home/voices/promos/makerparty/maker-party-high-res.png);
-            .background-size(105px, 105px);
-        }
-    }
-
     // Support
     .promo-large-landscape.support {
         h2 {