Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
tails
tails
Commits
51c437b8
Commit
51c437b8
authored
Jul 04, 2019
by
IkiWiki
Browse files
Merge branch 'master' of puppet-git.lizard:tails
parents
2f3ee0d6
942cd4da
Changes
3
Hide whitespace changes
Inline
Side-by-side
wiki/src/local.css
View file @
51c437b8
...
...
@@ -1351,10 +1351,6 @@ div#highlight p {
margin-top
:
1em
;
}
#pagebody
.currentpartner
{
margin-left
:
120px
;
}
#pagebody
.pastpartner
{
overflow
:
hidden
;
}
...
...
wiki/src/partners.html
View file @
51c437b8
...
...
@@ -13,12 +13,12 @@ Are you an individual and want to help Tails? [[We warmly welcome your donations
<p
class=
"amount-range"
>
>
$100
 
000
</p>
<div
class=
"currentpartner"
>
<p
class=
"partner partner-size-1"
title=
"Handshake Foundation - $200 000"
><a
href=
"http://www.handshakefoundation.org/"
>
[[!img lib/partners/handshake.png link="no"]]
</a></p>
<!-- 2018-08-30 -->
<p
class=
"partner partner-size-1"
title=
"Handshake Foundation - $200 000"
><a
href=
"http://www.handshakefoundation.org/"
>
[[!img lib/partners/handshake.png link="no"
alt="Handshake Foundation logo"
]]
</a></p>
<!-- 2018-08-30 -->
</div>
<p
class=
"amount-range"
>
$10
 
000 – $50
 
000
</p>
<div
class=
"currentpartner"
>
<p
class=
"partner partner-size-3"
title=
"ISC - 20 743€ "
>
[[!img lib/partners/isc.png link="no"]]
</p>
<!-- 2018-09-04 -->
<p
class=
"partner partner-size-3"
title=
"ISC - 20 743€ "
>
[[!img lib/partners/isc.png link="no"
alt="Counterpart International logo"
]]
</p>
<!-- 2018-09-04 -->
<p
class=
"partner partner-size-3"
title=
"Anonymous donation - 4.5 btc"
>
[[!img lib/partners/anonymous.png link="no"]]
</p>
<!-- 2018-12-07 -->
</div>
...
...
@@ -31,15 +31,15 @@ Are you an individual and want to help Tails? [[We warmly welcome your donations
<p
class=
"partner partner-size-4"
title=
"A group of people - 1 000€"
>
[[!img lib/partners/anonymous.png link="no"]]
</p>
<!-- 2019-04-05 -->
<p
class=
"partner partner-size-4"
title=
"An individual - 1 000€"
>
[[!img lib/partners/anonymous.png link="no"]]
</p>
<!-- 2018-12-18 -->
<p
class=
"partner partner-size-4"
title=
"An individual - $1 000"
>
[[!img lib/partners/anonymous.png link="no"]]
</p>
<!-- 2018-12-19 -->
<p
class=
"partner partner-size-4"
title=
"DeepOnion - 0.154 btc"
><a
href=
"https://deeponion.org/"
>
[[!img lib/partners/deeponion.png link="no"]]
</a></p>
<!-- 2018-08-28 -->
<p
class=
"partner partner-size-4"
title=
"The Best VPN - $1 000"
><a
href=
"https://thebestvpn.com/"
target=
"_blank"
>
[[!img lib/partners/bestvpn.png link="no"]]
</a></p>
<!-- 2019-05-20 -->
<p
class=
"partner partner-size-4"
title=
"VPN Review - $1 000"
><a
href=
"https://vpn-review.com/"
target=
"_blank"
>
[[!img lib/partners/vpnreview.png link="no"]]
</a></p>
<!-- 2019-06-17 -->
<p
class=
"partner partner-size-4"
title=
"Cooltechzone - $1 000"
><a
href=
"https://cooltechzone.com/"
target=
"_blank"
>
[[!img lib/partners/cooltechzone.png link="no"]]
</a></p>
<!-- 2019-07-04 -->
<p
class=
"partner partner-size-4"
title=
"DeepOnion - 0.154 btc"
><a
href=
"https://deeponion.org/"
>
[[!img lib/partners/deeponion.png link="no"
alt="DeepOnion logo"
]]
</a></p>
<!-- 2018-08-28 -->
<p
class=
"partner partner-size-4"
title=
"The Best VPN - $1 000"
><a
href=
"https://thebestvpn.com/"
target=
"_blank"
>
[[!img lib/partners/bestvpn.png link="no"
alt="The Best VPN logo"
]]
</a></p>
<!-- 2019-05-20 -->
<p
class=
"partner partner-size-4"
title=
"VPN Review - $1 000"
><a
href=
"https://vpn-review.com/"
target=
"_blank"
>
[[!img lib/partners/vpnreview.png link="no"
alt="VPN review logo"
]]
</a></p>
<!-- 2019-06-17 -->
<p
class=
"partner partner-size-4"
title=
"Cooltechzone - $1 000"
><a
href=
"https://cooltechzone.com/"
target=
"_blank"
>
[[!img lib/partners/cooltechzone.png link="no"
alt="Best VPN zone 2019 logo"
]]
</a></p>
<!-- 2019-07-04 -->
</div>
<p
class=
"amount-range"
>
in-kind
</p>
<div
class=
"currentpartner"
>
<p
class=
"partner partner-in-kind"
title=
"Tor - Server rent"
><a
href=
"https://torproject.org"
>
[[!img lib/partners/tor.png link="no"]]
</a></p>
<p
class=
"partner partner-in-kind"
title=
"Tor - Server rent"
><a
href=
"https://torproject.org"
>
[[!img lib/partners/tor.png link="no"
alt="Tor logo"
]]
</a></p>
</div>
<h1>
Previous partners
</h1>
...
...
wiki/src/templates/page.tmpl
View file @
51c437b8
...
...
@@ -20,7 +20,7 @@
<TMPL_IF
LOCAL_CSS
>
<link
rel=
"stylesheet"
href=
"<TMPL_VAR BASEURL><TMPL_VAR LOCAL_CSS>"
type=
"text/css"
/>
<TMPL_ELSE>
<link
rel=
"stylesheet"
href=
"<TMPL_VAR BASEURL>local.css?reload-2019-0
1-15
"
type=
"text/css"
/>
<link
rel=
"stylesheet"
href=
"<TMPL_VAR BASEURL>local.css?reload-2019-0
7-04
"
type=
"text/css"
/>
</TMPL_IF>
<script
src=
"<TMPL_VAR BASEURL>lib/js/mirror-dispatcher.js"
type=
"text/javascript"
></script>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment