Merge pull request #3593 from schalkneethling/bug1225275-homepage-pro…

…mo-tile-cleanup-non-l10n Fix Bug 1225275, swap pb and ios, update color for ios and gear
mozilla · Nov 23, 2015 · 9d053cd · 9d053cd
2 parents ecc8803 + dd99589
commit 9d053cd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/bedrock/mozorg/templates/mozorg/home/home.html b/bedrock/mozorg/templates/mozorg/home/home.html
@@ -124,13 +124,13 @@ <h1>{{ high_res_img('home/voices/mozilla-wordmark-white.png', {'alt': 'Mozilla',
     <div class="promo-grid-inner">
       <ul class="promo-grid {% if tweets %}has-twitter-promo{% endif %}">
       {# L10n: Begin home page promos. Line breaks are for visual formatting only. #}
-      {% if l10n_has_tag('ios_promo') and waffle.switch('firefox-ios-global') %}
-        <li id="promo-1" class="item promo-large-portrait firefox-ios" data-name="Firefox is now available for iOS" tabindex="0">
-          <h2 class="primary go">{{ _('Firefox is<br> now available<br> for iOS') }}</h2>
-          <a class="panel-link" href="{{ url('firefox.ios') }}">
+      {% if l10n_has_tag('tracking_protection') %}
+        <li id="promo-1" class="item promo-large-portrait private-browsing" tabindex="0">
+          <h2 class="primary go">{{ _('Introducing the new <br>Private Browsing') }}</h2>
+          <a class="panel-link" href="{{ url('firefox.private-browsing') }}" data-promotion-id="promo-1" data-promotion-name="Introducing the new Private Browsing" data-promotion-class="promo-large-portrait" data-promotion-type="tile">
             <div class="secondary">
-              <h3>{{ _('Add it to your iPhone, iPad &amp; iPod touch.') }}</h3>
-              <p class="more">{{ _('Get Firefox for iOS') }}</p>
+              <h3>{{ _('More protection. <br>The most privacy.') }}</h3>
+              <p class="more">{{ _('Try Private Browsing') }}</p>
             </div>
           </a>
         </li>
@@ -218,7 +218,7 @@ <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, 'promo-7') }}
         </li>
-      {% if l10n_has_tag('smarton_promo_tracking') and waffle.switch('tracking-protection') %}
+      {% if l10n_has_tag('smarton_promo_tracking') %}
         <li id="promo-8" class="item promo-small-landscape smarton-tracking" tabindex="0">
           <a class="panel-link" rel="external" href="{{ url('teach.smarton.tracking') }}" data-promotion-id="promo-8" data-promotion-name="Get smart on Tracking" data-promotion-class="promo-small-landscape" data-promotion-type="tile">
             <h2>{{ _('Get smart on Tracking') }}</h2>
@@ -256,13 +256,13 @@ <h2>{{ _('Volunteer <br>with Mozilla') }}</h2>
           </a>
         </li>
       {% endif %}
-      {% if l10n_has_tag('tracking_protection') and waffle.switch('tracking-protection') %}
-        <li id="promo-10" class="item promo-large-portrait private-browsing" tabindex="0">
-          <h2 class="primary go">{{ _('Introducing the new <br>Private Browsing') }}</h2>
-          <a class="panel-link" href="{{ url('firefox.private-browsing') }}" data-promotion-id="promo-10" data-promotion-name="Introducing the new Private Browsing" data-promotion-class="promo-large-portrait" data-promotion-type="tile">
+      {% if l10n_has_tag('ios_promo') %}
+        <li id="promo-10" class="item promo-large-portrait firefox-ios" data-name="Firefox is now available for iOS" tabindex="0">
+          <h2 class="primary go">{{ _('Firefox is<br> now available<br> for iOS') }}</h2>
+          <a class="panel-link" href="{{ url('firefox.ios') }}" data-promotion-id="promo-10" data-promotion-name="Firefox is now available for iOS" data-promotion-class="promo-large-portrait" data-promotion-type="tile">
             <div class="secondary">
-              <h3>{{ _('More protection. <br>The most privacy.') }}</h3>
-              <p class="more">{{ _('Try Private Browsing') }}</p>
+              <h3>{{ _('Add it to your iPhone, iPad &amp; iPod touch.') }}</h3>
+              <p class="more">{{ _('Get Firefox for iOS') }}</p>
             </div>
           </a>
         </li>

diff --git a/media/css/mozorg/home/home-promo.less b/media/css/mozorg/home/home-promo.less
@@ -985,7 +985,7 @@ html[lang|="en"] {
 /****************************************************************************/
 // Gear
 .promo-large-landscape.gear {
-    background: #95368c; // purple
+    background: #6FBE4A; // green
 
     h2 {
         padding: 100px @baseLine 0 @baseLine;
@@ -1128,7 +1128,7 @@ html[lang|="en"] {
 /****************************************************************************/
 // Firefox iOS
 .promo-large-portrait.firefox-ios {
-    background: #e55525; // orange
+    background: #00659a; // dark blue
 
     h2 {
         padding-top: 180px;