Remove full-page & visible buttons and remove from onboarding

mozilla-services · Jul 25, 2017 · 07a27a8 · 07a27a8
1 parent d2a05c3
commit 07a27a8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 18 deletions.
diff --git a/addon/webextension/onboarding/slides.html b/addon/webextension/onboarding/slides.html
@@ -8,7 +8,7 @@
   <body>
     <div id="slide-overlay">
       <!-- The current slide is set by having .active-slide-1, .active-slide-2, etc on #slide element: -->
-      <div id="slide-container" data-number-of-slides="4" class="active-slide-1">
+      <div id="slide-container" data-number-of-slides="3" class="active-slide-1">
         <div class="slide slide-1">
           <!-- Note: all images must be listed in manifest.json.template under web_accessible_resources -->
           <div class="slide-image" style="background-image: url('MOZ_EXTENSION/icons/onboarding-1.png');"></div>
@@ -28,13 +28,6 @@ <h1 data-l10n-id="tourHeaderTwo"></h1>
           </div>
         </div>
         <div class="slide slide-3">
-          <div class="slide-image" style="background-image: url('MOZ_EXTENSION/icons/onboarding-3.png');"></div>
-          <div class="slide-content">
-            <h1 data-l10n-id="tourHeaderThree"></h1>
-            <p data-l10n-id="tourBodyThree"></p>
-          </div>
-        </div>
-        <div class="slide slide-4">
           <div class="slide-image" style="background-image: url('MOZ_EXTENSION/icons/onboarding-4.png');"></div>
           <div class="slide-content">
             <h1 data-l10n-id="tourHeaderFour"></h1>
@@ -51,7 +44,6 @@ <h1 data-l10n-id="tourHeaderFour"></h1>
           <button class="goto-slide goto-slide-1" data-number="1" tabindex=4></button>
           <button class="goto-slide goto-slide-2" data-number="2" tabindex=5></button>
           <button class="goto-slide goto-slide-3" data-number="3" tabindex=6></button>
-          <button class="goto-slide goto-slide-4" data-number="4" tabindex=7></button>
         </div>
         <!-- FIXME: Need to put in privacy / etc links -->
       </div>

diff --git a/addon/webextension/selector/ui.js b/addon/webextension/selector/ui.js
@@ -239,9 +239,6 @@ this.ui = (function() { // eslint-disable-line no-unused-vars
                      <div class="preview-instructions"></div>
                      <div class="myshots-all-buttons-container">
                        <button class="myshots-button myshots-link" tabindex="1"></button>
-                       <div class="spacer"></div>
-                       <button class="myshots-button visible" tabindex="2"></button>
-                       <button class="myshots-button full-page" tabindex="3"></button>
                      </div>
                    </div>
                  </div>
@@ -259,10 +256,6 @@ this.ui = (function() { // eslint-disable-line no-unused-vars
             overlay.querySelector(".full-page").textContent = browser.i18n.getMessage("saveScreenshotFullPage");
             overlay.querySelector(".myshots-button").addEventListener(
               "click", watchFunction(assertIsTrusted(standardOverlayCallbacks.onOpenMyShots)));
-            overlay.querySelector(".visible").addEventListener(
-              "click", watchFunction(assertIsTrusted(standardOverlayCallbacks.onClickVisible)));
-            overlay.querySelector(".full-page").addEventListener(
-              "click", watchFunction(assertIsTrusted(standardOverlayCallbacks.onClickFullPage)));
             resolve();
           }), {once: true});
           document.body.appendChild(this.element);

diff --git a/static/css/onboarding.scss b/static/css/onboarding.scss
@@ -249,7 +249,7 @@ body {
 }
 
 .active-slide-1 #prev,
-.active-slide-4 #next {
+.active-slide-3 #next {
   display: none;
 }
 
@@ -258,7 +258,7 @@ body {
   display: none;
 }
 
-.active-slide-4 #done {
+.active-slide-3 #done {
   display: inline-block;
 }