Merge pull request #2505 from craigcook/bug-1090590-update-history

Fix bug 1090590 - updates to history slides
mozilla · Nov 19, 2014 · d7d17b8 · d7d17b8
2 parents 5f01fdd + c03583a
commit d7d17b8
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 29 deletions.
diff --git a/bedrock/mozorg/templates/mozorg/about/history.html b/bedrock/mozorg/templates/mozorg/about/history.html
@@ -100,9 +100,15 @@ <h1 class="page-title">{{ _('Looking back. Looking ahead.') }}</h1>
           <span class="number">05</span>
           <div class="message">
             <p>
+          {% if l10n_has_tag('history_nov2014') %}
+            {% trans %}
+              Firefox Add-Ons allow you to customize and take control of your Web experience. Nearly 4 billion of them have been downloaded by users so far.
+            {% endtrans %}
+          {% else %}
             {% trans %}
               Firefox Add-Ons allow you to customize and take control of your Web experience. Over 3 billion of them have been downloaded by users so far.
             {% endtrans %}
+          {% endif %}
             </p>
           </div>
           <span class="block1"></span>
@@ -184,13 +190,19 @@ <h1 class="page-title">{{ _('Looking back. Looking ahead.') }}</h1>
           <span class="number">11</span>
           <div class="message">
             <p>
+          {% if l10n_has_tag('history_nov2014') %}
+            {% trans %}
+              Firefox for Android brings the Firefox desktop browsing experience to phones and tablets. Available on Google Play, it has been downloaded more than 80 million times.
+            {% endtrans %}
+          {% else %}
             {% trans %}
               Mozilla leads the Open Badges program, an online standard that helps people gain recognition for 21st century skills and unlock new career opportunities.
             {% endtrans %}
+          {% endif %}
             </p>
           </div>
           <span class="block1"></span>
-          <span class="logo"></span>
+          <span class="droid"></span>
           <span class="back"></span>
         </li>
 

diff --git a/media/css/mozorg/history-slides.less b/media/css/mozorg/history-slides.less
@@ -1436,57 +1436,57 @@
 
 #fact11 .number {
     background-position: -479px -143px;
-    height: 142px;
+    height: 141px;
     margin-left: -141px;
-    width: 125px;
+    width: 124px;
 }
 
 .on #fact11 {
     .number,
     .message,
     .block1,
-    .logo {
+    .droid {
         background: url(/media/img/mozorg/history/fact11-pads.png) no-repeat;
     }
 
     .number {
         .transition-duration(2s);
         background-position: 0 0;
-        height: 139px;
+        height: 141px;
         margin-left: 2200px;
         top: 85px;
-        width: 126px;
+        width: 124px;
     }
 
     .message {
         .transition-duration(2s);
-        background-position: -126px 0;
-        height: 230px;
+        background-position: -124px 0;
+        height: 228px;
         margin-left: 3000px;
         padding: 40px 40px 0 40px;
         top: 48px;
-        width: 436px;
+        width: 434px;
     }
 
     .block1 {
-        width: 211px;
-        height: 227px;
-        background-position: -641px 0;
+        width: 210px;
+        height: 225px;
+        background-position: -638px 0;
         top: 22px;
         margin-top: 90px;
         margin-left: 4000px;
     }
 
-    .logo {
-        background-position: 0 -142px;
+    .droid {
+        background-position: 0 -141px;
         display: block;
-        height: 110px;
+        height: 164px;
         left: 50%;
         margin-left: -2200px;
         opacity: 0;
         position: absolute;
-        top: 31px;
-        width: 90px;
+        top: 55px;
+        width: 124px;
         z-index: 15;
         -webkit-transition: opacity 1s cubic-bezier(.86,.01,.86,.87),
                             margin-left 2s cubic-bezier(.6,-0.08,.6,1);
@@ -1508,8 +1508,8 @@
             margin-top: 0;
         }
 
-        .logo {
-            .animation(fact11-logo-in 2s forwards 1s);
+        .droid {
+            .animation(fact11-droid-in 2s forwards 1s);
             .transition(opacity 1s cubic-bezier(.86,.01,.86,.87));
             opacity: 1;
         }
@@ -1529,31 +1529,31 @@
             margin-top: -60px;
         }
 
-        .logo {
-            .animation(fact11-logo-out 1s forwards);
+        .droid {
+            .animation(fact11-droid-out 1s forwards);
             .transition(opacity 1s cubic-bezier(.86,.01,.86,.87));
             opacity: 0;
         }
     }
 }
 
-@-webkit-keyframes fact11-logo-in {
+@-webkit-keyframes fact11-droid-in {
       0% { margin-left: -2000px; }
-    100% { margin-left: 313px; }
+    100% { margin-left: 268px; }
 }
 
-@keyframes fact11-logo-in {
+@keyframes fact11-droid-in {
       0% { margin-left: -2000px; }
-    100% { margin-left: 313px; }
+    100% { margin-left: 268px; }
 }
 
-@-webkit-keyframes fact11-logo-out {
-      0% { margin-left: 270px; }
+@-webkit-keyframes fact11-droid-out {
+      0% { margin-left: 268px; }
     100% { margin-left: 2000px; }
 }
 
-@keyframes fact11-logo-out {
-      0% { margin-left: 270px; }
+@keyframes fact11-droid-out {
+      0% { margin-left: 268px; }
     100% { margin-left: 2000px; }
 }
 

diff --git a/media/img/mozorg/history/fact11-pads.png b/media/img/mozorg/history/fact11-pads.png