Merge remote-tracking branch 'origin/web/10734-title-consistency'

Conflicts:
	wiki/src/install/debian.html
	wiki/src/install/debian/usb.mdwn
	wiki/src/install/debian/usb/overview.html
	wiki/src/install/expert/usb.mdwn
	wiki/src/install/expert/usb/overview.html
	wiki/src/install/mac/usb/overview.html

wiki/src/install/debian.html

@@ -8,7 +8,7 @@
 
 [[<span class="back">Back</span>|install/os]]
 
-<h1 class="text-center"><strong>Debian, Ubuntu, or Mint</strong></h1>
+<h1 class="text-center"><strong>Debian</strong>, <strong>Ubuntu</strong>, or <strong>Mint</strong></h1>
 
 <div id="scenarios" class="row">
   <div class="col-md-6">
@@ -47,7 +47,7 @@
     [[
       <div class="panel panel-primary">
         <div class="panel-heading">
-          <h3 class="panel-title"><small>Install from Debian, Ubuntu, or Mint using the</small><br />command line <small> and </small> GnuPG</h3>
+          <h3 class="panel-title"><small>Install from Debian, Ubuntu, or Mint using the</small><br />command line <small>and</small> GnuPG</h3>
         </div>
       </div>
     |expert/usb/overview]]

wiki/src/install/debian/usb.mdwn

-[[!meta title="Installing Tails on a USB stick from Debian, Ubuntu, or Mint"]]
+[[!meta title="Install from Debian, Ubuntu, or Mint"]]
 
 [[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]

wiki/src/install/debian/usb/overview.html

-[[!meta title="Install from Debian, Ubuntu, or Mint"]]
+[[!meta title="Install from Debian, Ubuntu, or Mint: overview"]]
 
 [[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
@@ -7,9 +7,9 @@
 
 [[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
 
-[[<span class="back">Back</span>|install/win]]
+[[<span class="back">Back</span>|install/debian]]
 
-<h1 class="text-center">Install from <strong>Debian, Ubuntu, or Mint</strong></h1>
+<h1 class="text-center">Install from <strong>Debian</strong>, <strong>Ubuntu</strong>, or <strong>Mint</strong></h1>
 
 [[!inline pages="install/inc/overview" raw="yes"]]
 

wiki/src/install/expert/usb.mdwn

-[[!meta title="Installing Tails on a USB stick from Debian, Ubuntu, or Mint using the command line"]]
+[[!meta title="Install from Debian, Ubuntu, or Mint using the command line and GnuPG"]]
 
 [[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]

wiki/src/install/expert/usb/overview.html

-[[!meta title="Install from Debian, Ubuntu, or Mint using the command line and GnuPG"]]
+[[!meta title="Install from Debian, Ubuntu, or Mint using the command line and GnuPG: overview"]]
 
 [[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
@@ -9,7 +9,7 @@
 
 [[<span class="back">Back</span>|install/debian]]
 
-<h1 class="text-center"><small>Install from Debian, Ubuntu, or Mint using the</small><br />command line <small> and </small> GnuPG</h1>
+<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>
 
 [[!inline pages="install/inc/overview" raw="yes"]]
 

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

@@ -133,11 +133,14 @@ ul {
   border-radius: 4px;
   display: inline-block;
   padding: 5px;
+  text-decoration: none !important;
+  background: white;
 }
 
 #pagebody .back:hover {
   border: solid 1px #0A0;
   background: #0A0;
+  color: white;
 }
 
 #pagebody .back:hover a {

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

 span.title {
   display: block;
+  font-weight: 100;
+  padding-top: 100px;
+  color: black;
+  font-size: 36px;
+  text-align: center;
+  border-left: none;
 }
 
 .sidebar {
@@ -38,6 +44,7 @@ body {
   counter-reset: step;
 }
 
+
 h1:before {
   position: relative;
   left: -2.5em;
@@ -75,7 +82,7 @@ h1 {
   color: #56347C;
   font-weight: 400;
   margin-left: -150px;
-  margin-top: 100px;
+  margin-top: 50px;
 }
 
 /* Stronger introduction  */

wiki/src/install/linux.html

@@ -8,7 +8,7 @@
 
 [[<span class="back">Back</span>|install/os]]
 
-<h1 class="text-center"><strong>Other Linux</strong> <small>(Red Hat, Fedora, etc.)</small></h1>
+<h1 class="text-center">Other <strong>Linux</strong> <small>(Red Hat, Fedora, etc.)</small></h1>
 
 <div id="scenarios" class="row">
   <div class="col-md-6">

wiki/src/install/linux/usb.mdwn

-[[!meta title="Installing Tails on a USB stick from Linux"]]
+[[!meta title="Install from Linux"]]
 
 [[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]

wiki/src/install/linux/usb/overview.html

-[[!meta title="Other Linux (Red Hat, Fedora, etc.)"]]
+[[!meta title="Install from Linux: overview"]]
 
 [[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
@@ -7,9 +7,9 @@
 
 [[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes"]]
 
-[[<span class="back">Back</span>|install/win]]
+[[<span class="back">Back</span>|install/linux]]
 
-<h1 class="text-center"><strong>Install from Linux</strong> <small>(Red Hat, Fedora, etc.)</small></h1>
+<h1 class="text-center">Install from <strong>Linux</strong></h1>
 
 [[!inline pages="install/inc/overview" raw="yes"]]
 

wiki/src/install/mac/dvd.mdwn

-[[!meta title="Installing Tails on a USB stick from Mac by burning a DVD first"]]
+[[!meta title="Install from Mac by burning a DVD first"]]
 
 [[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]

wiki/src/install/mac/dvd/overview.html

-[[!meta title="Mac: burn a DVD and then install"]]
+[[!meta title="Install from Mac by burning a DVD first: overview"]]
 
 [[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
@@ -9,7 +9,7 @@
 
 [[<span class="back">Back</span>|install/mac]]
 
-<h1 class="text-center">Mac: <strong>burn a DVD</strong> and then install</h1>
+<h1 class="text-center">Install from <strong>Mac</strong> <small>by burning a DVD first</small></h1>
 
 [[!inline pages="install/inc/overview" raw="yes"]]
 

wiki/src/install/mac/usb.mdwn

-[[!meta title="Installing Tails on a USB stick from Mac using the command line"]]
+[[!meta title="Install from Mac using the command line"]]
 
 [[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]

wiki/src/install/mac/usb/overview.html

-[[!meta title="Install from Mac using the command line"]]
+[[!meta title="Install from Mac using the command line: overview"]]
 
 [[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
@@ -9,7 +9,7 @@
 
 [[<span class="back">Back</span>|install/mac]]
 
-<h1 class="text-center">Install from <strong>Mac</strong> using the <strong>command line</strong></h1>
+<h1 class="text-center">Install from <strong>Mac</strong> <small>using the command line</small></h1>
 
 [[!inline pages="install/inc/overview" raw="yes"]]
 

wiki/src/install/win/usb.mdwn

-[[!meta title="Installing Tails on a USB stick from Windows"]]
+[[!meta title="Install from Windows"]]
 
 [[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]

wiki/src/install/win/usb/overview.html

-[[!meta title="Install from Windows"]]
+[[!meta title="Install from Windows: overview"]]
 
 [[!meta stylesheet="bootstrap" rel="stylesheet" title=""]]
 [[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
@@ -9,7 +9,7 @@
 
 [[<span class="back">Back</span>|install/win]]
 
-<h1 class="text-center">Install from <strong>windows</strong></h1>
+<h1 class="text-center">Install from <strong>Windows</strong></h1>
 
 [[!inline pages="install/inc/overview" raw="yes"]]