Commit 34531658 authored by sajolida's avatar sajolida
Browse files

Merge remote-tracking branch 'origin/web/11024-direct-download'

Conflicts:
	wiki/src/install/inc/steps/download.inline.html
	wiki/src/install/inc/stylesheets/dave.css
parents 66c71678 cc7b434a
......@@ -138,7 +138,7 @@ two techniques to do this verification automatically.</p>
</div>
</div>
<div id="bittorrent-minor">
<div id="download-minor">
<p>or [[!toggle id="bittorrent-verification" text="Download and verify via BitTorrent"]]</p>
[[!toggleable id="bittorrent-verification" text="""
......@@ -150,6 +150,10 @@ two techniques to do this verification automatically.</p>
"""]]
</div>
<div id="download-minor">
<p>or [[Download and verify using OpenPGP|install/download/openpgp]]</p>
</div>
</div>
<div id="download">
......
......@@ -130,9 +130,9 @@ Extension's toggles
}
[data-phase^="download"] #download-button,
[data-phase^="started"] #bittorrent-minor,
[data-phase^="download"] #bittorrent-minor,
[data-phase^="verify"] #bittorrent-minor,
[data-phase^="started"] #download-minor,
[data-phase^="download"] #download-minor,
[data-phase^="verify"] #download-minor,
[data-phase^="verif"] #download-button,
[data-phase^="verif"] #download-eta,
[data-phase^="verif"] #download-progress
......@@ -300,22 +300,27 @@ html[data-phase^="verified"] #verify-text-calculating {
}
/* Show and Hide bittorent link. */
/* Show and hide BitTorrent and OpenPGP links. */
#bittorrent-minor {
#download-minor {
display: none !important;
margin-top: 1em;
}
#bittorrent-minor p:first-child {
#download-minor p:first-child {
margin-left: 1.2em;
margin-bottom: 0em;
}
html:not([data-phase]) #bittorrent-minor {
#install {
margin-bottom: 1em;
}
html:not([data-phase]) #download-minor {
display: block !important;
}
html[data-phase="ready"] #bittorrent-minor {
html[data-phase="ready"] #download-minor {
display: block !important;
}
......
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