Merge remote-tracking branch 'origin/web/11460-ia-without-javascript' (Closes: #11460)

wiki/src/install/inc/steps/download.inline.html

@@ -26,17 +26,21 @@ two techniques to do this verification automatically.</p>
         <p>for <a href="https://getfirefox.com">Firefox <span class="minver-firefox">38.0.1</span>+</a> or
            <a href="https://www.torproject.org/download/download-easy.html.en">Tor Browser <span class="minver-tor">5</span>+</a></p>
 	<p>A Firefox add-on to download and verify Tails automatically.</p>
+        <p><strong>If you are not in Firefox or Tor Browser:</strong></p>
         <p>Copy and paste this link in Firefox or Tor Browser:</p>
-        <span class="windows"><code>https://tails.boum.org/install/win/usb/</code></span>
-        <span class="mac-usb"><code>https://tails.boum.org/install/mac/usb/</code></span>
-        <span class="mac-dvd"><code>https://tails.boum.org/install/mac/dvd/</code></span>
-        <span class="debian"><code>https://tails.boum.org/install/debian/usb/</code></span>
-        <span class="linux"><code>https://tails.boum.org/install/linux/usb/</code></span>
-        <span class="upgrade-tails"><code>https://tails.boum.org/upgrade/tails/</code></span>
-        <span class="dvd"><code>https://tails.boum.org/install/dvd/</code></span>
-        <span class="vm"><code>https://tails.boum.org/install/vm/</code></span>
-        <span class="download-only"><code>https://tails.boum.org/install/download/</code></span>
-        <a href="?override=firefox" class="btn btn-lg btn-primary browser-override">I'm already in Firefox <span class="minver-firefox">38.0.1</span>+ or Tor Browser <span class="minver-tor">5</span>+.</a>
+        <p>
+          <span class="windows"><code>https://tails.boum.org/install/win/usb/</code></span>
+          <span class="mac-usb"><code>https://tails.boum.org/install/mac/usb/</code></span>
+          <span class="mac-dvd"><code>https://tails.boum.org/install/mac/dvd/</code></span>
+          <span class="debian"><code>https://tails.boum.org/install/debian/usb/</code></span>
+          <span class="linux"><code>https://tails.boum.org/install/linux/usb/</code></span>
+          <span class="upgrade-tails"><code>https://tails.boum.org/upgrade/tails/</code></span>
+          <span class="dvd"><code>https://tails.boum.org/install/dvd/</code></span>
+          <span class="vm"><code>https://tails.boum.org/install/vm/</code></span>
+          <span class="download-only"><code>https://tails.boum.org/install/download/</code></span>
+        </p>
+        <p><strong>If you are already in Firefox or Tor Browser:</strong></p>
+        <a href="https://addons.mozilla.org/firefox/downloads/latest-beta/673020/addon-673020-latest.xpi" class="btn btn-lg btn-primary browser-override">Install Firefox add-on</a>
       </div>
       <div class="col-md-6 bittorrent">
         <h2>BitTorrent</h2>
@@ -70,7 +74,6 @@ two techniques to do this verification automatically.</p>
         <span class="dvd"><code>https://tails.boum.org/install/dvd/</code></span>
         <span class="vm"><code>https://tails.boum.org/install/vm/</code></span>
         <span class="download-only"><code>https://tails.boum.org/install/download/</code></span>
-        <a href="?override=firefox" class="btn btn-lg btn-primary browser-override">I'm already in Firefox <span class="minver-firefox">38.0.1</span>+ or Tor Browser <span class="minver-tor">5</span>+.</a>
       </div>
       <div class="col-md-6 bittorrent">
         <h2>BitTorrent</h2>

wiki/src/install/inc/stylesheets/dave.css

@@ -281,13 +281,9 @@ html[data-phase^="verified"] #verify-text-calculating {
   font-size: 0.8em;
 }
 
-/* Wider extension div and with more space. */
+/* Left margin to prevent install-button::before to be in the gutter. */
 #download-and-verify {
-  max-width: 600px;
-  margin-left: auto;
-  margin-right: auto;
-  padding-top: 50px;
-  padding-bottom: 50px;
+  margin-left: 30px;
 }
 
 /* Wider buttons */