Commit e922d518 authored by sajolida's avatar sajolida
Browse files

Merge remote-tracking branch 'origin/web/10623-css-improvements' into web/10623-css-improvements

Conflicts:
	wiki/src/doc/about.index.de.po
	wiki/src/install/inc/overview.it.po
	wiki/src/install/inc/stylesheets/dave.css
parents bf0f1cb8 c215456c
......@@ -5,7 +5,7 @@
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
[[<span class="back">Back</span>|install/os]]
<div id="back">[[Back|install/os]]</div>
<h1 class="text-center"><strong>Debian</strong>, <strong>Ubuntu</strong>, or <strong>Mint</strong></h1>
......@@ -56,14 +56,12 @@
<div class="row also">
<div class="col-sm-4 col-sm-offset-8">
<small>
You can also:
<ul>
<li>[[Burn Tails on a DVD|dvd]]</li>
<li>[[Run Tails in a virtual machine|vm]]</li>
</ul>
You can also:
<ul>
<li>[[Burn Tails on a DVD|dvd]]</li>
<li>[[Run Tails in a virtual machine|vm]]</li>
</ul>
</small>
</div>
</div>
......@@ -7,7 +7,7 @@
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
[[<span class="back">Back</span>|install/debian]]
<div id="back">[[Back|install/debian]]</div>
<h1 class="text-center">Install from <strong>another Tails</strong></h1>
......
......@@ -7,7 +7,7 @@
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
[[<span class="back">Back</span>|install/debian]]
<div id="back">[[Back|install/debian]]</div>
<h1 class="text-center">Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or <strong>Mint</strong></h1>
......
......@@ -7,7 +7,7 @@
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
[[<span class="back">Back</span>|install/debian]]
<div id="back">[[Back|install/debian]]</div>
<h1 class="text-center">Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or <strong>Mint</strong> <small>using the command line and GnuPG</small></h1>
......
......@@ -212,8 +212,8 @@ msgid "Upgrade"
msgstr "Aggiorna"
#. type: Content of: <div><ol><li><div><div><div>
msgid "[[!img install/inc/icons/restart.png link=\"no\" alt=\"\"]]"
msgstr ""
msgid "[[!img install/inc/infography/restart.png link=\"no\" alt=\"\"]]"
msgstr "[[!img install/inc/infography/restart.png link=\"no\" alt=\"\"]]"
#. type: Content of: <div><ol><li><div><div><div><div><h5>
msgid "Restart"
......
<div class="trophy">
<div class="state-image debian expert mac-dvd">[[!img install/inc/infography/tails-usb.png link="no" alt="Tails USB stick"]]</div>
<div class="state-image windows linux mac-usb">[[!img install/inc/infography/final-tails.png link="no" alt="Final Tails USB stick and intermediary USB stick that can be discarded"]]</div>
<div class="state-image install-clone mac-clone">[[!img install/inc/infography/new-tails.png link="no" alt="New Tails USB stick"]]</div>
<div class="trophy">
<p>Yeah, you are done installing Tails!</p>
<p>If you want to save some of your documents
......@@ -127,12 +127,12 @@ Restart and activate the persistent storage
<span class="guimenu">Places</span>&nbsp;▸
<span class="guimenuitem">Persistent</span></span>.
<div class="trophy" id="recommendations">
<div class="state-image debian expert">[[!img install/inc/infography/tails-usb-with-persistence.png link="no" alt="Tails USB stick with persistent storage"]]</div>
<div class="state-image windows linux mac-usb clone">[[!img install/inc/infography/final-tails-with-persistence.png link="no" alt="Final Tails USB stick with persistent storage"]]</div>
<div class="state-image mac-dvd">[[!img install/inc/infography/tails-usb-with-persistence.png link="no" alt="Tails USB stick with persistent storage"]]</div>
<div class="trophy" id="recommendations">
<p>You now have a working Tails, congrats!</p>
<h3>Final recommendations</h3>
......@@ -141,7 +141,7 @@ Restart and activate the persistent storage
<div class="col-md-6">
[[!img lib/admon-caution.png link="no" alt=""]]
[[!img lib/admon-caution.png link="no" alt="" class="float-left"]]
<p>Tails does not protect you from everything! Have a look at our
[[warnings|doc/about/warning]].</p>
......@@ -150,7 +150,7 @@ Restart and activate the persistent storage
<div class="col-md-6">
[[!img lib/help-browser.png link="no" alt=""]]
[[!img lib/help-browser.png link="no" alt="" class="float-left"]]
<p>If you face any problem, use the <span class="guilabel">Report an
error</span> launcher on the Tails desktop or visit our [[support
......
<h1 id="install-tails" class="debian expert install-clone mac-clone">Install Tails</h1>
<h1 id="install-final" class="windows linux mac">Install the final Tails</h1>
<h1 id="install-final" class="windows linux mac-usb">Install the final Tails</h1>
<h1 id="install-usb" class="mac-dvd">Install Tails on a USB stick</h1>
<h1 id="upgrade" class="upgrade">Upgrade your Tails</h1>
......
<div class="state-image" id="intermediary">[[!img install/inc/infography/intermediary-tails.png link="no" alt="Intermediary Tails"]]</div>
<div class="trophy">
<div class="state-image" id="intermediary">[[!img install/inc/infography/intermediary-tails.png link="no" alt="Intermediary Tails"]]</div>
<p>Cool, you now have an intermediary Tails on your first USB stick. You
will soon have to restart your computer on this USB stick.
<span class="windows linux">It can be a bit tricky, so good luck!</span>
......
/* LAYOUT */
.banner {
height: 70px;
}
.banner, .page {
box-sizing: content-box;
}
#tails-installation-assistant {
position: absolute;
top: -57px;
top: -20px;
right: 436px;
font-family: "Source Sans Pro Regular", "DejaVu Sans", "Verdana", "sans-serif";
font-size: 20px;
......@@ -68,7 +72,6 @@ span.title {
.also {
margin-top: 10px;
font-size: 17px;
}
.also div {
......@@ -80,15 +83,6 @@ span.title {
margin: 0px;
}
#pagebody #content .also small ul li a {
color: #0a0;
text-decoration: underline;
}
#pagebody a {
border: none;
}
h1, h2, h3, h4, h5, h6 {
font-family: "Source Sans Pro Regular", "DejaVu Sans", "Verdana", "sans-serif";
}
......@@ -145,34 +139,23 @@ td, th {
/* BACK BUTTON */
#pagebody .back {
#back a {
border: solid 1px #56347C;
border-radius: 4px;
display: inline-block;
padding: 5px;
position: relative;
left: -30px;
top: -5px;
text-decoration: none !important;
background: white;
color: #0A0;
}
#pagebody .back:hover {
#back a:hover {
color: #56347C;
border: solid 1px #0A0;
background: #0A0;
color: white;
}
#pagebody .back:hover a {
color: #56347C;
}
#pagebody .back a {
color: #56347C;
}
/* PANELS */
......
......@@ -38,6 +38,7 @@ pre, p.pre {
.state-image {
text-align: center;
margin-bottom: 1em;
}
body {
......@@ -93,6 +94,7 @@ div.trophy {
margin-top: 30px;
padding-top: 20px;
padding-bottom: 0px;
padding-right: 20px;
position: relative;
background-color: white;
}
......@@ -143,9 +145,10 @@ h3 {
#recommendations .row p a {
color: white;
text-decoration: underline;
border: none;
}
#recommendations img {
#recommendations img.float-left {
float: left;
}
......
......@@ -6,7 +6,7 @@
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
[[<span class="back">Back</span>|install/os]]
<div id="back">[[Back|install/os]]</div>
<h1 class="text-center">Other <strong>Linux</strong> <small>(Red Hat, Fedora, etc.)</small></h1>
......@@ -55,14 +55,12 @@
<div class="row also">
<div class="col-sm-4 col-sm-offset-8">
<small>
You can also:
<ul>
<li>[[Burn Tails on a DVD|dvd]]</li>
<li>[[Run Tails in a virtual machine|vm]]</li>
</ul>
You can also:
<ul>
<li>[[Burn Tails on a DVD|dvd]]</li>
<li>[[Run Tails in a virtual machine|vm]]</li>
</ul>
</small>
</div>
</div>
......@@ -7,7 +7,7 @@
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
[[<span class="back">Back</span>|install/linux]]
<div id="back">[[Back|install/linux]]</div>
<h1 class="text-center">Install from <strong>another Tails</strong></h1>
......
......@@ -7,7 +7,7 @@
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
[[<span class="back">Back</span>|install/linux]]
<div id="back">[[Back|install/linux]]</div>
<h1 class="text-center">Install from <strong>Linux</strong></h1>
......
......@@ -6,7 +6,7 @@
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
[[<span class="back">Back</span>|install/os]]
<div id="back">[[Back|install/os]]</div>
<h1 class="text-center"><strong>Mac</strong></h1>
......@@ -88,13 +88,11 @@ installation methods</strong>.</p>
<div class="row also">
<div class="col-sm-4 col-sm-offset-8">
<small>
You can also:
<ul>
<li>[[Run Tails in a virtual machine|vm]]</li>
</ul>
</small>
</div>
</div>
......@@ -7,7 +7,7 @@
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
[[<span class="back">Back</span>|install/mac]]
<div id="back">[[Back|install/mac]]</div>
<h1 class="text-center">Install from <strong>another Tails</strong></h1>
......
......@@ -49,10 +49,10 @@ image on a DVD.
1. Wait until the DVD is burnt.
<div class="state-image">[[!img install/inc/infography/intermediary-tails-on-dvd.png link="no" alt="Intermediary Tails DVD"]]</div>
<div class="trophy">
<div class="state-image">[[!img install/inc/infography/intermediary-tails-on-dvd.png link="no" alt="Intermediary Tails DVD"]]</div>
<p>Cool, you now have an intermediary Tails on a DVD.</p>
</div>
......
......@@ -7,7 +7,7 @@
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
[[<span class="back">Back</span>|install/mac]]
<div id="back">[[Back|install/mac]]</div>
<h1 class="text-center">Install from <strong>Mac</strong> <small>by burning a DVD first</small></h1>
......
......@@ -7,7 +7,7 @@
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
[[<span class="back">Back</span>|install/mac]]
<div id="back">[[Back|install/mac]]</div>
<h1 class="text-center">Install from <strong>Mac</strong> <small>using the command line</small></h1>
......
......@@ -4,7 +4,7 @@
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
[[<span class="back">Back</span>|install]]
<div id="back">[[Back|install]]</div>
<h1>Which <strong>operating system</strong> are you installing Tails from?</h1>
......
......@@ -6,7 +6,7 @@
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
[[<span class="back">Back</span>|install/os]]
<div id="back">[[Back|install/os]]</div>
<h1 class="text-center"><strong>Windows</strong></h1>
......@@ -55,14 +55,12 @@
<div class="row also">
<div class="col-sm-4 col-sm-offset-8">
<small>
You can also:
<ul>
<li>[[Burn Tails on a DVD|dvd]]</li>
<li>[[Run Tails in a virtual machine|vm]]</li>
</ul>
You can also:
<ul>
<li>[[Burn Tails on a DVD|dvd]]</li>
<li>[[Run Tails in a virtual machine|vm]]</li>
</ul>
</small>
</div>
</div>
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