diff --git a/_layouts/fr.html b/_layouts/fr.html
index e1bbe304bb4d8cc2eced45cd0906ef07d0b11fbb..caf1df7d883cbec5981b02db97fbed2d7e206a09 100644
--- a/_layouts/fr.html
+++ b/_layouts/fr.html
@@ -96,10 +96,8 @@ layout: base
<span class="{{milestones.status}} ms-{{milestones.status}}"></span>
<h3>{{milestones.name}}</h3>
<p><span class="bold">To be paid:</span> {{milestones.funds}}</p>
- {% if milestones.done != nil %}
<p><span class="bold">Completion date:</span> {{milestones.done}}</p>
</div>
- {%endif%}
{%endfor%}
{%else%}
<div class="panel-segment">
diff --git a/css/custom.css b/css/custom.css
index 8cfdf518d8c2f0c5944f2e39d8ddbcb57e3e7cca..89659ca028c8a665b98f772e79c00a5f517a6ebc 100644
--- a/css/custom.css
+++ b/css/custom.css
@@ -2361,6 +2361,12 @@ footer a.white:hover, a.white:focus {
-webkit-box-shadow: 0 0 10px rgba(28,30,34,.6);
box-shadow: 0 0 10px rgba(28,30,34,.6);
border-radius: 2px;
+ -webkit-touch-callout: all; /* iOS Safari */
+ -webkit-user-select: all; /* Safari */
+ -khtml-user-select: all; /* Konqueror HTML */
+ -moz-user-select: all; /* Firefox */
+ -ms-user-select: all; /* Internet Explorer/Edge */
+ user-select: all; /* Chrome and Opera */
}
.footer-wrapper .qr {
@@ -2788,7 +2794,7 @@ h1 {
background-image: url(/img/contributors.png);
}
-.ffs p.author-list, .ffs p.date-list, .ffs-proposal p.author-list, .ffs-proposal p.date-list {
+.ffs p.author-list, .ffs p.date-list, .ffs-proposal p.author-list, .ffs-proposal p.date-list, .in-progress p.progress-number-goal, .complete-proposal p.progress-number-goal {
padding-top: 0;
font-size: 1.1rem;
color: #9ca1ac;
@@ -2926,10 +2932,10 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
.fund-required p.bar-fund-status, .ffs-proposal p.bar-fund-status, .in-progress p.bar-work-status, .ffs-proposal p.bar-work-status, .ffs-con p.bar-fund-status {
padding-top: 0;
font-weight: bold;
- font-family: 'Open Sans', sans-serif;
+ font-family: 'Hind', sans-serif;
text-align: right;
float: right;
- font-size: 1.1rem;
+ font-size: 1.2rem;
}
.fund-required .progress-bar {
@@ -3371,6 +3377,12 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
margin-top: 1rem;
margin-bottom: 1rem;
font-weight: 700;
+ -webkit-touch-callout: all; /* iOS Safari */
+ -webkit-user-select: all; /* Safari */
+ -khtml-user-select: all; /* Konqueror HTML */
+ -moz-user-select: all; /* Firefox */
+ -ms-user-select: all; /* Internet Explorer/Edge */
+ user-select: all; /* Chrome and Opera */
}
.ffs-con .qr, .ffs-con .qr:hover, .ffs-con .qr:focus, .ffs-con .qr:active {
@@ -3421,7 +3433,6 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
.in-progress p.bar-work-status {
padding-top: 0;
font-weight: bold;
- font-family: 'Open Sans', sans-serif;
}
@media only screen and (max-width: 62rem) {
@@ -3486,6 +3497,17 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
clear: both;
}
+@media only screen and (max-width: 75rem) {
+
+.in-progress p.bar-work-status {
+ text-align: left;
+ float: none;
+ display: block;
+ margin-top: 1rem;
+}
+
+}
+
@media only screen and (max-width: 62rem) {
@@ -3493,7 +3515,7 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
font-size: 1rem;
}
-.ffs-proposal p.bar-work-status, .ffs-proposal p.bar-work-status, .ffs-proposal p.bar-fund-status, .fund-required p.bar-fund-status, .in-progress p.bar-work-status {
+.ffs-proposal p.bar-work-status, .ffs-proposal p.bar-work-status, .ffs-proposal p.bar-fund-status, .fund-required p.bar-fund-status {
text-align: left;
float: none;
display: block;
diff --git a/how-to-ccs/index.md b/how-to-ccs/index.md
index 8cb754bc4cd9f8606676a7f3252f26a0f0e46c59..beba77560f58a23287b5937b58bff5cc3b06483b 100644
--- a/how-to-ccs/index.md
+++ b/how-to-ccs/index.md
@@ -3,6 +3,8 @@ layout: post
title: How to submit a CCS proposal.
---
+#### Note: Read the [What is the CCS and What Are Its Rules and Expectations](/what-is-ccs) page before continuing!
+
The CCS utilizes git, and Monero's Gitlab instance for proposal tracking. A quickstart guide is provided at the top for those already well-versed in git, and step-by-step instructions (with pictures) are provided afterward for those who need help getting through the process. An example proposal is provided at the bottom of this document for referential purposes.
## Table of Contents
@@ -42,7 +44,7 @@ payouts:
```
5. Underneath the front matter, write the rest of your proposal. Be sure to include what the proposal is about, who will be completing it, why it is important for the community, the milestones and projected timeline, and an expiration date for your proposal.
-6. Save, commit, and make a Merge Request to the repo. Your MR title must be descriptive and relevant to your proposal.
+6. Save, commit, and make a Merge Request to the repo. Your MR title must be descriptive and relevant to your proposal. The MR description should be copy/pasted from the proposal contents for easy viewing (front matter excluded).
7. You're done. Go start letting people know about your proposal.
## Step-by-step Instructions
diff --git a/what-is-ccs/index.md b/what-is-ccs/index.md
index 551f794da0839f0dde6bcf97ecde7fdcc2f2e9b1..8da50366542cec8d23b8bb2dcbe08cfba48c41ad 100644
--- a/what-is-ccs/index.md
+++ b/what-is-ccs/index.md
@@ -1,6 +1,6 @@
---
layout: post
-title: What is the CCS and what are its rules and expectations?
+title: What is the CCS, and what are its rules and expectations?
---
## Introduction
@@ -11,16 +11,16 @@ The Monero Project, which is itself a decentralized project without formalized l
There are many different types of proposals, all with their own goals in mind. In the past, we have seen things from coding new software, developing third party resources, travel reimbursement for conference presenters, and hiring skilled individuals for full-time or part-time work.
-The CCS is a way for the community to propose ideas, request money, and utilize the services of the Core Team as an escrow.
+The CCS is a way for the community to propose ideas and request money, while utilizing the services of the Core Team as an escrow.
## CCS Proposal Standard Flow
The standard CCS workflow is as follows:
1. An individual or team (henceforth 'proposer') has an idea to improve the Monero ecosystem that requires funds.
-2. The proposer types up a CCS proposal, understanding the rules and expectation presented in the following section, and makes a Merge Request (MR) to the CCS Proposals repository on Monero's Gitlab instance. All steps to submit this Merge Request can be found [here](/how-to-ccs/).
+2. The proposer creates a CCS proposal, understanding the rules and expectations presented in the following section, and makes a Merge Request (MR) to the CCS Proposals repository on Monero's Gitlab instance. All steps to submit this Merge Request can be found [here](/how-to-ccs/).
3. The community discusses the pros and cons of the proposal, and offers feedback and critique.
-4. The proposer changes the proposal (if necessary) utilizing the feedback and critique of the community.
+4. The proposer changes the proposal (if necessary), utilizing the feedback and critique of the community.
5. Repeat steps 3 and 4 as needed.
6. After the Core Team has determined that the community has reached loose consensus, the MR is merged, and funding begins.
7. Once fully funded (not guaranteed), the proposal is moved to Work in Progress, where the team begins on the work, if they haven't already.
@@ -36,7 +36,8 @@ The CCS is intentionally left as informal as possible. This allows for flexibili
1. The CCS is escrowed by the Core Team. When you make a donation, you are releasing funds to them to disperse when they deem the community agrees that a milestone is complete. They do not do the work to verify donors, and the final decision for all disputes falls with them, although they do their best to follow community sentiment.
2. In the event that a proposal is overfunded, unable to be completed, or otherwise put in a state where donated money will not be dispersed to the intended recipient, the default is that the remaining XMR will be put in the Monero General Fund. There are some exceptions, but they are rare, and these decisions rest with the Core Team.
3. Refunds are extraordinarily rare. Donate accordingly.
-4. If the proposer disappears, no problem, someone else can pick up from their last milestone
+4. If the proposer disappears, no problem, someone else can pick up from their last milestone.
+5. Milestone and payout structures vary per proposal based on the proposers wishes (meaning some will require more trust of the proposer if the fund release schedule is immediate or accelerated), it is up to the donor to do their due diligience in whether or not they support the proposal in its entirety.
### For Proposers