diff --git a/_i18n/en.yml b/_i18n/en.yml index e555a228..81da4c79 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -235,11 +235,6 @@ downloads: showhash2: and should be treated as canonical, with the signature checked against the appropriate GPG key showhash3: in the source code showhash4: "Two guides are available to guide you through the verification process:" - hardware1: The Monero community has funded a - hardware2: Dedicated Hardware Wallet (Kastelo) - hardware3: which is now in progress. - hardware4: Ledger Nano S and Nano X are supported in Monero CLI, Monero GUI, and Monerujo wallets. - hardware5: Trezor Model T is supported in Monero CLI and Monero GUI wallets. mobilelight1: The following are mobile or light wallets that are deemed safe by respected members of the community. If there is a wallet that is not on here, you can request the community check it out. Go to our mobilelight2: Hangouts mobilelight3: page to see where we are. @@ -254,6 +249,15 @@ downloads: desktop: Desktop antivirus: Antivirus sourcearchive: Source Code (archive) + hwdesc: "Hardware wallets are cryptographically secure devices that help keep your coins safe. Monero is currently supported by Ledger Nano S/X and Trezor Model T." + hwth: Hardware Wallet + hwthmodel: Model(s) + hwthsupported: Wallets + hwthfirm: Min. firmware version + hwnanos: "Nano S: 1.6.1" + hwnanox: "Nano X: 1.2.4-4" + hwtrezor: "2.3.4" + hwmobmodels: "Models that support Monero:" press-kit: intro1: Here you'll find the Monero symbol and logo below. You can choose any size that you want, or download the .ai file to mess with the logo yourself. diff --git a/css/custom.css b/css/custom.css index 4b30f2bb..3353593f 100644 --- a/css/custom.css +++ b/css/custom.css @@ -3200,12 +3200,6 @@ footer { border-bottom: none; } -.downloads a img { - margin-top: 2rem; - border: 2px dotted #ffffff; - padding: 0.5rem; -} - .downloads .full>.info-block { padding: 4rem 5rem; } @@ -3305,7 +3299,8 @@ span.icon-git { border-bottom: none; } -.downloads td img { + +.downloads td img.small { display: inline-block; padding: 0; padding-right: 0.5rem; @@ -3314,6 +3309,16 @@ span.icon-git { vertical-align: middle; } +.downloads .hw ul { + padding-left: 0; +} + +.downloads .hw td img { + display: inline-block; + width: 50%; + vertical-align: middle; +} + .downloads table { width: 100%; margin-top: 1rem; @@ -3328,17 +3333,35 @@ span.icon-git { text-align: left; } +.downloads li a img { + margin-top: 2rem; + border: 2px dotted #ffffff; + padding: 0.5rem; +} + .downloads .mobile-only ul { padding-left: 0; } +.downloads .mobile-only li { + padding-left: 1rem; +} + .downloads .mobile-only img { - width: 60px; display: inline-block; vertical-align: middle; margin-top: 0; } +.downloads .mobile-only img.mob { + width: 60px; +} + +.downloads .hw .mobile-only img { + max-width: 100%; + margin-top: inherit; +} + .mobile-only { display:none; } diff --git a/downloads/index.md b/downloads/index.md index 3d8820f2..861572bb 100644 --- a/downloads/index.md +++ b/downloads/index.md @@ -240,25 +240,25 @@ permalink: /downloads/index.html {% t downloads.sourcecode %} - Cake Wallet LogoCake Wallet + Cake Wallet LogoCake Wallet X - Monerujo logoMonerujo + Monerujo logoMonerujo X - Mymonero logoMyMonero + Mymonero logoMyMonero - Edge LogoEdge + Edge LogoEdge X @@ -266,10 +266,10 @@ permalink: /downloads/index.html
@@ -295,19 +295,90 @@ permalink: /downloads/index.html

{% t downloads.hardware %}

-
-

{% t downloads.hardware1 %} {% t downloads.hardware2 %} {% t downloads.hardware3 %}

-

{% t downloads.hardware4 %}

-

{% t downloads.hardware5 %}

+
+

{% t downloads.hwdesc %}

+ + + + + + + + + + + + + + + + + + + +
{% t downloads.hwth %}{% t downloads.hwthmodel %}{% t downloads.hwthsupported %}{% t downloads.hwthfirm %}
ledger logo +
    +
  • Nano S
    • +
  • Nano X
    • +
+ 		+
    +
  • Monero GUI
    • +
  • Monero CLI
    • +
  • Monerujo
    • +
  • Feather (beta)
    • +
+ 		+
    +
  • {% t downloads.hwnanos %}
    • +
  • {% t downloads.hwnanox %}
    • +
+
Trezor logo +
    +
  • Model T
    • +
+ 		+
    +
  • Monero GUI
    • +
  • Monero CLI
    • +
  • Feather (beta)
    • +
+ 		+
    +
  • {% t downloads.hwtrezor %}
    • +
+
+
+
+

ledger logo

+
    + {% t downloads.hwmobmodels %} +
  • Nano S
    • +
  • Nano X
    • + {% t downloads.hwthsupported %}: +
  • Monero GUI
    • +
  • Monero CLI
    • +
  • Monerujo
    • +
  • Feather (beta)
    • + {% t downloads.hwthfirm %}: +
  • {% t downloads.hwnanos %}
    • +
  • {% t downloads.hwnanox %}
    • +
+

Trezor logo

+
    + {% t downloads.hwmobmodels %} +
  • Model T
    • + {% t downloads.hwthsupported %}: +
  • Monero GUI
    • +
  • Monero CLI
    • +
  • Feather (beta)
    • + {% t downloads.hwthfirm %}: +
  • {% t downloads.hwtrezor %}
    • +
+
+
-
-
- ledger logo - Trezor logo -
-
- Kastelo logo -
+
diff --git a/img/emojis/274C.svg b/img/emojis/274C.svg deleted file mode 100644 index 3f85bd5a..00000000 --- a/img/emojis/274C.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/img/ledger.png b/img/ledger.png index 8d8be370..45f1841f 100644 Binary files a/img/ledger.png and b/img/ledger.png differ diff --git a/img/trezor.png b/img/trezor.png index 2c57cbeb..b4f99c3b 100644 Binary files a/img/trezor.png and b/img/trezor.png differ