summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2018-09-10 14:53:45 +0000
committersajolida <sajolida@pimienta.org>2018-09-10 14:53:45 +0000
commit6961e0b761efef25c1b84a5d0eb740766d16aaba (patch)
treef962f396ad5b6a7e3e7176932766e26556b7c778
parent4e9860c7ca876606489d8401c9b35be94cc945ba (diff)
parent3845d15c2de1009c99f603843422f9299b82283b (diff)
Merge branch 'doc/15810-adjust-overviews-to-img' into doc/15660-usb-images
-rw-r--r--wiki/src/install/inc/icons/2-usb.pngbin1504 -> 0 bytes
-rw-r--r--wiki/src/install/inc/infography/download-and-verify-in-tails.pngbin2655 -> 2779 bytes
-rw-r--r--wiki/src/install/inc/infography/install-upgrade-usb.pngbin3370 -> 3480 bytes
-rw-r--r--wiki/src/install/inc/infography/plug-upgrade-usb.pngbin3252 -> 3366 bytes
-rw-r--r--wiki/src/install/inc/infography/upgrade-upgrade-usb.pngbin3502 -> 3596 bytes
-rw-r--r--wiki/src/install/inc/overview.html243
-rw-r--r--wiki/src/install/inc/stylesheets/overview.css20
7 files changed, 90 insertions, 173 deletions
diff --git a/wiki/src/install/inc/icons/2-usb.png b/wiki/src/install/inc/icons/2-usb.png
deleted file mode 100644
index b87d384..0000000
--- a/wiki/src/install/inc/icons/2-usb.png
+++ /dev/null
Binary files differ
diff --git a/wiki/src/install/inc/infography/download-and-verify-in-tails.png b/wiki/src/install/inc/infography/download-and-verify-in-tails.png
index 616b21e..b51b1e7 100644
--- a/wiki/src/install/inc/infography/download-and-verify-in-tails.png
+++ b/wiki/src/install/inc/infography/download-and-verify-in-tails.png
Binary files differ
diff --git a/wiki/src/install/inc/infography/install-upgrade-usb.png b/wiki/src/install/inc/infography/install-upgrade-usb.png
index ed02a74..6b16a9c 100644
--- a/wiki/src/install/inc/infography/install-upgrade-usb.png
+++ b/wiki/src/install/inc/infography/install-upgrade-usb.png
Binary files differ
diff --git a/wiki/src/install/inc/infography/plug-upgrade-usb.png b/wiki/src/install/inc/infography/plug-upgrade-usb.png
index 4d0d753..db71e62 100644
--- a/wiki/src/install/inc/infography/plug-upgrade-usb.png
+++ b/wiki/src/install/inc/infography/plug-upgrade-usb.png
Binary files differ
diff --git a/wiki/src/install/inc/infography/upgrade-upgrade-usb.png b/wiki/src/install/inc/infography/upgrade-upgrade-usb.png
index f5912b0..a8c4039 100644
--- a/wiki/src/install/inc/infography/upgrade-upgrade-usb.png
+++ b/wiki/src/install/inc/infography/upgrade-upgrade-usb.png
Binary files differ
diff --git a/wiki/src/install/inc/overview.html b/wiki/src/install/inc/overview.html
index 5bed45c..5f1e86c 100644
--- a/wiki/src/install/inc/overview.html
+++ b/wiki/src/install/inc/overview.html
@@ -2,14 +2,13 @@
<div id="needs">
<h3>You need</h3>
<div class="row">
- <div class="col-xs-12 col-sm-3">
+ <div class="col-xs-12 col-sm-2">
<div class="thumbnail">
[[!img install/inc/icons/clock.png link="no" alt=""]]
<div class="caption">
<h4>
- <span class="windows linux mac-usb mac-dvd">2 hours in total</span>
- <span class="debian expert upgrade-tails">1½ hour in total</span>
+ <span class="windows linux mac-usb mac-dvd debian expert upgrade-tails">1½ hours in total</span>
<span class="install-clone">½ hour</span>
<span class="upgrade-clone">¼ hour</span>
<br />
@@ -18,14 +17,13 @@
<small>[[!inline pages="inc/stable_amd64_iso_size" raw="yes" sort="age"]] to download</small><br />
</span>
- <span class="windows linux mac-usb mac-dvd"><small>1 hour to install</small></span>
- <span class="debian expert"><small>½ hour to install</small></span>
+ <span class="windows linux mac-usb mac-dvd debian expert"><small>½ hour to install</small></span>
<span class="upgrade-tails"><small>½ hour to upgrade</small></span>
</h4>
</div>
</div>
</div>
- <div class="col-xs-12 col-sm-3 upgrade-clone upgrade-tails">
+ <div class="col-xs-12 col-sm-2 upgrade-clone upgrade-tails">
<div class="thumbnail">
[[!img install/inc/icons/1-usb.png link="no" alt=""]]
<div class="caption">
@@ -33,7 +31,7 @@
</div>
</div>
</div>
- <div class="col-xs-12 col-sm-3 install-clone upgrade-clone">
+ <div class="col-xs-12 col-sm-2 install-clone upgrade-clone">
<div class="thumbnail">
[[!img install/inc/icons/1-usb.png link="no"]]
<div class="caption">
@@ -43,25 +41,7 @@
</div>
</div>
</div>
- <div class="col-xs-12 col-sm-3 windows linux mac-usb">
- <div class="thumbnail">
- [[!img install/inc/icons/2-usb.png link="no" alt=""]]
- <div class="caption">
- <h4>2 USB sticks<br />
- <small>8 GB minimum</small><br />
- <small>All data will be lost!<br />
-
- [[!toggle id="why_two" text="Why 2?"]]</small>
- </h4>
-
- [[!toggleable id="why_two" text="""
- [[!toggle id="why_two" text="X"]]
- [[!inline pages="install/inc/router/why_two.inline" raw="yes" sort="age"]]
- """]]
- </div>
- </div>
- </div>
- <div class="col-xs-12 col-sm-3 debian expert install-clone mac-dvd">
+ <div class="col-xs-12 col-sm-2 windows linux mac-usb debian expert install-clone mac-dvd">
<div class="thumbnail">
[[!img install/inc/icons/1-usb.png link="no" alt=""]]
<div class="caption">
@@ -72,7 +52,7 @@
</div>
</div>
</div>
- <div class="col-xs-12 col-sm-3 upgrade-tails">
+ <div class="col-xs-12 col-sm-2 upgrade-tails">
<div class="thumbnail">
[[!img install/inc/icons/1-usb.png link="no" alt=""]]
<div class="caption">
@@ -91,7 +71,7 @@
</div>
</div>
</div>
- <div class="col-xs-12 col-sm-3 mac-dvd">
+ <div class="col-xs-12 col-sm-2 mac-dvd">
<div class="thumbnail">
[[!img install/inc/icons/1-dvd.png link="no" alt=""]]
<div class="caption">
@@ -101,7 +81,7 @@
</div>
</div>
</div>
- <div class="col-xs-12 col-sm-3">
+ <div class="col-xs-12 col-sm-2">
<div class="thumbnail">
[[!img install/inc/icons/screens.png link="no" alt=""]]
<div class="caption">
@@ -120,130 +100,87 @@
<div id="steps">
<h3>Your steps</h3>
- <ol>
- <li>
- <h4>
- First you will
- <span class="windows linux mac-usb">install an intermediary Tails on the first USB stick.</span>
- <span class="mac-dvd">burn an intermediary Tails on a DVD.</span>
- <span class="debian expert">install a Tails on your USB stick.</span>
- <span class="install-clone upgrade-clone">restart on the other Tails.</span>
- <span class="upgrade-tails">install an intermediary Tails.</span>
- </h4>
- <span class="windows linux mac-usb mac-dvd upgrade-tails"><small>[[!toggle id="why_two" text="Why an intermediary Tails?"]]</small></span>
- <div class="row">
- <div class="col-xs-12 col-sm-3 windows linux mac-usb mac-dvd debian expert upgrade-tails">
- <div class="thumbnail">
- [[!img install/inc/infography/download-and-verify.png link="no" alt="ISO image downloaded and verified"]]
- <div class="caption">
- <h5>Download</h5>
- </div>
- </div>
- </div>
- <div class="col-xs-12 col-sm-3 install-clone upgrade-clone">
- <div class="thumbnail">
- [[!img install/inc/infography/restart-on-intermediary-tails.png link="no" alt="Computer restarted on USB stick on the left"]]
- <div class="caption">
- <h5>Restart</h5>
- </div>
- </div>
- </div>
- <div class="col-xs-12 col-sm-3 windows linux mac-usb debian expert">
- <div class="thumbnail">
- [[!img install/inc/infography/install-intermediary-tails.png link="no" alt="ISO image installed on USB stick on the left"]]
- <div class="caption">
- <h5>Install</h5>
- </div>
- </div>
- </div>
- <div class="col-xs-12 col-sm-3 upgrade-tails">
- <div class="thumbnail">
- [[!img install/inc/infography/install-upgrade-usb.png link="no" alt="ISO image installed on USB stick on the left"]]
- <div class="caption">
- <h5>Install</h5>
- </div>
- </div>
- </div>
- <div class="col-xs-12 col-sm-3 mac-dvd">
- <div class="thumbnail">
- [[!img install/inc/infography/insert-dvd.png link="no" alt="DVD inserted"]]
- <div class="caption">
- <h5>Install</h5>
- </div>
- </div>
- </div>
- <div class="col-xs-12 col-sm-3 windows linux mac-usb mac-dvd debian expert">
- <div class="thumbnail">
- [[!img install/inc/infography/restart.png link="no" alt=""]]
- <div class="caption">
- <h5>Restart</h5>
- </div>
- </div>
- </div>
+ <div class="row">
+ <div class="col-xs-12 col-sm-2 windows linux mac-usb mac-dvd debian expert">
+ <div class="thumbnail">
+ [[!img install/inc/infography/download-and-verify.png link="no" alt="ISO image downloaded and verified"]]
+ <p>Download</p>
</div>
- </li>
- <li>
- <h4>
- Then you will
- <span class="windows linux mac-usb">install the final Tails on the second USB stick.</span>
- <span class="mac-dvd">install the final Tails on your USB stick.</span>
- <span class="install-clone">install Tails on your USB stick.</span>
- <span class="debian expert">configure it.</span>
- <span class="upgrade-clone upgrade-tails">upgrade your Tails.</span>
- </h4>
- <div class="row">
- <div class="col-xs-12 col-sm-3 upgrade-tails">
- <div class="thumbnail">
- [[!img install/inc/infography/restart.png link="no" alt=""]]
- <div class="caption">
- <h5>Restart</h5>
- </div>
- </div>
- </div>
- <div class="col-xs-12 col-sm-3 windows linux mac-usb upgrade-tails upgrade-clone install-clone">
- <div class="thumbnail">
- [[!img install/inc/infography/clone-intermediary-tails.png link="no" alt="Tails installed on USB stick on the right"]]
- <div class="caption">
- <h5>
- <span class="install-clone windows linux mac-usb">Install</span>
- <span class="upgrade">Upgrade</span>
- </h5>
- </div>
- </div>
- </div>
- <div class="col-xs-12 col-sm-3 mac-dvd">
- <div class="thumbnail">
- [[!img install/inc/infography/clone-dvd.png link="no" alt="Tails installed on USB stick on the right"]]
- <div class="caption">
- <h5>Install</h5>
- </div>
- </div>
- </div>
- <div class="col-xs-12 col-sm-3 windows linux mac-usb mac-dvd install-clone">
- <div class="thumbnail">
- [[!img install/inc/infography/restart.png link="no" alt=""]]
- <div class="caption">
- <h5>Restart</h5>
- </div>
- </div>
- </div>
- <div class="col-xs-12 col-sm-3 windows linux mac-usb mac-dvd install-clone debian expert">
- <div class="thumbnail">
- [[!img install/inc/infography/create-persistence.png link="no" alt="Encryption configured on USB stick on the right"]]
- <div class="caption">
- <h5>Configure</h5>
- </div>
- </div>
- </div>
- <div class="col-xs-12 col-sm-3">
- <div class="thumbnail">
- [[!img install/inc/infography/restart.png link="no" alt=""]]
- <div class="caption">
- <h5>Restart</h5>
- </div>
- </div>
- </div>
+ </div>
+ <div class="col-xs-12 col-sm-2 upgrade-tails">
+ <div class="thumbnail">
+ [[!img install/inc/infography/download-and-verify-in-tails.png link="no" alt="ISO image downloaded and verified"]]
+ <p>Download</p>
+ </div>
+ </div>
+ <div class="col-xs-12 col-sm-2 install-clone upgrade-clone">
+ <div class="thumbnail">
+ [[!img install/inc/infography/restart-on-intermediary-tails.png link="no" alt="Computer restarted on USB stick on the left"]]
+ <p>Restart</p>
+ </div>
+ </div>
+ <div class="col-xs-12 col-sm-2 windows linux mac-usb debian expert">
+ <div class="thumbnail">
+ [[!img install/inc/infography/install-tails.png link="no" alt="ISO image installed on USB stick on the right"]]
+ <p>Install</p>
+ </div>
+ </div>
+ <div class="col-xs-12 col-sm-2 upgrade-tails">
+ <div class="thumbnail">
+ [[!img install/inc/infography/install-upgrade-usb.png link="no" alt="ISO image installed on USB stick on the left"]]
+ <p>Install intermediary</p>
+ </div>
+ </div>
+ <div class="col-xs-12 col-sm-2 mac-dvd">
+ <div class="thumbnail">
+ [[!img install/inc/infography/insert-dvd.png link="no" alt="DVD inserted"]]
+ <p>Install</p>
</div>
- </li>
- </ol>
+ </div>
+ <div class="col-xs-12 col-sm-2 windows linux mac-usb mac-dvd debian expert">
+ <div class="thumbnail">
+ [[!img install/inc/infography/restart.png link="no" alt=""]]
+ <p>Restart</p>
+ </div>
+ </div>
+ <div class="col-xs-12 col-sm-2 upgrade-tails">
+ <div class="thumbnail">
+ [[!img install/inc/infography/restart.png link="no" alt=""]]
+ <p>Restart</p>
+ </div>
+ </div>
+ <div class="col-xs-12 col-sm-2 upgrade-tails upgrade-clone install-clone">
+ <div class="thumbnail">
+ [[!img install/inc/infography/clone-intermediary-tails.png link="no" alt="Tails installed on USB stick on the right"]]
+ <p>
+ <span class="install-clone">Install</span>
+ <span class="upgrade">Upgrade</span>
+ </p>
+ </div>
+ </div>
+ <div class="col-xs-12 col-sm-2 mac-dvd">
+ <div class="thumbnail">
+ [[!img install/inc/infography/clone-dvd.png link="no" alt="Tails installed on USB stick on the right"]]
+ <p>Install</p>
+ </div>
+ </div>
+ <div class="col-xs-12 col-sm-2 mac-dvd install-clone">
+ <div class="thumbnail">
+ [[!img install/inc/infography/restart.png link="no" alt=""]]
+ <p>Restart</p>
+ </div>
+ </div>
+ <div class="col-xs-12 col-sm-2 windows linux mac-usb mac-dvd install-clone debian expert">
+ <div class="thumbnail">
+ [[!img install/inc/infography/create-persistence.png link="no" alt="Encryption configured on USB stick on the right"]]
+ <p>Configure</p>
+ </div>
+ </div>
+ <div class="col-xs-12 col-sm-2">
+ <div class="thumbnail">
+ [[!img install/inc/infography/restart.png link="no" alt=""]]
+ <p>Restart</p>
+ </div>
+ </div>
+ </div>
</div>
diff --git a/wiki/src/install/inc/stylesheets/overview.css b/wiki/src/install/inc/stylesheets/overview.css
index 95cf425..1ea199b 100644
--- a/wiki/src/install/inc/stylesheets/overview.css
+++ b/wiki/src/install/inc/stylesheets/overview.css
@@ -19,12 +19,6 @@
margin-bottom: 0px;
}
-#steps .caption {
- position: absolute;
- top: 110px;
- width: 100%;
-}
-
#needs .thumbnail img {
width: 100px;
}
@@ -33,23 +27,9 @@
width: 150px;
}
-#steps ol {
- list-style-type: none;
- margin-left: 0;
- max-width: none;
-}
-
-#steps h4 {
- padding: 10px 0;
- margin: 0px;
- font-size: 1.7em;
- color: black;
-}
-
#needs h3, #steps h3 {
padding: 10px 0;
display: inline-block;
font-size: 15px;
- color: darkgrey;
margin-bottom: 0;
}