summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIkiWiki <ikiwiki.info>2020-10-22 16:17:25 +0000
committerIkiWiki <ikiwiki.info>2020-10-22 16:17:25 +0000
commitffa0ac1f8588e224625cd833a6daa56fe8328ee6 (patch)
treea8bb041e27b81d475bb39cbb3b8979238aa11c05
parent958ccb20a7e66d2efa5db02329fdb880e1907934 (diff)
parenta44cb9589f6d2c8793b436bc23ea60873dc4de81 (diff)
Merge branch 'master' of gitlab-ssh.tails.boum.org:tails/tails
-rw-r--r--wiki/src/donate/banner.css5
-rw-r--r--wiki/src/donate/banner/godzilla.pngbin35552 -> 35222 bytes
-rw-r--r--wiki/src/donate/banner/godzilla.svg10
-rw-r--r--wiki/src/home.css14
-rw-r--r--wiki/src/home.de.po36
-rw-r--r--wiki/src/home.es.po10
-rw-r--r--wiki/src/home.fa.po6
-rw-r--r--wiki/src/home.fr.po29
-rw-r--r--wiki/src/home.html3
-rw-r--r--wiki/src/home.it.po10
-rw-r--r--wiki/src/home.pt.po10
11 files changed, 65 insertions, 68 deletions
diff --git a/wiki/src/donate/banner.css b/wiki/src/donate/banner.css
index 90e3026..52ec7b9 100644
--- a/wiki/src/donate/banner.css
+++ b/wiki/src/donate/banner.css
@@ -89,14 +89,15 @@ body.pt .donate-pt {
background-size: 330px, 175px;
background-position: -60px -40px, right bottom;
padding-left: 150px;
+ padding-bottom: 1.5em;
}
#donate-banner p {
font-size: 16px;
- margin-bottom: 10px;
+ line-height: 1.25em;
}
}
-@media (max-width: 300px) {
+@media (max-width: 270px) {
#donate-banner {
background-size: 210px, 175px;
background-position: -30px bottom, right bottom;
diff --git a/wiki/src/donate/banner/godzilla.png b/wiki/src/donate/banner/godzilla.png
index dca842a..fe17fe0 100644
--- a/wiki/src/donate/banner/godzilla.png
+++ b/wiki/src/donate/banner/godzilla.png
Binary files differ
diff --git a/wiki/src/donate/banner/godzilla.svg b/wiki/src/donate/banner/godzilla.svg
index 7fd27e2..c66ebfa 100644
--- a/wiki/src/donate/banner/godzilla.svg
+++ b/wiki/src/donate/banner/godzilla.svg
@@ -43,9 +43,9 @@
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
- inkscape:zoom="1.4142136"
- inkscape:cx="376.63494"
- inkscape:cy="219.91566"
+ inkscape:zoom="5.6568544"
+ inkscape:cx="292.30908"
+ inkscape:cy="298.82715"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1"
@@ -252,13 +252,13 @@
style="fill:#58595b" />
<path
class="cls-2"
- d="m 504.47,359.66 a 5.67,5.67 0 0 0 -1.72,-4.45 0.29,0.29 0 0 0 -0.49,0.21 15.18,15.18 0 0 1 -0.07,4.71 c -0.38,1.47 -1.19,2.81 -0.93,4.34 a 1.24,1.24 0 0 0 2.07,0.5 c 1.05,-1.38 1.16,-3.6 1.14,-5.31 z"
+ d="m 505.02178,371.41 a 5.67,5.67 0 0 0 -1.72,-4.45 0.29,0.29 0 0 0 -0.49,0.21 15.18,15.18 0 0 1 -0.07,4.71 c -0.38,1.47 -1.19,2.81 -0.93,4.34 a 1.24,1.24 0 0 0 2.07,0.5 c 1.05,-1.38 1.16,-3.6 1.14,-5.31 z"
id="path3940"
inkscape:connector-curvature="0"
style="fill:#58595b" />
<path
class="cls-2"
- d="m 512.55,363.9 a 0.92,0.92 0 0 0 -1.43,-0.16 c -1.08,1.31 -1.14,3 -2.51,4.16 -1.37,1.16 -2.74,2 -4,3.18 -1.26,1.18 0.73,3.2 2,1.94 1.45,-1.41 3.34,-2.36 4.68,-3.88 1.23,-1.35 2.23,-3.54 1.26,-5.24 z"
+ d="m 510.62691,377.24099 a 0.92,0.92 0 0 0 -1.43,-0.16 c -1.08,1.31 -1.14,3 -2.51,4.16 -1.37,1.16 -2.74,2 -4,3.18 -1.26,1.18 0.73,3.2 2,1.94 1.45,-1.41 3.34,-2.36 4.68,-3.88 1.23,-1.35 2.23,-3.54 1.26,-5.24 z"
id="path3942"
inkscape:connector-curvature="0"
style="fill:#58595b" />
diff --git a/wiki/src/home.css b/wiki/src/home.css
index 1e4aa52..0fadc7b 100644
--- a/wiki/src/home.css
+++ b/wiki/src/home.css
@@ -8,22 +8,26 @@
#tor_check {
display: block;
height: 80px;
+ width: 270px;
margin-bottom: 1em;
}
#tor_check a {
- background: #53b351 url(lib/onion.png) no-repeat 16px 8px !important;
+ background: #53b351 !important;
border-radius: 0.5em;
- padding: 0.5em 2em 0.5em 0.5em;
+ padding: 15px;
color: black !important;
font-size: 2em;
position: absolute;
right: 0;
+ display: flex;
+ align-items: center;
+ justify-content: flex-start;
+ line-height: 1em;
}
-#tor_check a span {
- display: block;
- padding: 15px 60px;
+#tor_check a img {
+ margin-right: 15px;
}
/* Random message box */
diff --git a/wiki/src/home.de.po b/wiki/src/home.de.po
index 0bd09ba..5dd1149 100644
--- a/wiki/src/home.de.po
+++ b/wiki/src/home.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2020-10-22 14:45+0000\n"
+"POT-Creation-Date: 2020-10-22 16:00+0000\n"
"PO-Revision-Date: 2019-05-24 09:52+0200\n"
"Last-Translator: spriver <spriver@autistici.org>\n"
"Language-Team: \n"
@@ -39,16 +39,12 @@ msgstr ""
"\"]] [[!meta script=\"home\"]]"
#. type: Content of: <div>
-#, fuzzy
-#| msgid ""
-#| "<div id=\"tor_check\">\n"
-#| "<a href=\"https://check.torproject.org/\">\n"
msgid ""
-"<a href=\"https://check.torproject.org/\" id=\"tor_check\"> <span>Tor check</"
-"span> </a>"
+"<a id=\"tor_check\" href=\"https://check.torproject.org/\"> [[!img lib/onion."
+"png link=\"no\" alt=\"\"]] <span>Tor check</span> </a>"
msgstr ""
-"<a href=\"https://check.torproject.org/\" id=\"tor_check\"> <span>Tor "
-"überprüfen</span> </a>"
+"<a id=\"tor_check\" href=\"https://check.torproject.org/\"> [[!img lib/onion."
+"png link=\"no\" alt=\"\"]] <span>Tor überprüfen</span> </a>"
#. type: Content of: <div><p>
#, fuzzy
@@ -99,20 +95,20 @@ msgid "[[!inline pages=\"news\" raw=\"yes\" sort=\"age\"]]"
msgstr "[[!inline pages=\"news.de\" raw=\"yes\" sort=\"age\"]]"
#, fuzzy
-#~| msgid "[[!inline pages=\"home/donate\" raw=\"yes\" sort=\"age\"]]"
-#~ msgid "[[!inline pages=\"home/donate.inline\" raw=\"yes\" sort=\"age\"]]"
-#~ msgstr "[[!inline pages=\"home/donate.de\" raw=\"yes\" sort=\"age\"]]"
-
-#, fuzzy
#~| msgid ""
-#~| "<a href=\"https://check.torproject.org/\"> [[!img \"lib/onion.png\" link="
-#~| "\"no\"]] <span>Tor check</span> </a>"
+#~| "<div id=\"tor_check\">\n"
+#~| "<a href=\"https://check.torproject.org/\">\n"
#~ msgid ""
-#~ "<a href=\"https://check.torproject.org/\"> [[!img \"lib/onion.png\" link="
-#~ "\"no\"]]"
+#~ "<a href=\"https://check.torproject.org/\" id=\"tor_check\"> <span>Tor "
+#~ "check</span> </a>"
#~ msgstr ""
-#~ "<a href=\"https://check.torproject.org/\"> [[!img \"lib/onion.png\" link="
-#~ "\"no\"]] <span class=\"twolines\">Tor überprüfen</span> </a>"
+#~ "<a href=\"https://check.torproject.org/\" id=\"tor_check\"> <span>Tor "
+#~ "überprüfen</span> </a>"
+
+#, fuzzy
+#~| msgid "[[!inline pages=\"home/donate\" raw=\"yes\" sort=\"age\"]]"
+#~ msgid "[[!inline pages=\"home/donate.inline\" raw=\"yes\" sort=\"age\"]]"
+#~ msgstr "[[!inline pages=\"home/donate.de\" raw=\"yes\" sort=\"age\"]]"
#, fuzzy
#~| msgid "[[!img \"lib/onion.png\" link=\"no\"]]\n"
diff --git a/wiki/src/home.es.po b/wiki/src/home.es.po
index 7bb67e5..d9aca24 100644
--- a/wiki/src/home.es.po
+++ b/wiki/src/home.es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2020-10-22 14:45+0000\n"
+"POT-Creation-Date: 2020-10-22 16:00+0000\n"
"PO-Revision-Date: 2020-08-16 20:30+0000\n"
"Last-Translator: emmapeel <emma.peel@riseup.net>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/home/"
@@ -42,11 +42,11 @@ msgstr ""
#. type: Content of: <div>
msgid ""
-"<a href=\"https://check.torproject.org/\" id=\"tor_check\"> <span>Tor check</"
-"span> </a>"
+"<a id=\"tor_check\" href=\"https://check.torproject.org/\"> [[!img lib/onion."
+"png link=\"no\" alt=\"\"]] <span>Tor check</span> </a>"
msgstr ""
-"<a href=\"https://check.torproject.org/\" id=\"tor_check\"> "
-"<span>Comprobación de Tor</span> </a>"
+"<a id=\"tor_check\" href=\"https://check.torproject.org/\"> [[!img lib/onion."
+"png link=\"no\" alt=\"\"]] <span>Comprobación de Tor</span> </a>"
#. type: Content of: <div><p>
#, fuzzy
diff --git a/wiki/src/home.fa.po b/wiki/src/home.fa.po
index 992702c..b6b4dd0 100644
--- a/wiki/src/home.fa.po
+++ b/wiki/src/home.fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2020-10-22 14:45+0000\n"
+"POT-Creation-Date: 2020-10-22 16:00+0000\n"
"PO-Revision-Date: 2020-08-19 08:30+0000\n"
"Last-Translator: emmapeel <emma.peel@riseup.net>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/news/fa/"
@@ -43,8 +43,8 @@ msgstr ""
#| "<a href=\"https://check.torproject.org/\"> [[!img \"lib/onion.png\" link="
#| "\"no\"]] <span>Tor check</span> </a>"
msgid ""
-"<a href=\"https://check.torproject.org/\" id=\"tor_check\"> <span>Tor check</"
-"span> </a>"
+"<a id=\"tor_check\" href=\"https://check.torproject.org/\"> [[!img lib/onion."
+"png link=\"no\" alt=\"\"]] <span>Tor check</span> </a>"
msgstr ""
"<a href=\"https://check.torproject.org/\"> [[!img \"lib/onion.png\" link=\"no"
"\"]] <span>تست تور</span> </a>"
diff --git a/wiki/src/home.fr.po b/wiki/src/home.fr.po
index aecde34..e794a08 100644
--- a/wiki/src/home.fr.po
+++ b/wiki/src/home.fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2020-10-22 14:45+0000\n"
+"POT-Creation-Date: 2020-10-22 16:00+0000\n"
"PO-Revision-Date: 2020-10-18 15:31+0000\n"
"Last-Translator: Chre <tor@renaudineau.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -41,11 +41,11 @@ msgstr ""
#. type: Content of: <div>
msgid ""
-"<a href=\"https://check.torproject.org/\" id=\"tor_check\"> <span>Tor check</"
-"span> </a>"
+"<a id=\"tor_check\" href=\"https://check.torproject.org/\"> [[!img lib/onion."
+"png link=\"no\" alt=\"\"]] <span>Tor check</span> </a>"
msgstr ""
-"<a href=\"https://check.torproject.org/\" id=\"tor_check\"> "
-"<span>Vérification de Tor</span> </a>"
+"<a id=\"tor_check\" href=\"https://check.torproject.org/\"> [[!img lib/onion."
+"png link=\"no\" alt=\"\"]] <span>Vérification de Tor</span> </a>"
#. type: Content of: <div><p>
#, fuzzy
@@ -94,6 +94,13 @@ msgstr ""
msgid "[[!inline pages=\"news\" raw=\"yes\" sort=\"age\"]]"
msgstr "[[!inline pages=\"news.fr\" raw=\"yes\" sort=\"age\"]]"
+#~ msgid ""
+#~ "<a href=\"https://check.torproject.org/\" id=\"tor_check\"> <span>Tor "
+#~ "check</span> </a>"
+#~ msgstr ""
+#~ "<a href=\"https://check.torproject.org/\" id=\"tor_check\"> "
+#~ "<span>Vérification de Tor</span> </a>"
+
#~ msgid "[[!meta title=\"Welcome to Tails!\"]]"
#~ msgstr "[[!meta title=\"Bienvenue dans Tails !\"]]"
@@ -113,18 +120,6 @@ msgstr "[[!inline pages=\"news.fr\" raw=\"yes\" sort=\"age\"]]"
#~ "donate?r=h\" data-display-probability=\"0.1\">"
#, fuzzy
-#~| msgid ""
-#~| "<a href=\"https://tails.boum.org/install/check/\"> [[!img \"lib/onion.png"
-#~| "\" link=\"no\"]] <span>Tor check</span> </a>"
-#~ msgid ""
-#~ "<a href=\"https://check.torproject.org/\"> [[!img \"lib/onion.png\" link="
-#~ "\"no\"]]"
-#~ msgstr ""
-#~ "<a href=\"https://tails.boum.org/install/check/index.fr.html\"> [[!img "
-#~ "\"lib/onion.png\" link=\"no\"]] <span class=\"twolines\">Vérification de "
-#~ "Tor</span> </a>"
-
-#, fuzzy
#~| msgid "[[!img \"lib/onion.png\" link=\"no\"]]\n"
#~ msgid "[[!img \"lib/onion.png\" link=\"no\"]]"
#~ msgstr "[[!img \"lib/onion.png\" link=\"no\"]]\n"
diff --git a/wiki/src/home.html b/wiki/src/home.html
index 112aab6..f40eca1 100644
--- a/wiki/src/home.html
+++ b/wiki/src/home.html
@@ -7,7 +7,8 @@
[[!meta script="home"]]
<div id="tor_check">
- <a href="https://check.torproject.org/" id="tor_check">
+ <a id="tor_check" href="https://check.torproject.org/">
+ [[!img lib/onion.png link="no" alt=""]]
<span>Tor check</span>
</a>
</div>
diff --git a/wiki/src/home.it.po b/wiki/src/home.it.po
index c80ae6b..12d125a 100644
--- a/wiki/src/home.it.po
+++ b/wiki/src/home.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2020-10-22 14:45+0000\n"
+"POT-Creation-Date: 2020-10-22 16:00+0000\n"
"PO-Revision-Date: 2019-05-24 09:54+0200\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -30,11 +30,11 @@ msgstr ""
#. type: Content of: <div>
msgid ""
-"<a href=\"https://check.torproject.org/\" id=\"tor_check\"> <span>Tor check</"
-"span> </a>"
+"<a id=\"tor_check\" href=\"https://check.torproject.org/\"> [[!img lib/onion."
+"png link=\"no\" alt=\"\"]] <span>Tor check</span> </a>"
msgstr ""
-"<a href=\"https://check.torproject.org/\" id=\"tor_check\"> <span>Verifica "
-"Tor</span> </a>"
+"<a id=\"tor_check\" href=\"https://check.torproject.org/\"> [[!img lib/onion."
+"png link=\"no\" alt=\"\"]] <span>Verifica Tor</span> </a>"
#. type: Content of: <div><p>
msgid ""
diff --git a/wiki/src/home.pt.po b/wiki/src/home.pt.po
index c0a254c..ba5e77b 100644
--- a/wiki/src/home.pt.po
+++ b/wiki/src/home.pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2020-10-22 14:45+0000\n"
+"POT-Creation-Date: 2020-10-22 16:00+0000\n"
"PO-Revision-Date: 2019-12-22 21:03+0000\n"
"Last-Translator: emmapeel <emma.peel@riseup.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,11 +38,11 @@ msgstr ""
#. type: Content of: <div>
msgid ""
-"<a href=\"https://check.torproject.org/\" id=\"tor_check\"> <span>Tor check</"
-"span> </a>"
+"<a id=\"tor_check\" href=\"https://check.torproject.org/\"> [[!img lib/onion."
+"png link=\"no\" alt=\"\"]] <span>Tor check</span> </a>"
msgstr ""
-"<a href=\"https://check.torproject.org/\" id=\"tor_check\"> <span>Checar "
-"Tor</span> </a>"
+"<a id=\"tor_check\" href=\"https://check.torproject.org/\"> [[!img lib/onion."
+"png link=\"no\" alt=\"\"]] <span>Checar Tor</span> </a>"
#. type: Content of: <div><p>
msgid ""