diff --git a/_data/downloads.yml b/_data/downloads.yml index 1bc2ecc7..a225a234 100644 --- a/_data/downloads.yml +++ b/_data/downloads.yml @@ -76,7 +76,6 @@ blockchain: freebsd - platform: DragonflyBSD, 64-bit - id: bsd icon: icon-dragonflybsd cli_url: dragonflybsd64 cli_hash: 30e2d50db8e1738a72d3a06ec106c1a3f157de057efad344bd12151b6bbd3019 @@ -87,7 +86,7 @@ - platform: Source Code & Blockchain id: source icon: icon-github - cli_url: https://github.com/monero-project/bitmonero + cli_url: https://github.com/monero-project/monero cli_hash: source version: Bleeding edge (possibly unstable) diff --git a/_data/merchants.yml b/_data/merchants.yml index 8ada0635..38fa1869 100644 --- a/_data/merchants.yml +++ b/_data/merchants.yml @@ -146,6 +146,10 @@ url: http://www.guitartheoryrevolution.info/blog/guitar-theory-revolution-store/ - name: Infield Loan Services - Atlanta, Construction Consulting, Contract review, Feasibility, Funds Escrow url: mailto:info@loandraw.com + - name: KoDDoS.net - DDoS Protection + url: https://koddos.net + - name: Marcos Aguayo - Programmer and Web Developer + url: http://marcosaguayo.com/ - name: MSvB Hardware Design (using a secure element) url: mailto:monerodev+sitesvcs@encambio.com?subject=Monero%20Services%20Hardware%20Design%20Request - name: MyMonero Web-based Wallet diff --git a/_includes/header.html b/_includes/header.html index 5b1ba01f..14c316af 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -5,8 +5,8 @@
- - + +
What Is Monero? Using @@ -26,8 +26,8 @@
- - + +
All Posts Missives @@ -38,8 +38,8 @@
- - + +
Team Hangouts @@ -51,8 +51,8 @@
- - + +
About Roadmap @@ -111,8 +111,8 @@
- - + +
What Is Monero? Using @@ -126,8 +126,8 @@ Downloads
- - + +
All Posts Missives @@ -136,8 +136,8 @@
- - + +
Team Hangouts @@ -147,8 +147,8 @@
- - + +
About Roadmap diff --git a/community/team/index.md b/community/team/index.md index 6a4601bb..04a993a1 100644 --- a/community/team/index.md +++ b/community/team/index.md @@ -9,7 +9,7 @@ title: Monero Team
- +

Core

@@ -42,7 +42,7 @@ title: Monero Team {%endfor%}
- +

Developers

diff --git a/css/custom.css b/css/custom.css index ee1b6abf..0e7bebfa 100644 --- a/css/custom.css +++ b/css/custom.css @@ -989,8 +989,6 @@ h1, h2, h3, h4, h5, h6, p {margin: 0; padding: 0;} img, video {max-width: 100%;} -img, video {width: 100%;} - ::-webkit-input-placeholder { color: #AAA; } @@ -2376,8 +2374,6 @@ footer { position: absolute; bottom: 0; width: 100%; - height: 435px; - height: 27.1875rem; background-color: #4c4c4c; color: #efefef; z-index: 1; diff --git a/downloads/index.md b/downloads/index.md index 44f1eba7..604848cb 100644 --- a/downloads/index.md +++ b/downloads/index.md @@ -72,7 +72,7 @@ Note: the SHA256 hashes are listed by the downloads for convenience, but a GPG-s
-If you'd prefer to use a blockchain bootstrap, instead of syncing from scratch, you can [use this link for the most current bootstrap](https:////downloads.getmonero.org/blockchain.raw). It is typically much faster to sync from scratch, however, and it also takes a lot less RAM (import is very greedy). +If you'd prefer to use a blockchain bootstrap, instead of syncing from scratch, you can [use this link for the most current bootstrap](https://downloads.getmonero.org/blockchain.raw). It is typically much faster to sync from scratch, however, and it also takes a lot less RAM (import is very greedy).
{% elsif data_downloads.id == "hardware" %} diff --git a/forum-funding-system/index.md b/forum-funding-system/index.md index 92f50a79..29a15dd6 100644 --- a/forum-funding-system/index.md +++ b/forum-funding-system/index.md @@ -12,7 +12,7 @@ title: Forum Funding System
- +

Ideas

{% for toplevel in site.data.ffs %} @@ -28,8 +28,8 @@ title: Forum Funding System

See all Ideas

- - + +

Open Tasks

{% for toplevel in site.data.ffs %} diff --git a/resources/roadmap/index.md b/resources/roadmap/index.md index e35ac310..b768d9ac 100644 --- a/resources/roadmap/index.md +++ b/resources/roadmap/index.md @@ -42,8 +42,8 @@ title: Roadmap {%endif%} {%endfor%}
- - + +

2015

{% for toplevel in site.data.roadmap %} @@ -87,7 +87,7 @@ title: Roadmap {%endfor%}
- +

2017

{% for toplevel in site.data.roadmap %} diff --git a/resources/user-guides/restore_from_keys.md b/resources/user-guides/restore_from_keys.md index cd42c668..134ca4be 100644 --- a/resources/user-guides/restore_from_keys.md +++ b/resources/user-guides/restore_from_keys.md @@ -16,10 +16,10 @@ You need to have 3 pieces of data from your wallet, or your .keys file which hol Then run the wallet command: -`./monero-wallet-cli New_Wallet_Name.abc` +`./monero-wallet-cli --generate-from-keys New_Wallet_Name.abc` Next, you'll be asked for the Address, the spendkey, the viewkey, and finally the new password for the re-generated wallet. Running this with the correct parameters will re-generate your wallet files for you and allow you to set a new password. -If you run into any trouble, running `./monero-wallet-cli --help` will show you the options available to you at wallet startup. Once you're inside your wallet, running the `help` command will list the help for the commands available to you within the wallet. \ No newline at end of file +If you run into any trouble, running `./monero-wallet-cli --help` will show you the options available to you at wallet startup. Once you're inside your wallet, running the `help` command will list the help for the commands available to you within the wallet.