Commit 476aac19 authored by sajolida's avatar sajolida
Browse files

Merge remote-tracking branch 'origin/web/10643-responsive' (Closes: #10643, #10641)

Conflicts:
	wiki/src/install/inc/stylesheets/dave.css
parents 23244ee7 7e2d347c
......@@ -55,8 +55,6 @@ from a Tails DVD in a similar way.</p>
1. If the computer starts on Tails, the <span class="guilabel">Boot Tails</span> menu
appears. Choose <span class="guilabel">Live</span> and press <span class="keycap">Enter</span>.
[[!img doc/first_steps/start_tails/tails_boot_menu.png class="screenshot" link="no" alt="Black screen with Tails artwork. 'Boot menu' with two options 'Live' and 'Live (failsafe)'."]]
<div class="note install-clone debian expert windows linux">
<p>Most computers do not start on Tails by default. If it does you
are lucky. Otherwise, if the computer starts on
......@@ -64,9 +62,8 @@ from a Tails DVD in a similar way.</p>
<span class="windows">Windows,</span>
<span class="linux">Linux,</span>
<span class="install-clone">Windows or Linux,</span>
refer to the
troubleshooting section about [[!toggle id="not_at_all" text="Tails
not starting at all"]].</p>
refer to [[!toggle id="not_at_all" text="the troubleshooting section
about Tails not starting at all"]].</p>
</div>
[[!toggleable id="not_at_all" text="""
......@@ -76,6 +73,8 @@ from a Tails DVD in a similar way.</p>
"""]]
[[!img doc/first_steps/start_tails/tails_boot_menu.png class="screenshot" link="no" alt="Black screen with Tails artwork. 'Boot menu' with two options 'Live' and 'Live (failsafe)'."]]
<div class="bug mac-usb mac-clone">
<p>If your computer fails to start on the intermediary Tails, you can
try these other two methods:</p>
......@@ -97,13 +96,11 @@ from a Tails DVD in a similar way.</p>
1. After 30&ndash;60 seconds, another screen called <span class="application">Tails Greeter</span> appears.
[[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png class="screenshot" link="no"]]
<div class="note">
<p>If the computer stops responding or displays error messages before
getting to <span class="application">Tails Greeter</span>, refer to
the troubleshooting section about
[[!toggle id="not_entirely" text="Tails not starting entirely"]].</p>
[[!toggle id="not_entirely" text="the troubleshooting section about
Tails not starting entirely"]].</p>
</div>
[[!toggleable id="not_entirely" text="""
......@@ -113,6 +110,8 @@ from a Tails DVD in a similar way.</p>
"""]]
[[!img doc/first_steps/startup_options/tails-greeter-welcome-to-tails.png class="screenshot" link="no"]]
1. In <span class="application">Tails Greeter</span>, select your preferred language in the drop-down
list on the bottom left of the screen. Click <span class="button">Login</span>.
......
......@@ -26,9 +26,9 @@
<div class="note windows linux">
<p>Some computers start successfully on the intermediary 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
not starting at all"]].</p>
to start on the final Tails. If this is your case, refer to
[[!toggle id="not_at_all" text="the troubleshooting section about
Tails not starting at all"]].</p>
</div>
[[!toggleable id="not_at_all" text="""
......
......@@ -101,7 +101,7 @@ h1:before {
}
h3, h4, p, ul {
margin: 20px;
margin-bottom: 1.5em;
}
p, ul, ol, h1, h2, h3, h4, h5, h6 {
......@@ -155,9 +155,6 @@ ul {
border-bottom-width: 4px;
border-color: #56347C;
margin-top: 30px;
width: 90%;
margin-right: 5%;
margin-left: 5%;
}
.panel-primary > .panel-heading {
......@@ -227,7 +224,6 @@ ul {
#download-and-verify div.toggleable {
margin-top: -1.2em;
width: 48em;
position: relative;
}
......@@ -243,12 +239,17 @@ ul {
width: 35em;
}
#download-and-verify a.toggle, #needs a.toggle, #scenarios a.toggle {
a.toggle {
border-bottom: 1px dashed black !important;
cursor: help;
text-decoration: none !important;
}
.hide a.toggle {
border-bottom: none !important;
cursor: pointer;
}
#download-and-verify div.toggleable a.toggle, #needs div.toggleable a.toggle, #scenarios div.toggleable a.toggle {
border: none !important;
cursor: pointer;
......@@ -256,3 +257,39 @@ ul {
right: 7px;
top: 5px;
}
/*========== Non-Mobile First Method ==========*/
/* Large Devices, Wide Screens */
@media only screen and (max-width : 1200px) {
}
/* Medium Devices, Desktops */
@media only screen and (max-width : 992px) {
}
/* Small Devices, Tablets */
@media only screen and (max-width : 768px) {
.page {
padding: 0px 1em 1em;
}
#tails-installation-assistant {
display: none;
}
}
/* Extra Small Devices, Phones */
@media only screen and (max-width : 480px) {
}
/* Custom, iPhone Retina */
@media only screen and (max-width : 320px) {
}
......@@ -306,10 +306,12 @@ html[data-phase^="verified"] #verify-text-calculating {
#bittorrent-minor {
display: none !important;
margin-top: 1em;
margin-left: 1.2em;
}
html:not([data-phase]) #bittorrent-minor {
display: block !important
display: block !important;
}
html[data-phase="ready"] #bittorrent-minor {
......@@ -331,6 +333,7 @@ html[data-phase="ready"] #bittorrent-minor {
.extension code {
font-size: 80%;
}
<<<<<<< HEAD
/* Steps numbers */
......@@ -443,3 +446,5 @@ html:not([data-phase="verified"]) #downloaded-path {
#download[data-state="failed"] #download-message-failed {
display: none !important;
}
=======
>>>>>>> origin/web/10643-responsive
......@@ -58,6 +58,7 @@ h4 small{
#needs, #steps {
margin-bottom: 50px;
padding: 0 20px;
border: 1px solid #56347C;
box-shadow: 10px 10px #56347C;
border-radius: 4px;
......
......@@ -4,3 +4,42 @@
margin-left: 25%;
margin-right: 25%;
}
/*========== Non-Mobile First Method ==========*/
/* Large Devices, Wide Screens */
@media only screen and (max-width : 1200px) {
}
/* Medium Devices, Desktops */
@media only screen and (max-width : 992px) {
}
/* Small Devices, Tablets */
@media only screen and (max-width : 768px) {
#content {
padding-left: 0px;
width: 100%;
margin: 0px;
padding: 10px;
}
h1 {
font-size: 25px;
margin-left: 30px;
}
}
/* Extra Small Devices, Phones */
@media only screen and (max-width : 480px) {
}
/* Custom, iPhone Retina */
@media only screen and (max-width : 320px) {
}
......@@ -88,6 +88,7 @@ div.trophy {
margin-top: 30px;
padding-top: 20px;
padding-bottom: 50px;
padding-right: 20px;
position: relative;
background-color: white;
}
......@@ -98,16 +99,6 @@ div.trophy p {
font-weight: 200;
}
/* Some more room to the special tips and tricks */
div.note, div.bug, div.caution, div.tip {
background-color: white;
border-radius: 4px;
margin-left: 50px;
padding: 20px;
padding-left: 70px;
}
/* more room for the state */
.state-image {
margin-top: 50px;
......@@ -163,7 +154,7 @@ div.toggleable .hide {
@media only screen and (max-width : 768px) {
#content {
padding-left: 0px;
padding-left: 10px;
}
.step-image {
......@@ -185,6 +176,15 @@ div.toggleable .hide {
width: 100%;
}
div.trophy {
background-position: center 0.5em;
padding: 60px 1em 1em;
}
#recommendations h3 {
font-size: 20px;
}
}
/* Extra Small Devices, Phones */
......
......@@ -1054,7 +1054,8 @@ span.replaceable { font-style: italic; }
div.bug, div.caution, div.next, div.note, div.tip, div.trophy {
background-color: #FFFFF0;
border: 1px solid #E0E0DF;
padding: 0.5em 6px;
border-radius: 4px;
padding: 1.35em 6px 0em;
background-position: 6px 0.5em;
background-repeat: no-repeat;
min-height: 48px;
......@@ -1062,14 +1063,6 @@ div.bug, div.caution, div.next, div.note, div.tip, div.trophy {
margin: 0 0 1.5em 0;
max-width: 38em;
}
div.bug > p:only-child, div.caution > p:only-child, div.next > p:only-child, div.note > p:only-child, div.tip > p:only-child, div.trophy > p:only-child {
display: table-cell;
height: 2.5em;
vertical-align: bottom;
}
div.bug p:last-child, div.caution p:last-child, div.next p:last-child, div.note p:last-child, div.tip p:last-child, div.trophy > p:last-child {
margin-bottom: 0;
}
div.bug {
background-image: url(lib/admon-bug.png);
}
......
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