Commit bc19b971 authored by Riccardo Spagni's avatar Riccardo Spagni Committed by GitHub
Browse files

Merge pull request #378 from rehrar/ffs-finish

FFS finish
parents b1c6762e ea81dd99
......@@ -155,12 +155,10 @@ You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure
## 6.0 How to make a Moneropedia Entry
### 6.1 Quick Start
### 6.2 Make a file
### 6.1 Make a file
Navigate to the /resources/moneropedia folder and make a new file. Be sure the file name has no spaces and the ending is .md
### 6.3 Front Matter
### 6.2 Front Matter
```
---
layout: moneropedia
......@@ -172,13 +170,13 @@ summary: "PUT SUMMARY OF YOUR ENTRY HERE IN QUOTES"
There is one thing to highlight. The `terms:` section of the front matter can be filled with as many terms as you would like. This is how other Moneropedia entries will link to this page. You can link to other Moneropedia entries as well in your page by putting an ampersand before the term used, i.e. `@THE-TERM-USED`. This will make an automatic link in the Moneropedia entry to the referred term, replace the @term with the word used in that terms `entry:` area of the front matter, and on hover it will show the summary. How cool is that?
### 6.4 Write
### 6.3 Write
Write your Moneropedia entry. Remember that you can link to other Moneropedia entries using `@term-used-in-entry` as described above. Just go to the .md file of the Moneropedia entry you want to link to and use any of the terms in the `terms:` field of the front matter. Be sure to write whichever one you choose EXACTLY as shown and preceded by an ampersand.
### 6.5 Build/Test
### 6.4 Build/Test
Build your website using `jekyll serve` if it's not rebuilding automatically and test check the link to your entry is appearing on the alphabetical list of Moneropedia entries and that it leads to your entry when clicked. Test your Moneropedia entry in the browser and contact rehrar if there are any bugs.
### 6.6 Submit Pull Request
### 6.5 Submit Pull Request
You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure to make any changes if requested.
## 7.0 How to make a FFS Proposal
......
......@@ -9,14 +9,58 @@ layout: base
</div>
<!-- FULL WIDTH BLOCK -->
<section class="container full">
<div class="info-block text-adapt complete">
<div class="row center">
<div class="col-xs-12">
<h2>Progress</h2>
</div>
</div>
<div class="row center-xs">
<div class="col-xs-12 progress-numbers">
<p class="progress-number-funded">100 XMR </p><span> /</span>
<p class="progress-number-goal">100 XMR</p>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="progress-bar">
<span style="width: 100%"></span>
</div>
</div>
<div class="col-xs-12 ffs-status">
<p>This project has been completed. The proposal is kept here both to celebrate the achievements of the Monero community, and for historical accuracy about what was accomplished.</p>
</div>
</div>
{% if page.milestones != nil %}
<div class="row center-xs milestones">
<div class="tab col-xs-12">
<input id="tab-one" type="checkbox" name="tabs" class="accordion">
<label for="tab-one" class="accordion">Milestones</label>
<div class="tab-content">
{% for milestones in page.milestones %}
<div class="row start-xs roadmap">
<div class="col-xs-1">
<span class="{{milestones.status}} ms-{{milestones.status}}"></span>
</div>
<div class="col-xs-11">
<p>{{milestones.name}}</p>
<p><span class="bold">Funds Awarded:</span> {{milestones.funds}}</p>
{% if milestones.done != nil %}
<p><span class="bold">Completion date:</span> {{milestones.done}}</p>
{%endif%}
</div>
</div>
{%endfor%}
</div>
</div>
</div>
{%endif%}
</div>
<div class="info-block text-adapt">
<div class="row center-xs">
<div class="col">
<h2>{{page.title}}</h2>
<p>by {{page.author}}</p>
<div class="ffs-status complete">
<p>This project has been completed. The proposal is kept here both to celebrate the achievements of the Monero community, and for historical accuracy about what was accomplished.</p>
</div>
</div>
</div>
<div>
......@@ -25,6 +69,18 @@ layout: base
</div>
</section>
<!-- END FULL WIDTH BLOCK -->
</div>
<!-- JAVASCRIPT FOR DISQUS -->
\ No newline at end of file
<section class="container full comments">
<div class="info-block">
<div class="row center">
<div class="col-xs-12">
<h2>Comments</h2>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<!-- SPACE RESERVED FOR COMMENT SYSTEM -->
</div>
</div>
</div>
</section>
</div>
\ No newline at end of file
......@@ -9,8 +9,44 @@ layout: base
</div>
<!-- FULL WIDTH BLOCK -->
<section class="container full">
<section class="container full fr-contribute">
<div class="info-block text-adapt">
<div class="row center">
<div class="col-xs-12">
<h2>Funding Progress</h2>
</div>
</div>
<div class="row center-xs">
<div class="col-xs-12 progress-numbers">
<p class="progress-number-funded">10 XMR </p><span> /</span>
<p class="progress-number-goal">100 XMR</p>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="progress-bar">
<span style="width: 75%"></span>
</div>
</div>
</div>
<div class="row center-xs">
<div class="tab col-xs-12">
<input id="tab-one" type="checkbox" name="tabs" class="accordion">
<label for="tab-one" class="accordion">Contribute</label>
<div class="tab-content">
<div class="row start-xs">
<div class="col-xs-12">
<p>In order to contribute to the cause of <strong>{{page.title}}</strong> all you have to do is the following:</p>
<p>Have a valid Monero address. If you don't have one, you can read on getting started!</p>
<p>Send the amount of XMR that you wish to contribute to the address: <strong>{{page.address}}</strong></p>
<p>Make sure that you enter a payment ID of <strong>{{page.paymentid}}</strong> in order for us to be able to assign your contribution to this specific project!</p>
</div>
</div>
</div>
</div>
</div>
</div>
<!--div class="info-block text-adapt">
<div class="row center-xs">
<div class="col">
<h2>How to Contribute</h2>
......@@ -24,7 +60,7 @@ layout: base
<p>Make sure that you enter a payment ID of <strong>{{page.paymentid}}</strong> in order for us to be able to assign your contribution to this specific project!</p>
</div>
</div>
</div>
</div-->
</section>
<!-- END FULL WIDTH BLOCK -->
......@@ -43,6 +79,18 @@ layout: base
</div>
</section>
<!-- END FULL WIDTH BLOCK -->
</div>
<!-- JAVASCRIPT FOR DISQUS -->
\ No newline at end of file
<section class="container full comments">
<div class="info-block">
<div class="row center">
<div class="col-xs-12">
<h2>Comments</h2>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<!-- SPACE RESERVED FOR COMMENT SYSTEM -->
</div>
</div>
</div>
</section>
</div>
\ No newline at end of file
......@@ -22,6 +22,18 @@ layout: base
</div>
</section>
<!-- END FULL WIDTH BLOCK -->
</div>
<!-- JAVASCRIPT FOR DISQUS -->
\ No newline at end of file
<section class="container full comments">
<div class="info-block">
<div class="row center">
<div class="col-xs-12">
<h2>Comments</h2>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<!-- SPACE RESERVED FOR COMMENT SYSTEM -->
</div>
</div>
</div>
</section>
</div>
\ No newline at end of file
......@@ -23,6 +23,18 @@ layout: base
</div>
</section>
<!-- END FULL WIDTH BLOCK -->
</div>
<!-- JAVASCRIPT FOR DISQUS -->
\ No newline at end of file
<section class="container full comments">
<div class="info-block">
<div class="row center">
<div class="col-xs-12">
<h2>Comments</h2>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<!-- SPACE RESERVED FOR COMMENT SYSTEM -->
</div>
</div>
</div>
</section>
</div>
\ No newline at end of file
......@@ -11,14 +11,58 @@ layout: base
<!-- FULL WIDTH BLOCK -->
<section class="container full">
<div class="info-block text-adapt inprogress">
<div class="row center">
<div class="col-xs-12">
<h2>Progress</h2>
</div>
</div>
<div class="row center-xs">
<div class="col-xs-12 progress-numbers">
<p class="progress-number-funded">100 XMR </p><span> /</span>
<p class="progress-number-goal">100 XMR</p>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="progress-bar">
<span style="width: 100%"></span>
</div>
</div>
<div class="col-xs-12 ffs-status">
<p>This project has been funded and is being worked on. Keep an eye out here at the bottom of the proposal for updates.</p>
</div>
</div>
{% if page.milestones != nil %}
<div class="row center-xs milestones">
<div class="tab col-xs-12">
<input id="tab-one" type="checkbox" name="tabs" class="accordion">
<label for="tab-one" class="accordion">Milestones</label>
<div class="tab-content">
{% for milestones in page.milestones %}
<div class="row start-xs roadmap">
<div class="col-xs-1">
<span class="{{milestones.status}} ms-{{milestones.status}}"></span>
</div>
<div class="col-xs-11">
<p>{{milestones.name}}</p>
<p><span class="bold">Funds Awarded:</span> {{milestones.funds}}</p>
{% if milestones.done != nil %}
<p><span class="bold">Completion date:</span> {{milestones.done}}</p>
{%endif%}
</div>
</div>
{%endfor%}
</div>
</div>
</div>
{%endif%}
</div>
<div class="info-block text-adapt">
<div class="row center-xs">
<div class="col">
<h2>{{page.title}}</h2>
<p>by {{page.author}}</p>
<div class="ffs-status inprogress">
<p>This project has been funded and is being worked on. Keep an eye out here at the bottom of the proposal for updates.</p>
</div>
</div>
</div>
<div>
......@@ -27,6 +71,22 @@ layout: base
</div>
</section>
<!-- END FULL WIDTH BLOCK -->
<section class="container full comments">
<div class="info-block">
<div class="row center">
<div class="col-xs-12">
<h2>Comments</h2>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<!-- SPACE RESERVED FOR COMMENT SYSTEM -->
</div>
</div>
</div>
</section>
</div>
<!-- JAVASCRIPT FOR DISQUS -->
\ No newline at end of file
\ No newline at end of file
......@@ -976,6 +976,10 @@ a:hover, a:focus, a:active {
outline: 0;
}
textarea:focus, input:focus{
outline: none;
}
a, button, input, select, textarea, label, label:checked, label:focus {
-webkit-tap-highlight-color: rgba(0,0,0,0);
-webkit-tap-highlight-color: transparent;
......@@ -987,6 +991,23 @@ img, video {max-width: 100%;}
video {width: 100%;}
::-webkit-input-placeholder {
color: #AAA;
}
::-moz-placeholder {
color: #AAA;
}
:-moz-placeholder {
color: #AAA;
}
:-ms-input-placeholder {
color: #AAA;
}
::-ms-input-placeholder {
color: #AAA;
}
.container, .container-fluid {
margin-left: auto;
margin-right: auto;
......@@ -1021,6 +1042,10 @@ video {width: 100%;}
box-shadow: 0 2px 4px rgba(50,50,93,.1);
}
.bold {
font-weight: 600;
}
code {
white-space: pre-wrap;
background-color: #fff1e8;
......@@ -2517,6 +2542,10 @@ footer {
text-decoration: none;
}
.downloads a img {
padding-top: 1rem;
}
.downloads .full>.info-block {
padding: 4rem 5rem;
......@@ -2788,7 +2817,7 @@ footer {
border-radius: 50%;
}
.roadmap .tabPanel-content span {
.roadmap .tabPanel-content span, .roadmap .ms-completed, .roadmap .ms-upcoming {
width: 1.5rem;
height: 1.5rem;
text-align: center;
......@@ -3020,7 +3049,7 @@ footer {
padding-top: 0;
}
.roadmap .tabPanel-content span, .pre-roadmap li {
.roadmap .tabPanel-content span, .pre-roadmap li, .roadmap .ms-completed, .roadmap .ms-upcoming {
width: 1rem;
height: 1rem;
}
......@@ -3573,7 +3602,7 @@ footer {
color: #2f6f9f;
padding: 0.7rem;
border-radius: 0.2rem;
margin-top: 1rem;
margin-bottom: 1.5rem;
}
.ffs-status p {
......@@ -3583,14 +3612,103 @@ footer {
font-size: 0.85rem;
}
.ffs-status.complete {
.complete .ffs-status {
background-color: #d7e8d8;
}
.ffs-status.inprogress {
.inprogress .ffs-status {
background-color: #fef2d5;
}
.progress-numbers p {
display: inline-block;
padding-top: 1.2rem;
}
.progress-bar {
height: 1rem;
position: relative;
background: #edebed;
box-shadow: inset 0 -1px 1px rgba(0,0,0,.07);
margin: 1rem 0 1.5rem 0;
}
.progress-bar span {
display: block;
height: 100%;
background-color: rgb(229,115,37);
background-image: linear-gradient(
center bottom,
rgb(229,115,37) 37%,
rgb(231,129,58) 69%
);
box-shadow:
inset 0 2px 9px rgba(255,255,255,0.3),
inset 0 -2px 6px rgba(0,0,0,.07);
position: relative;
overflow: hidden;
}
.inprogress .progress-bar span, .complete .progress-bar span {
background-color: rgb(97,168,99);
background-image: linear-gradient(
center bottom,
rgb(97,168,99) 37%,
rgb(128,185,130) 69%
);
}
.fr-contribute .tab, .fr-contribute .tab:last-of-type, .milestones .tab, .milestones .tab:last-of-type {
border: none;
}
.fr-contribute .tab-content p, .milestones .tab-content p {
margin: 0;
text-align: left;
}
.fr-contribute label.accordion, .milestones label.accordion {
display: inline-block;
padding: 0 2rem 0 1rem;
border: 1px solid #ff7519;
margin: 0;
line-height: 2.7rem;
height: 2.7rem;
-webkit-transition: background .15s ease;
-moz-transition: background .15s ease;
-o-transition: background .15s ease;
transition: background .15s ease;
color: #ff7519;
text-transform: uppercase;
}
.fr-contribute label.accordion:hover, .fr-contribute label.accordion:focus, .fr-contribute input.accordion[type=checkbox]:checked + label, .milestones label.accordion:hover, .milestones label.accordion:focus, .milestones input.accordion[type=checkbox]:checked + label {
background-color: #ff7519;
color: #ffffff;
}
.fr-contribute label.accordion::after, .milestones label.accordion:after {
right: 1rem;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-top: 4px solid #ff7519;
}
.fr-contribute label.accordion:hover:after, .fr-contribute label.accordion:focus:after, .fr-contribute input.accordion[type=checkbox]:checked + label:after, .milestones label.accordion:hover:after, .milestones label.accordion:focus:after, .milestones input.accordion[type=checkbox]:checked + label:after {
border-top: 4px solid #ffffff;
}
.fr-contribute label.accordion:focus:after, .fr-contribute input.accordion[type=checkbox]:checked + label:after, .milestones label.accordion:focus:after, .milestones input.accordion[type=checkbox]:checked + label:after {
transform: rotateX(180deg);
}
.ms-completed, .ms-upcoming {
margin-top: 1rem !important;
}
.milestones .row.roadmap {
margin-top: 1.5rem;
}
@media only screen and (max-width: 75rem) {
......@@ -3680,6 +3798,10 @@ footer {
display: none;
}
.ms-completed, .ms-upcoming {
margin-top: 1.2rem !important;
}
}
@media only screen and (max-width: 41rem) {
......@@ -3698,9 +3820,21 @@ footer {
@media only screen and (max-width: 30rem) {
.ffs .mobile a.ffs-btn {
font-size: 1.25rem;
}
.ffs .mobile a.ffs-btn {
font-size: 1.25rem;
}
.milestones .roadmap .col-xs-1 {
-ms-flex-preferred-size: 16.667%;
flex-basis: 16.667%;
max-width: 16.667%;
}
.milestones .roadmap .col-xs-11 {
-ms-flex-preferred-size: 83.333%;
flex-basis: 83.333%;
max-width: 83.333%;
}
}
@media only screen and (max-width: 25rem) {
......@@ -3720,7 +3854,7 @@ footer {
}
}
/*************************ACCORDIAN********************************/
/*************************accordion********************************/
.tab {
position: relative;
......@@ -3733,12 +3867,12 @@ footer {
.tab:last-of-type {
border-bottom: 1px solid #d7d7d7;
}
input.accordian {
input.accordion {
position: absolute;
display: none;
z-index: -1;
}
label.accordian {
label.accordion {
position: relative;
display: block;
padding: 1rem 2rem 1rem 0;
......@@ -3761,12 +3895,12 @@ label.accordian {
margin: 0 1rem 1rem 1rem;
}
input.accordian:checked ~ .tab-content {
input.accordion:checked ~ .tab-content {
max-height: 100rem;
overflow: visible;
}
label.accordian::after {
label.accordion::after {
margin-right: 0;
content: "";
position: absolute;
......@@ -3784,10 +3918,10 @@ label.accordian::after {
transition: border-bottom .1s, border-top .1s .1s;
}
input.accordian[type=checkbox]:checked + label::after {
input.accordion[type=checkbox]:checked + label::after {
transform: rotateX(180deg);
}
input.accordian[type=radio]:checked + label::after {
input.accordion[type=radio]:checked + label::after {
transform: rotateX(180deg);
}
......
......@@ -87,6 +87,11 @@ If you'd prefer to use a blockchain bootstrap, instead of syncing from scratch,
<p>The following are mobile or light wallets that are deemed safe by trusted 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 <a href="/community/hangouts/">Hangouts</a> page to see where we are.</p>
</div>
</div>
<div class="row center-xs">
<div class="col-xs-12">
<a href="https://mymonero.com"><img src="/img/mymonero.png" alt="MyMonero Logo"></a>
</div>
</div>
{% elsif data_downloads.gui_hash == nil and data_downloads.cli_hash != nil %}
......
......@@ -4,6 +4,23 @@ title: Getmonero.org Redesign
address: 4445
paymentid: 3xj3
author: rehrar
milestones:
- name: Milestone 1 - Front page & restructure
funds: 10% (~XMR 10.70)
done: April 28, 2017
status: completed
- name: Milestone 2 - Design
funds: 40% (~XMR 42.80)
done: July 1, 2017
status: completed
- name: Milestone 3 - Development
funds: 30% (~XMR 32.10)
done: July 1, 2017
status: completed
- name: Milestone 4 - Finishing touches