Commit 9cb4a27d authored by sajolida's avatar sajolida
Browse files

Merge branch 'feature/15114-remove-purple-rectangles' into feature/11493-merge-install-os

parents 9fefdb09 9db8b487
......@@ -3,8 +3,6 @@
[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
<h4>Thank you for your interest in Tails.</h4>
<p>Installing Tails can be quite long but we hope you will still have a good time :)</p>
......
......@@ -3,8 +3,6 @@
[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
<div id="scenarios" class="row">
<div class="col-md-6">
......@@ -12,9 +10,7 @@
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">Install from another Tails</h3>
</div>
<div class="panel-body">Install from another Tails</div>
</div>
|install/debian/clone-overview]]
......@@ -33,17 +29,13 @@
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">Install from Debian, Ubuntu, or Mint</h3>
</div>
<div class="panel-body">Install from Debian, Ubuntu, or Mint</div>
</div>
|debian/usb-overview]]
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title two-lines"><small>Install from Debian, Ubuntu, or Mint using<br />the</small> command line <small>and</small> GnuPG</h3>
</div>
<div class="panel-body two-lines"><small>Install from Debian, Ubuntu, or Mint using<br />the</small> command line <small>and</small> GnuPG</div>
</div>
|expert/usb-overview]]
......
......@@ -5,15 +5,11 @@
[[!meta stylesheet="inc/stylesheets/overview" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/install-clone" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/overview" raw="yes" sort="age"]]
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title text-center">Let's go!</h3>
</div>
<div class="panel-body">Let's go!</div>
</div>
|install/clone]]
......
......@@ -5,15 +5,11 @@
[[!meta stylesheet="inc/stylesheets/overview" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/debian" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/overview" raw="yes" sort="age"]]
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title text-center">Let's go!</h3>
</div>
<div class="panel-body">Let's go!</div>
</div>
|install/debian/usb-download]]
......
......@@ -5,15 +5,11 @@
[[!meta stylesheet="inc/stylesheets/overview" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/expert" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/overview" raw="yes" sort="age"]]
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title text-center">Let's go!</h3>
</div>
<div class="panel-body">Let's go!</div>
</div>
|install/expert/usb]]
......
......@@ -11,17 +11,6 @@
/* LAYOUT */
#tails-installation-assistant {
position: absolute;
top: -20px;
right: 436px;
font-family: "Source Sans Pro Regular", "DejaVu Sans", "Verdana", "sans-serif";
font-size: 20px;
font-weight: 100;
color: white;
text-transform: capitalize;
}
.sidebar {
display: none;
}
......@@ -92,6 +81,7 @@ ul {
small {
font-size: 0.85em !important;
font-weight: normal !important;
}
td, th {
......@@ -106,47 +96,25 @@ td, th {
/* PANELS */
.panel {
border-bottom-width: 4px;
border-color: #56347C;
.panel-primary {
margin-top: 30px;
}
.panel-primary > .panel-heading {
text-align: center;
border: none;
transition: 0.1s;
background: #56347C;
color: white;
}
.panel-primary > .panel-heading:hover {
background: white;
background: #53b351;
color: black;
}
.panel-primary > .panel-heading:active {
color: black;
background: white;
}
.panel-title {
font-weight: bold;
padding: 15px;
height: 3em;
display: inline-block;
text-transform: uppercase;
font-size: 16px;
font-family: "Source Sans Pro Regular", "DejaVu Sans", "Verdana", "sans-serif";
letter-spacing: 1px;
}
.two-lines {
padding: 9px;
}
.panel-footer {
background: none;
border-color: #53b351;
color: #646464;
}
/* Hide all scenario-dependent bits by default. */
.clone, .usb, .dvd, .vm, .download-only,
......
......@@ -60,7 +60,7 @@ html[data-extension="up-to-date"] #verification {
}
.btn {
color: white !important;
color: black !important;
background: #53b351 !important;
border: none;
padding: 6px 12px !important;
......@@ -138,8 +138,8 @@ span.step-number {
.what-is-bittorrent-link {
position: absolute;
top: 2.4em;
right: 1em;
}
html[dir="ltr"] .what-is-bittorrent-link { right: 1em; }
html[dir="rtl"] .what-is-bittorrent-link { left: 1em; }
#already-downloaded {
......
......@@ -126,18 +126,11 @@ div.trophy img {
}
#recommendations .row p {
background: #56347C;
color: white;
background: #e2d5ef;
padding: 10px;
padding-left: 66px;
}
#recommendations .row p a {
color: white;
text-decoration: underline;
border: none;
}
#recommendations img.float-left {
float: left;
}
......
......@@ -4,8 +4,6 @@
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/linux" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
<div id="scenarios" class="row">
<div class="col-md-6">
......@@ -13,9 +11,7 @@
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">Install from another Tails</h3>
</div>
<div class="panel-body">Install from another Tails</div>
</div>
|install/linux/clone-overview]]
......@@ -40,9 +36,7 @@
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">Install from Linux</h3>
</div>
<div class="panel-body">Install from Linux</div>
</div>
|linux/usb-overview]]
......
......@@ -5,15 +5,11 @@
[[!meta stylesheet="inc/stylesheets/overview" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/install-clone" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/overview" raw="yes" sort="age"]]
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title text-center">Let's go!</h3>
</div>
<div class="panel-body">Let's go!</div>
</div>
|install/clone]]
......
......@@ -5,15 +5,11 @@
[[!meta stylesheet="inc/stylesheets/overview" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/linux" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/overview" raw="yes" sort="age"]]
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title text-center">Let's go!</h3>
</div>
<div class="panel-body">Let's go!</div>
</div>
|install/linux/usb-download]]
......
......@@ -4,8 +4,6 @@
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/router-mac" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
<p>Tails is not working on every Mac model and you might have to try <strong>different
installation methods</strong>.</p>
......@@ -30,9 +28,7 @@ installation methods</strong>.</p>
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">Try cloning from another Tails</h3>
</div>
<div class="panel-body">Try cloning from another Tails</div>
</div>
|mac/clone-overview]]
......@@ -49,9 +45,7 @@ installation methods</strong>.</p>
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title two-lines"><small>Install from</small><br />Windows or Linux</h3>
</div>
<div class="panel-body two-lines"><small>Install from</small><br />Windows or Linux</div>
</div>
|os]]
......@@ -60,9 +54,7 @@ installation methods</strong>.</p>
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title two-lines">Burn a DVD <br /><small>and then install</small></h3>
</div>
<div class="panel-body two-lines">Burn a DVD <br /><small>and then install</small></div>
</div>
|mac/dvd-overview]]
......@@ -71,9 +63,7 @@ installation methods</strong>.</p>
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title two-lines"><small>Install using</small><br />the command line</h3>
</div>
<div class="panel-body two-lines"><small>Install using</small><br />the command line</div>
</div>
|mac/usb-overview]]
......
......@@ -5,15 +5,11 @@
[[!meta stylesheet="inc/stylesheets/overview" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/install-clone" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/overview" raw="yes" sort="age"]]
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title text-center">Let's go!</h3>
</div>
<div class="panel-body">Let's go!</div>
</div>
|install/mac/clone]]
......
......@@ -5,15 +5,11 @@
[[!meta stylesheet="inc/stylesheets/overview" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/mac-dvd" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/overview" raw="yes" sort="age"]]
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title text-center">Let's go!</h3>
</div>
<div class="panel-body">Let's go!</div>
</div>
|install/mac/dvd-download]]
......
......@@ -5,15 +5,11 @@
[[!meta stylesheet="inc/stylesheets/overview" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/mac-usb" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/overview" raw="yes" sort="age"]]
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title text-center">Let's go!</h3>
</div>
<div class="panel-body">Let's go!</div>
</div>
|install/mac/usb-download]]
......
......@@ -4,8 +4,6 @@
[[!meta stylesheet="inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/windows" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
<div id="scenarios" class="row">
<div class="col-md-6">
......@@ -13,9 +11,7 @@
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">Install from another Tails</h3>
</div>
<div class="panel-body">Install from another Tails</div>
</div>
|install/win/clone-overview]]
......@@ -40,9 +36,7 @@
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">Install from Windows</h3>
</div>
<div class="panel-body">Install from Windows</div>
</div>
|win/usb-overview]]
......
......@@ -5,15 +5,11 @@
[[!meta stylesheet="inc/stylesheets/overview" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/install-clone" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/overview" raw="yes" sort="age"]]
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title text-center">Let's go!</h3>
</div>
<div class="panel-body">Let's go!</div>
</div>
|install/clone]]
......
......@@ -5,15 +5,11 @@
[[!meta stylesheet="inc/stylesheets/overview" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/windows" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/overview" raw="yes" sort="age"]]
[[
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title text-center">Let's go!</h3>
</div>
<div class="panel-body">Let's go!</div>
</div>
|install/win/usb-download]]
......
......@@ -2,7 +2,7 @@
Tails custom colors: see tails_ticket#14836
dark purple: #3a2354
medium purple (logo): #56347c
light purple: #a173d2f
light purple: #e2d5ef
dark green: #53b351
medium green: #68bd4f (currently unused)
light green: #ccaaff
......@@ -338,7 +338,7 @@ span.title {
.sidebar .button a, .sidebar .button .selflink {
text-decoration: none;
color: white;
color: black;
padding: 0.5em 1em;
}
......@@ -346,10 +346,6 @@ span.title {
background-color: #53b351;
}
.sidebar .button a:hover, .sidebar .button .selflink {
background-color: #56347c;
}
.sidebar .download a {
background: #53b351 url('lib/download-arrow.png') no-repeat scroll right 30%;
}
......@@ -438,12 +434,9 @@ a {
.home-section h1, #news h1, #security h1, #doc h1, #talk h1, #bugs h1, #wishlist h1, #design h1, #other h1, #tools h1 {
margin-top: 18px;
padding: 0 0.5em;
background-color:none;
color:#fff;
background: #56347c;
border-radius: 0.2em;
color:#56347c;
line-height: 1.6em;
border-bottom: 5px solid black;
}
#talk h1 { width: 90%; }
......@@ -771,7 +764,7 @@ div.blocks img {
text-decoration: none;
margin-bottom: 1em;
padding: 0.5em 51px 0.5em 12px;
color: white;
color: black;
}
#pagebody a.download-file {
......@@ -1213,7 +1206,7 @@ pre.list-key {
#tor_check a span {
font-family: "Century Gothic", "Avant Garde", Avenir, TeXGyreAdventorRegular, "Heiti SC", "Heiti TC", AppleGothic, sans-serif;
font-weight: normal;
color: white;
color: black;
text-align: left;
font-size: 2.29em;
line-height: 2.1em;
......@@ -1292,7 +1285,6 @@ div#highlight p {
-webkit-box-sizing: border-box;
box-sizing: border-box;
text-decoration: none;
color: white;
padding: 0.5em 1em;
background: #56347c url('lib/donate.png') no-repeat scroll 10px 50% !important;
font-size: 26px;
......
......@@ -3,8 +3,6 @@
[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!inline pages="install/inc/tails-installation-assistant.inline" raw="yes" sort="age"]]
<div id="scenarios" class="row">
<div class="col-md-6">
......
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