Commit ad4ba616 authored by sajolida's avatar sajolida
Browse files

Remove debian-usb, windows-usb, linux-usb, and expert-usb classes

Now that we wrote a common scenario for DVDs and VMs, we only have one
specific scenario for these operating systems, so we can simplify the
CSS tricks a bit.
parent d33823f2
......@@ -4,7 +4,7 @@
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/dave" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/debian-usb" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/debian" rel="stylesheet" title=""]]
[[!meta script="install/inc/js/dave"]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
......
......@@ -3,7 +3,7 @@
[[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/overview" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/debian-usb" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/debian" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
......
......@@ -2,7 +2,6 @@
[[!meta title="Installing Tails on a USB stick from Debian or Ubuntu using the command line"]]
[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/expert" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/expert-usb" rel="stylesheet" title=""]]
[[Back|install/debian]]
......
......@@ -7,24 +7,24 @@
<div class="caption">
<h4>
<span class="windows-usb linux-usb mac-usb mac-dvd">1 or 2 hours</span>
<span class="windows linux mac-usb mac-dvd">1 or 2 hours</span>
<span class="debian expert">1 hour</span>
<span class="install-clone">15 minutes</span>
<span class="upgrade-clone">10 minutes</span>
<br />
<span class="windows-usb linux-usb mac-usb mac-dvd debian expert upgrade-tails">
<span class="windows linux mac-usb mac-dvd debian expert upgrade-tails">
<small>[[!inline pages="inc/stable_i386_iso_size_mib" raw="yes"]] to download</small><br />
</span>
<span class="windows-usb linux-usb mac-usb mac-dvd"><small>45 minutes to install</small></span>
<span class="windows linux mac-usb mac-dvd"><small>45 minutes to install</small></span>
<span class="debian expert"><small>25 minutes to install</small></span>
<span class="upgrade-tails"><small>20 minutes to upgrade</small></span>
</h4>
</div>
</div>
</div>
<div class="col-sm-6 col-md-3 windows-usb linux-usb mac-usb">
<div class="col-sm-6 col-md-3 windows linux mac-usb">
<div class="thumbnail">
[[!img install/inc/icons/2-usb.png link="no"]]
<div class="caption">
......@@ -96,14 +96,14 @@
<li>
<h4>
First you will
<span class="windows-usb linux-usb mac-usb">install a temporary Tails on the first USB stick.</span>
<span class="windows linux mac-usb">install a temporary Tails on the first USB stick.</span>
<span class="mac-dvd">burn a temporary 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 and upgrade a temporary Tails.</span>
</h4>
<div class="row">
<div class="col-md-3 col-md-offset-1 windows-usb linux-usb mac-usb mac-dvd debian expert upgrade-tails">
<div class="col-md-3 col-md-offset-1 windows linux mac-usb mac-dvd debian expert upgrade-tails">
<div class="thumbnail step">
[[!img install/inc/infography/download-and-verify.png link="no"]]
<div class="caption">
......@@ -119,7 +119,7 @@
</div>
</div>
</div>
<div class="col-md-3 windows-usb linux-usb mac-usb debian expert">
<div class="col-md-3 windows linux mac-usb debian expert">
<div class="thumbnail step">
[[!img install/inc/infography/install-temporary-tails.png link="no"]]
<div class="caption">
......@@ -151,7 +151,7 @@
</div>
</div>
</div>
<div class="col-md-2 windows-usb linux-usb mac-usb mac-dvd debian expert">
<div class="col-md-2 windows linux mac-usb mac-dvd debian expert">
<div class="thumbnail">
[[!img install/inc/icons/restart.png link="no"]]
<div class="caption">
......@@ -164,7 +164,7 @@
<li>
<h4>
Then you will
<span class="windows-usb linux-usb mac-usb">install the final Tails on the second USB stick.</span>
<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>
......@@ -179,12 +179,12 @@
</div>
</div>
</div>
<div class="col-md-3 col-md-offset-1 windows-usb linux-usb mac-usb upgrade-tails upgrade-clone install-clone">
<div class="col-md-3 col-md-offset-1 windows linux mac-usb upgrade-tails upgrade-clone install-clone">
<div class="thumbnail step">
[[!img install/inc/infography/clone-temporary-tails.png link="no"]]
<div class="caption">
<h5>
<span class="install-clone windows-usb linux-usb mac-usb">Install</span>
<span class="install-clone windows linux mac-usb">Install</span>
<span class="upgrade">Upgrade</span>
</h5>
</div>
......@@ -198,7 +198,7 @@
</div>
</div>
</div>
<div class="col-md-2 windows-usb linux-usb mac-usb mac-dvd install-clone">
<div class="col-md-2 windows linux mac-usb mac-dvd install-clone">
<div class="thumbnail">
[[!img install/inc/icons/restart.png link="no"]]
<div class="caption">
......@@ -208,7 +208,7 @@
</div>
<div class="col-md-1 debian expert">
</div>
<div class="col-md-3 windows-usb linux-usb mac-usb mac-dvd install-clone debian expert">
<div class="col-md-3 windows linux mac-usb mac-dvd install-clone debian expert">
<div class="thumbnail step">
[[!img install/inc/infography/create-persistence.png link="no"]]
<div class="caption">
......
......@@ -5,7 +5,7 @@ Create an encrypted persistent storage (optional)
You can optionally create an *encrypted persistent storage* in the
remaining free space on the
<span class="windows-usb linux-usb mac-usb">final</span>
<span class="windows linux mac-usb">final</span>
<span class="clone">new</span>
Tails USB stick to store any of the following:
......@@ -94,7 +94,7 @@ Passphrase</span> text boxes. Click on the <span class="guilabel">Create</span>
<div class="step-image">[[!img install/inc/infography/restart-on-tails.png link="no"]]</div>
1. Shut down the computer and restart on the
<span class="windows-usb linux-usb mac-usb">final</span>
<span class="windows linux mac-usb">final</span>
<span class="clone">new</span>
Tails USB stick.
......@@ -127,8 +127,8 @@ Passphrase</span> text boxes. Click on the <span class="guilabel">Create</span>
<span class="guimenu">Places</span>&nbsp;▸
<span class="guimenuitem">Persistent</span></span>.
<div class="state-image debian-usb expert">[[!img install/inc/infography/tails-usb-with-persistence.png link="no"]]</div>
<div class="state-image windows-usb linux-usb mac-usb clone">[[!img install/inc/infography/final-tails-with-persistence.png link="no"]]</div>
<div class="state-image debian expert">[[!img install/inc/infography/tails-usb-with-persistence.png link="no"]]</div>
<div class="state-image windows linux mac-usb clone">[[!img install/inc/infography/final-tails-with-persistence.png link="no"]]</div>
<div class="state-image dvd">[[!img install/inc/infography/tails-usb-with-persistence.png link="no"]]</div>
<div class="trophy" id="recommendations">
......
......@@ -169,9 +169,9 @@ Download and verify
<p>You downloaded and verified the ISO image successfully!</p>
<p>You can now continue with the next step and
<span class="install-clone">[[Open these instructions on another device|install/clone#next]].</span>
<span class="debian-usb">[[Install <span class="application">Tails Installer</span>|install/debian/usb#next]].</span>
<span class="windows-usb">[[Install a temporary Tails|install/win/usb#next]].</span>
<span class="linux-usb">[[Install a temporary Tails|install/linux/usb#next]].</span>
<span class="debian">[[Install <span class="application">Tails Installer</span>|install/debian/usb#next]].</span>
<span class="windows">[[Install a temporary Tails|install/win/usb#next]].</span>
<span class="linux">[[Install a temporary Tails|install/linux/usb#next]].</span>
<span class="mac-dvd">[[Burn a Tails DVD|install/mac/dvd#next]].</span>
<span class="mac-usb">[[Install a temporary Tails|install/mac/usb#next]].</span>
<span class="mac-clone">[[Open these instructions on another device|install/mac/clone#next]].</span>
......
<h1 class="debian expert install-clone">Install Tails</h1>
<h1 class="windows-usb linux-usb mac-usb">Install the final Tails</h1>
<h1 class="windows linux mac-usb">Install the final Tails</h1>
<h1 class="dvd">Install Tails on a USB stick</h1>
<h1 class="upgrade">Upgrade your Tails</h1>
<p class="debian windows linux mac expert">
In this step, you will install
<span class="windows-usb linux-usb mac-usb">the final</span>
<span class="windows linux mac-usb">the final</span>
Tails on a
<span class="windows-usb linux-usb mac-usb">second</span>
<span class="windows linux mac-usb">second</span>
<span class="install-clone mac-clone">new</span>
USB stick using
<span class="application">Tails Installer</span>.
......@@ -35,17 +35,17 @@
</div>
<div class="step-image">
[[!img install/inc/infography/plug-usb.png link="no" class="debian-usb"]]
[[!img install/inc/infography/plug-second-usb.png link="no" class="windows-usb linux-usb mac-usb install-clone mac-clone"]]
[[!img install/inc/infography/plug-usb.png link="no" class="debian"]]
[[!img install/inc/infography/plug-second-usb.png link="no" class="windows linux mac-usb install-clone mac-clone"]]
[[!img install/inc/infography/plug-tails-usb.png link="no" class="dvd"]]
[[!img install/inc/infography/plug-upgraded-usb.png link="no" class="upgrade-clone upgrade-tails"]]
</div>
1. Plug
<span class="windows-usb linux-usb mac-usb">the second</span>
<span class="windows linux mac-usb">the second</span>
<span class="install-clone mac-clone">the new</span>
<span class="upgrade">your Tails</span>
<span class="debian-usb expert dvd">the</span>
<span class="debian expert dvd">the</span>
USB stick in the computer.
1. <div class="windows linux mac upgrade install-clone"><p>
......@@ -72,8 +72,8 @@
[[!img install/inc/screenshots/tails_installer_in_debian.png link="no" class="screenshot debian expert"]]
<div class="step-image">
[[!img install/inc/infography/install-tails.png link="no" class="debian-usb"]]
[[!img install/inc/infography/clone-temporary-tails.png link="no" class="windows-usb linux-usb mac-usb clone upgrade-tails"]]
[[!img install/inc/infography/install-tails.png link="no" class="debian"]]
[[!img install/inc/infography/clone-temporary-tails.png link="no" class="windows linux mac-usb clone upgrade-tails"]]
[[!img install/inc/infography/clone-dvd.png link="no" class="dvd"]]
</div>
......@@ -81,9 +81,9 @@
and choose the ISO image that you downloaded earlier.</p>
Choose
<span class="windows-usb linux-usb mac-usb">the second</span>
<span class="windows linux mac-usb">the second</span>
<span class="install-clone mac-clone">the new</span>
<span class="debian-usb expert dvd upgrade-clone">your</span>
<span class="debian expert dvd upgrade-clone">your</span>
USB stick in the <span class="guilabel">Target Device</span> drop-down list.
1. To start the
......
<h1 class="windows-usb linux-usb mac-usb upgrade-tails">Restart on the temporary Tails</h1>
<h1 class="windows linux mac-usb upgrade-tails">Restart on the temporary Tails</h1>
<h1 class="clone">Restart on the other Tails</h1>
<h1 class="dvd">Restart on the Tails DVD</h1>
<div class="step-image">
[[!img install/inc/infography/plug-source-usb.png link="no" class="install-clone mac-clone"]]
[[!img install/inc/infography/plug-other-usb.png link="no" class="upgrade-clone"]]
[[!img install/inc/infography/restart-on-tails.png link="no" class="debian-usb"]]
[[!img install/inc/infography/restart-on-temporary-tails.png link="no" class="clone windows-usb linux-usb mac-usb"]]
[[!img install/inc/infography/restart-on-tails.png link="no" class="debian"]]
[[!img install/inc/infography/restart-on-temporary-tails.png link="no" class="clone windows linux mac-usb"]]
[[!img install/inc/infography/restart-on-dvd.png link="no" class="dvd"]]
[[!img install/inc/infography/restart-on-upgrade-usb.png link="no" class="upgrade-tails"]]
</div>
......
......@@ -24,7 +24,7 @@
[[!inline pages="install/inc/steps/mac_startup_disks.inline" raw="yes"]]
<div class="note windows-usb linux-usb">
<div class="note windows linux">
<p>Some computers start successfully on the temporary Tails but fail
to start on the final Tails. If this is your case, refer to the
troubleshooting section about [[!toggle id="not_at_all" text="Tails
......
......@@ -9,13 +9,13 @@ the rest of the instructions afterwards, we recommend you either:
- Open this page on your smartphone, tablet, or another computer (recommended).
[[!img install/inc/qrcodes/tails_boum_org_install_clone.png class="install-clone" link="no"]]
[[!img install/inc/qrcodes/tails_boum_org_install_win_usb.png class="windows-usb" link="no"]]
[[!img install/inc/qrcodes/tails_boum_org_install_win_usb.png class="windows" link="no"]]
[[!img install/inc/qrcodes/tails_boum_org_install_mac_usb.png class="mac-usb" link="no"]]
[[!img install/inc/qrcodes/tails_boum_org_install_mac_clone.png class="mac-clone" link="no"]]
[[!img install/inc/qrcodes/tails_boum_org_install_mac_dvd.png class="mac-dvd" link="no"]]
[[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class="debian-usb" link="no"]]
[[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class="expert-usb" link="no"]]
[[!img install/inc/qrcodes/tails_boum_org_install_linux_usb.png class="linux-usb" link="no"]]
[[!img install/inc/qrcodes/tails_boum_org_install_debian_usb.png class="debian" link="no"]]
[[!img install/inc/qrcodes/tails_boum_org_install_expert_usb.png class="expert" link="no"]]
[[!img install/inc/qrcodes/tails_boum_org_install_linux_usb.png class="linux" link="no"]]
[[!img install/inc/qrcodes/tails_boum_org_upgrade_clone.png class="upgrade-clone" link="no"]]
[[!img install/inc/qrcodes/tails_boum_org_upgrade_tails.png class="upgrade-tails" link="no"]]
......@@ -24,12 +24,12 @@ the rest of the instructions afterwards, we recommend you either:
- Take note of the URL of this page to be able to come back later:
<a class="install-clone" href="https://tails.boum.org/install/clone/">https://tails.boum.org/install/clone/</a>
<a class="windows-usb" href="https://tails.boum.org/install/win/usb/">https://tails.boum.org/install/win/usb/</a>
<a class="windows" href="https://tails.boum.org/install/win/usb/">https://tails.boum.org/install/win/usb/</a>
<a class="mac-usb" href="https://tails.boum.org/install/mac/usb/">https://tails.boum.org/install/mac/usb/</a>
<a class="mac-clone" href="https://tails.boum.org/install/mac/clone/">https://tails.boum.org/install/mac/clone/</a>
<a class="mac-dvd" href="https://tails.boum.org/install/mac/dvd/">https://tails.boum.org/install/mac/dvd/</a>
<a class="debian-usb" href="https://tails.boum.org/install/debian/usb/">https://tails.boum.org/install/debian/usb/</a>
<a class="expert-usb" href="https://tails.boum.org/install/expert/usb/">https://tails.boum.org/install/expert/usb/</a>
<a class="linux-usb" href="https://tails.boum.org/install/linux/usb/">https://tails.boum.org/install/linux/usb/</a>
<a class="debian" href="https://tails.boum.org/install/debian/usb/">https://tails.boum.org/install/debian/usb/</a>
<a class="expert" href="https://tails.boum.org/install/expert/usb/">https://tails.boum.org/install/expert/usb/</a>
<a class="linux" href="https://tails.boum.org/install/linux/usb/">https://tails.boum.org/install/linux/usb/</a>
<a class="upgrade-clone" href="https://tails.boum.org/upgrade/clone/">https://tails.boum.org/upgrade/clone/</a>
<a class="upgrade-tails" href="https://tails.boum.org/upgrade/tails/">https://tails.boum.org/upgrade/tails/</a>
<div class="state-image debian-usb expert dvd">[[!img install/inc/infography/tails-usb.png link="no"]]</div>
<div class="state-image windows-usb linux-usb mac-usb">[[!img install/inc/infography/final-tails.png link="no"]]</div>
<div class="state-image debian expert dvd">[[!img install/inc/infography/tails-usb.png link="no"]]</div>
<div class="state-image windows linux mac-usb">[[!img install/inc/infography/final-tails.png link="no"]]</div>
<div class="state-image install-clone mac-clone">[[!img install/inc/infography/new-tails.png link="no"]]</div>
<div class="trophy">
......@@ -11,12 +11,12 @@ and configuration in an encrypted storage on the <span class="usb">final</span><
our instructions until the end. Otherwise, have a look at our
<span class="install-clone">[[final recommendations|clone#recommendations]].</span>
<span class="expert">[[final recommendations|expert/usb#recommendations]].</span>
<span class="debian-usb">[[final recommendations|debian/usb#recommendations]].</span>
<span class="windows-usb">[[final recommendations|win/usb#recommendations]].</span>
<span class="debian">[[final recommendations|debian/usb#recommendations]].</span>
<span class="windows">[[final recommendations|win/usb#recommendations]].</span>
<span class="mac-usb">[[final recommendations|mac/usb#recommendations]].</span>
<span class="mac-clone">[[final recommendations|mac/clone#recommendations]].</span>
<span class="mac-dvd">[[final recommendations|mac/dvd#recommendations]].</span>
<span class="linux-usb">[[final recommendations|linux/usb#recommendations]].</span>
<span class="linux">[[final recommendations|linux/usb#recommendations]].</span>
</p>
</div>
@import url("debian.css");
@import url("usb.css");
span.debian-usb, a.debian-usb {
display: inline;
}
div.debian-usb, img.debian-usb, p.debian-usb, h1.debian-usb {
display: block;
}
li.debian-usb {
display: list-item;
}
h1:before {
content: counter(step)'/6.';
}
@import url("usb.css");
span.debian, a.debian {
display: inline;
}
......@@ -9,3 +11,7 @@ div.debian, img.debian, p.debian, h1.debian {
li.debian {
display: list-item;
}
h1:before {
content: counter(step)'/6.';
}
@import url("expert.css");
@import url("usb.css");
span.expert-usb, a.expert-usb {
display: inline;
}
div.expert-usb, img.expert-usb, p.expert-usb, h1.expert-usb {
display: block;
}
li.expert-usb {
display: list-item;
}
#content {
padding-left: 50px;
}
h1:before {
content: counter(step)'/7.';
}
@import url("usb.css");
span.expert, a.expert {
display: inline;
}
......@@ -30,3 +32,7 @@ pre, p.pre {
div.note p.pre {
width: 34em;
}
h1:before {
content: counter(step)'/7.';
}
@import url("linux.css");
@import url("usb.css");
span.linux-usb, a.linux-usb {
display: inline;
}
div.linux-usb, img.linux-usb, p.linux-usb, h1.linux-usb {
display: block;
}
li.linux-usb {
display: list-item;
}
h1:before {
content: counter(step)'/7.';
}
@import url("usb.css");
span.linux, a.linux {
display: inline;
}
......@@ -9,3 +11,7 @@ div.linux, img.linux, p.linux, h1.linux {
li.linux {
display: list-item;
}
h1:before {
content: counter(step)'/7.';
}
......@@ -2,11 +2,8 @@
.clone, .usb, .dvd,
.install-clone,
.windows, .windows-usb,
.windows, .debian, .expert, .linux,
.mac, .mac-usb, .mac-dvd, .mac-clone,
.debian, .debian-usb,
.expert, .expert-usb,
.linux, .linux-usb,
.upgrade, .upgrade-clone, .upgrade-tails {
display: none;
}
@import url("windows.css");
@import url("usb.css");
span.windows-usb, a.windows-usb {
display: inline;
}
div.windows-usb, img.windows-usb, p.windows-usb, h1.windows-usb {
display: block;
}
li.windows-usb {
display: list-item;
}
h1:before {
content: counter(step)'/7.';
}
@import url("usb.css");
span.windows, a.windows {
display: inline;
}
......@@ -9,3 +11,7 @@ div.windows, img.windows, p.windows, h1.windows {
li.windows {
display: list-item;
}
h1:before {
content: counter(step)'/7.';
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment