diff --git a/_includes/footer.html b/_includes/footer.html
index ca3178aee189ab5555387a98d87054ffc1e485a4..0f8f68f3e0eaeefab4838a9dfba4037a2e512a51 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,38 +1,22 @@
<footer class="container-fluid">
<div class="container">
- <div class="row around-xs footer-wrapper">
- {% for item in site.data.lang[site.lang].footer-1 %}
- <div class="col-sm-3 col-xs-6">
- <h3>{{item.title}}</h3>
- <ul class="list-unstyled">
- {% for entry in item.subfolderitems %}
- {% if entry.url contains 'https://' %}
- <li><a class="white" href="{{ entry.url }}">{{ entry.name }}</a></li>
- {%elsif entry.url contains 'irc'%}
- <li><a class="white" href="{{ entry.url }}">{{ entry.name }}</a></li>
- {%else%}
- <li><a class="white" href="{{site.baseurl}}/{{ entry.url }}">{{ entry.name }}</a></li>
- {%endif%}
- {% endfor %}
- </ul>
+ <div class="row center-xs footer-wrapper">
+ <div class="col-md-8 col-sm-10 col-xs-12">
+ <h3>Donate to the Monero Project</h3>
+ <p>By donating to the following Monero address (General Fund), you are supporting the Monero Project. If you wish to donate to a specific proposal, please see <a href="/funding-required/index.html" class="white gf">Funding Required</a>.</p>
+ <p><a href="monero:44AFFq5kSiGBoZ4NMDwYtN18obc8AemS33DBLWs3H7otXft3XjrpDtQGv7SqSsaBYBb98uNbr2VBBEt7f2wfn3RVGQBEP3A" class="qr"><img src="/img/donate-monero.png" /></a></p>
+ <p class="gf-address">44AFFq5kSiGBoZ4NMDwYtN18obc8AemS33DBLWs3H7otXft3XjrpDtQGv7SqSsaBYBb98uNbr2VBBEt7f2wfn3RVGQBEP3A</p>
</div>
- {% endfor %}
- <div class="row center-xs">
- <div class="social-icons">
- </div>
+ </div>
+ </div>
+ <div class="row center-xs">
<div class="footer-links">
<ul class="list-unstyled list-inline">
- {% for item in site.data.lang[site.lang].footer-2 %}
- {% if item.url contains 'https://' %}
- <li><a href="{{item.url}}" class="white footer-link">{{item.name}}</a></li>
- {%else%}
- <li><a href="{{site.baseurl}}/{{item.url}}" class="white footer-link">{{item.name}}</a></li>
- {%endif%}
- {% endfor %}
+ <li><a href="https://repo.getmonero.org/monero-project/ccs-front" class="white footer-link">CCS Front End Repo</a></li>
+ <li><a href="https://repo.getmonero.org/monero-project/ccs-back" class="white footer-link">CCS Backend Repo</a></li>
+ <li><a href="https://repo.getmonero.org/monero-project/ccs-proposals" class="white footer-link">CCS Proposals Repo</a></li>
</ul>
</div>
- </div>
- </div>
</div>
</footer>
<!-- Matomo -->
diff --git a/_includes/header.html b/_includes/header.html
index 2b3e6edf378e9ea9af60a71fca7902bb3bf06f6f..b1deecbc9b1b499f2249d9a9a9d03a65803af1b5 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -18,6 +18,9 @@
<div class="text-center nav-item mob">
<a href="/completed-proposals/">Completed Tasks</a>
</div>
+ <div class="text-center nav-item mob">
+ <a href="/donate/index.html">Donate</a>
+ </div>
<div class="text-center nav-item mob">
<a href="/completed-proposals/">Back to Getmonero.org</a>
</div>
@@ -37,11 +40,18 @@
<div class="col-lg-8 col-md-8 col-sm-8 items end-xs">
<div class="row end-xs middle-xs">
<div class="col-md-12">
- <a href="/ideas/" class="top-link">Ideas</a>
- <a href="/funding-required/">Funding Required</a>
- <a href="/work-in-progress/">Work in Progress</a>
- <a href="/completed-proposals/">Completed Tasks</a>
- <a href="https://getmonero.org">Getmonero.org</a>
+ <div class="dropdown">
+ <label for="desktopdrop">CCS Stages<div class="arrow-down"></div></label>
+ <input class="burger-checkdropdown" id="desktopdrop" type="checkbox">
+ <div class="dropdown-content">
+ <a href="/ideas/">Ideas</a>
+ <a href="/funding-required/">Funding Required</a>
+ <a href="/work-in-progress/">Work in Progress</a>
+ <a href="/completed-proposals/">Completed Tasks</a>
+ </div>
+ </div>
+ <a href="https://getmonero.org">Getmonero.org</a>
+ <a href="/donate/" class="donate-btn">Donate</a>
</div>
</div>
</div>
diff --git a/completed-proposals/index.html b/completed-proposals/index.html
index 27dade2dbbc95aa52cb5b495aea9c34811cc8d97..a67e8500604027e41d1ae2b621e6bfb679d01cc3 100644
--- a/completed-proposals/index.html
+++ b/completed-proposals/index.html
@@ -1,5 +1,5 @@
---
-layout: customnt
+layout: customnt
title: Completed Tasks
---
@@ -25,6 +25,8 @@ title: Completed Tasks
<h3>{{proposal.name}}</h3>
<p class="author-list">{{proposal.author}}</p>
<p class="date-list">{{proposal.date}}</p>
+ <p class="progress-number-goal">{{proposal.amount}} XMR</p>
+ <p class="date-list contributor">{{proposal.contributions}} contributors</p>
</div>
</a>
</div>
diff --git a/css/custom.css b/css/custom.css
index f2c9696a034a991ec3a8cda1f1db163fe58a6729..8cfdf518d8c2f0c5944f2e39d8ddbcb57e3e7cca 100644
--- a/css/custom.css
+++ b/css/custom.css
@@ -1743,6 +1743,54 @@ a.btn-link:hover span.icon-blockchain, a.btn-link:focus span.icon-blockchain, a.
margin-bottom: 4rem;
}
+.desktop-nav .dropdown {
+ position: relative;
+ display: inline-block;
+}
+
+.desktop-nav .dropdown-content {
+ position: absolute;
+ left: 0;
+ top: 4.3rem;
+ text-align: left;
+ background: #ffffff;
+ width: 150%;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ -moz-box-shadow: 0 2px 4px rgba(50,50,93,.1);
+ -webkit-box-shadow: 0 2px 4px rgba(50,50,93,.1);
+ box-shadow: 0 2px 4px rgba(50,50,93,.1);
+ opacity: 0;
+ visibility: hidden;
+ z-index: 5;
+ -webkit-transition: all .3s ease;
+ -moz-transition: all .3s ease;
+ -ms-transition: all .3s ease;
+ -o-transition: all .3s ease;
+ transition: all .3s ease;
+}
+
+.desktop-nav .dropdown:hover>.dropdown-content {
+ opacity: 1;
+ visibility: visible;
+}
+
+.dropdown-content a {
+ display: block;
+}
+
+.arrow-down {
+ width: 0;
+ height: 0;
+ border-left: 3px solid transparent;
+ border-right: 3px solid transparent;
+ border-top: 3px solid #393939;
+ display: inline-block;
+ margin-bottom: 0.25rem;
+ margin-left: 0.5rem;
+}
+
img.monero-logo {
max-width: 100%;
height: auto;
@@ -1764,19 +1812,20 @@ p.site-name a {
font-size: 1.2rem;
}
-.desktop-nav .items a {
+.desktop-nav .items a, .desktop-nav .dropdown {
color: #4c4c4c;
text-decoration: none;
-webkit-transition: all ease-out .1s;
-moz-transition: all ease-out .1s;
-o-transition: all ease-out .1s;
transition: all ease-out .1s;
- font-size: 0.9rem;
- padding: 0.8rem 1rem;
+ font-size: 1rem;
+ padding: 1.5rem;
+ cursor: pointer;
}
-.desktop-nav .items a:last-of-type {
- margin-right: -1rem;
+.desktop-nav .dropdown label {
+ cursor: pointer;
}
.desktop-nav .items a:hover, .topnav .topnav-list a:focus, .topnav .topnav-list a:active {
@@ -1784,6 +1833,21 @@ p.site-name a {
text-decoration: none;
}
+.desktop-nav a.donate-btn {
+ background-color: #d26e2b;
+ color: #ffffff;
+ padding: 1rem 1.5rem;
+ border-radius: 2px;
+ font-weight: bold;
+ text-transform: uppercase;
+ margin-left: 1.5rem;
+}
+
+.desktop-nav a.donate-btn:hover, .desktop-nav a.donate-btn:focus, .desktop-nav a.donate-btn:active {
+ background-color: #ce5e14;
+ color: #ffffff;
+}
+
.white-nav {
margin-bottom: 1rem;
line-height: 1;
@@ -1797,15 +1861,19 @@ p.site-name a {
@media only screen and (max-width: 75rem) {
-.desktop-nav .items a {
- font-size: 0.85rem;
- padding: 0.8rem 0.5rem;
+.desktop-nav .items a, .desktop-nav .dropdown {
+ font-size: 1rem;
+ padding: 1rem 1.3rem;
}
-.desktop-nav .items a:last-of-type {
- margin-right: -0.5rem;
-}
+.desktop-nav a.donate-btn {
+ margin-left: 1.3rem;
+}
+.desktop-nav .dropdown-content {
+ top: 3.9rem;
+}
+
img.monero-logo {
width: 10rem;
}
@@ -1972,7 +2040,7 @@ p.site-name a {
display: -ms-flexbox;
display: -webkit-box;
display: flex;
- width: 100vw;
+ width: 100%;
background-color: #fff;
-moz-transition: top 0.5s, right 0.5s;
-webkit-transition: top 0.5s, right 0.5s;
@@ -2245,7 +2313,7 @@ body {
footer {
width: 100%;
- background-color: #4c4c4c;
+ background-color: #474c56;
color: #efefef;
z-index: 1;
}
@@ -2253,21 +2321,20 @@ footer {
footer a.white {
color: #efefef;
text-decoration: none;
- -webkit-transition: all ease-out .2s;
- -moz-transition: all ease-out .2s;
- -o-transition: all ease-out .2s;
- transition: all ease-out .2s;
font-size: 0.9375rem;
+ border-bottom: none;
+}
+
+footer a.white.gf {
+ border-bottom: 2px dotted #efefef;
}
footer a.white:hover, a.white:focus {
- color: #ff7519;
- text-decoration: underline;
+ border-bottom: 2px dotted #efefef;
}
.footer-wrapper {
padding: 4rem 1rem;
- padding-bottom: 0.5rem;
}
.footer-wrapper ul {
@@ -2275,11 +2342,41 @@ footer a.white:hover, a.white:focus {
}
.footer-links {
- margin-bottom: 3rem;
+ background-color: #31353c;
+ width: 100%;
}
.footer-link {
- padding: 0 1rem;
+ margin: 0 1rem;
+}
+
+.footer-wrapper .gf-address {
+ background-color: #dadbdd;
+ color: #4c4c4c;
+ font-weight: bold;
+ word-wrap: break-word;
+ padding: 1.5rem;
+ margin-top: 1.5rem;
+ -moz-box-shadow: 0 0 10px rgba(28,30,34,.6);
+ -webkit-box-shadow: 0 0 10px rgba(28,30,34,.6);
+ box-shadow: 0 0 10px rgba(28,30,34,.6);
+ border-radius: 2px;
+}
+
+.footer-wrapper .qr {
+ display: none;
+ border: none;
+ border-radius: 10px;
+ -moz-box-shadow: 0 0 30px rgba(28,30,34,.6);
+ -webkit-box-shadow: 0 0 30px rgba(28,30,34,.6);
+ box-shadow: 0 0 30px rgba(28,30,34,.6);
+ margin-bottom: 1rem;
+ margin-top: 1rem;
+ background-color: #ffffff;
+}
+
+.footer-wrapper .qr img {
+ vertical-align: middle;
}
@media only screen and (max-width: 75rem) {
@@ -2295,7 +2392,6 @@ footer a.white:hover, a.white:focus {
footer {
width: 100%;
- background-color: #4c4c4c;
color: #efefef;
z-index: 1;
}
@@ -2313,26 +2409,37 @@ footer {
position: initial;
width: 100%;
height: auto;
- background-color: #4c4c4c;
color: #efefef;
z-index: 1;
}
.footer-wrapper {
- padding: 2.5rem;
+ padding: 2.5rem 1rem;
}
.footer-wrapper div.col-xs-6 {
margin-bottom: 1.5rem;
padding-right: 1rem;
}
+
+footer a.white {
+ font-size: 0.8rem;
+}
+
+}
+@media only screen and (max-width: 37rem) {
+
+.footer-wrapper .qr {
+ display: inline-block;
+}
+
}
@media only screen and (max-width: 30rem) {
.footer-wrapper {
- padding: 2rem 2rem 0 2rem;
+ padding: 2rem;
}
.footer-wrapper div.col-xs-6 {
@@ -2341,6 +2448,10 @@ footer {
flex-basis: 100%;
padding-right: 0;
}
+
+.list-inline>li {
+ display: inline-block;
+}
}
@@ -2651,7 +2762,7 @@ h1 {
vertical-align: baseline;
}
-.ffs p.author-list:before, .ffs p.date-list:before, .ffs-proposal p.author-list:before, .ffs-proposal p.date-list:before, .ffs-proposal p.progress-number-goal:before, .ffs-proposal p.date-list.contributor:before {
+.ffs p.author-list:before, .ffs p.date-list:before, .ffs-proposal p.author-list:before, .ffs-proposal p.date-list:before, .ffs-proposal p.progress-number-goal:before, .ffs-proposal p.date-list.contributor:before, .in-progress p.progress-number-goal:before, .complete-proposal p.progress-number-goal:before {
content: '';
display: inline-block;
height: 0.8rem;
@@ -2669,7 +2780,7 @@ h1 {
background-image: url(/img/calendar.png);
}
-.ffs p.progress-number-goal:before, .ffs-proposal p.progress-number-goal:before {
+.in-progress p.progress-number-goal:before, .ffs-proposal p.progress-number-goal:before, .complete-proposal p.progress-number-goal:before {
background-image: url(/img/monero-amount.png);
}
@@ -2686,7 +2797,7 @@ h1 {
vertical-align: middle;
}
-.ffs-proposal p.date-list, .ffs-proposal p.progress-number-goal, .ffs p.date-list {
+.ffs-proposal p.date-list, .ffs-proposal p.progress-number-goal, .ffs p.date-list, .in-progress p.progress-number-goal, .complete-proposal p.progress-number-goal {
margin-left: 2rem;
}
@@ -2866,7 +2977,7 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
.fund-required p.bar-fund-status, .ffs-fr p.bar-fund-status, .ffs-con p.bar-fund-status {
text-align: left;
float: none;
- font-size: 0.9rem;
+ font-size: 1rem;
padding-top: 0;
margin-top: 1rem;
}
@@ -2899,6 +3010,14 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
vertical-align: middle;
}
+.in-progress p.progress-number-goal, .complete-proposal p.progress-number-goal {
+ font-size: 1.1rem;
+ color: #a1aabb;
+ line-height: 0;
+ display: inline;
+ vertical-align: middle;
+}
+
.ffs-proposal .btn {
width: 8rem;
height: 3rem;
@@ -2921,6 +3040,7 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
-o-transition: background .15s ease, box-shadow .15s ease;
transition: background .15s ease, box-shadow .15s ease;
margin: 0 auto;
+ border-radius: 2px;
}
.ffs-proposal .btn-primary {
@@ -3048,13 +3168,14 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
margin-top: 1.7rem;
font-family: 'Hind', sans-serif;
font-weight: bold;
+ text-decoration: none;
}
.panel-segment h3:first-child {
margin-top: 0;
}
-.panel-segment p, .panel-segment ul li, .panel-segment ol li {
+.panel-segment p, .panel-segment ul li, .panel-segment ol li, .dongf p {
padding-top: 1rem;
font-size: 1.1rem;
line-height: 1.7;
@@ -3168,7 +3289,7 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
padding-top: 2rem;
}
-.panel-segment p, .panel-segment ul li, .panel-segment ol li {
+.panel-segment p, .panel-segment ul li, .panel-segment ol li, .dongf p {
font-size: 1rem;
}
@@ -3191,6 +3312,17 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
margin-top: 2rem;
}
+.fund-required p.author-list, .fund-required p.date-list {
+ font-size: 1rem;
+}
+
+.complete-proposal p.author-list, .complete-proposal p.date-list, .complete-proposal p.progress-number-goal, .complete-proposal p.date-list, .in-progress p.autor-list, .in-progress p.date-list, .in-progress p.progress-number-goal {
+ display: block;
+ margin-left: 0;
+ padding-top: 0.9rem;
+ font-size: 1rem;
+}
+
}
@media (max-width: 600px) {
@@ -3307,17 +3439,6 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
@media only screen and (max-width: 48rem) {
.in-progress p.author-list {
- -ms-flex-preferred-size: 35%;
- flex-basis: 35%;
- max-width: 35%;
- font-size: 0.9rem;
- padding-top: 0;
-}
-
-.in-progress p.date-list {
- -ms-flex-preferred-size: 20%;
- flex-basis: 20%;
- max-width: 20%;
font-size: 0.9rem;
padding-top: 0;
}
@@ -3333,10 +3454,6 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
text-align: start;
}
-.in-progress p.author-list, .in-progress p.date-list {
- padding-top: 0.3rem;
-}
-
.in-progress p.bar-work-status, .ffs-cp p.bar-work-status {
text-align: left;
float: none;
@@ -3349,7 +3466,7 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
@media only screen and (max-width: 30rem) {
-.in-progress p.author-list, .in-progress p.date-list {
+.in-progress p.author-list, .in-progress p.date-list, .in-progress p.progress-number-goal, .complete-proposal p.progress-number-goal {
padding-top: 0.7rem;
}
}
@@ -3376,7 +3493,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 {
+.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 {
text-align: left;
float: none;
display: block;
@@ -3388,7 +3505,7 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
@media only screen and (max-width: 48rem) {
.ffs-proposal p.author-list, .ffs-proposal p.date-list, .ffs-proposal p.progress-number-goal, .ffs-proposal p.bar-work-status {
- font-size: 0.9rem;
+ font-size: 1rem;
}
.ffs-wip p.date-list, .ffs-wip p.progress-number-goal, .ffs-cp p.date-list, .ffs-cp p.progress-number-goal {
@@ -3399,15 +3516,19 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
@media only screen and (max-width: 37rem) {
-.ffs-proposal p.author-list, .ffs-proposal p.date-list, .ffs-proposal p.progress-number-goal, .ffs-proposal p.bar-work-status {
- padding-top: 0.7rem;
+.ffs-proposal p.author-list, .ffs-proposal p.date-list, .ffs-proposal p.progress-number-goal, .fund-required p.author-list, .fund-required p.date-list {
+ padding-top: 0.9rem;
+}
+
+.ffs-proposal p.bar-fund-status, .ffs-proposal p.bar-work-status {
+ padding-top: 0;
}
.ffs-wip .progress-bar, .ffs-cp .progress-bar {
margin-top: 0.5rem;
}
-.ffs-proposal p.author-list, .ffs-proposal p.date-list, .ffs-proposal p.progress-number-goal, .ffs-proposal p.bar-work-status {
+.ffs-proposal p.author-list, .ffs-proposal p.date-list, .ffs-proposal p.progress-number-goal, .ffs-proposal p.bar-work-status, .fund-required p.author-list, .fund-required p.date-list, .ffs-proposal p.bar-fund-status, .in-progress p.progress-number-goal, .complete-proposal p.progress-number-goal {
display: block;
margin-left: 0;
}
@@ -3636,8 +3757,10 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
}
-
-
+p.if-issues {
+ font-size: 0.8rem;
+ padding-top: 2rem;
+}
diff --git a/donate/index.html b/donate/index.html
index 4cc8bfd4879a27cd260f021d1d5941fd2d75df55..77a73917e88aedfdd288e79e0f5450a726d86074 100644
--- a/donate/index.html
+++ b/donate/index.html
@@ -1,123 +1,14 @@
-<!DOCTYPE html>
-<html>
-
- <head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1">
-
- <title>FFS</title>
-
- <link rel="apple-touch-icon" sizes="180x180" href="/meta/apple-touch-icon.png">
- <link rel="icon" type="image/png" sizes="32x32" href="/meta/favicon-32x32.png">
- <link rel="icon" type="image/png" sizes="16x16" href="/meta/favicon-16x16.png">
- <link rel="manifest" href="/meta/manifest.json">
- <link rel="mask-icon" href="/meta/safari-pinned-tab.svg" color="#5bbad5">
- <meta name="theme-color" content="#ffffff">
-
- <link href="/css/custom.css" rel="stylesheet">
-
-
- <meta name="msapplication-config" content="/ietemplates/ieconfig.xml">
-
- </head>
-
-
- <body>
- <div class="page-wrapper">
-
-<div class="mob-nav">
- <input class="burger-check" id="mobile-burger" type="checkbox"><label for="mobile-burger" class="burger"></label>
-
- <div class="slide-in-nav">
- <div class="container slide-in">
- <div class="row">
- <div class="col-xs-12">
- <div class="text-center nav-item mob">
- <a href="/ideas/" class="top-link">Ideas</a>
- </div>
- <div class="text-center nav-item mob">
- <a href="/funding-required/">Funding Required</a>
- </div>
- <div class="text-center nav-item mob">
- <a href="/work-in-progress/">Work in Progress</a>
- </div>
- <div class="text-center nav-item mob">
- <a href="/completed-proposals/">Completed Tasks</a>
- </div>
- <div class="text-center nav-item mob">
- <a href="/completed-proposals/">Back to Getmonero.org</a>
- </div>
- </div>
- </div>
- </div>
-
- </div>
- </div>
-
- <div class="desktop-nav">
- <nav class="container">
- <div class="row middle-xs">
- <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
- <p class="site-name"><a href="/">Community Crowdfunding System</a></p>
- </div>
- <div class="col-lg-8 col-md-8 col-sm-8 items end-xs">
- <div class="row end-xs middle-xs">
- <div class="col-md-12">
- <a href="/ideas/" class="top-link">Ideas</a>
- <a href="/funding-required/">Funding Required</a>
- <a href="/work-in-progress/">Work in Progress</a>
- <a href="/completed-proposals/">Completed Tasks</a>
- <a href="https://getmonero.org">Getmonero.org</a>
- </div>
- </div>
- </div>
- </div>
- </nav>
- </div>
- <div class="mob bot-nav white-nav">
- <div class="row middle-xs">
- <div class="col-xs-12">
- <p class="site-name"><a href="{% if site.lang == 'en' %}
-
- {{ site.baseurl_root }}/
-
- {% else %}
-
- {{ site.baseurl_root }}/{{site.lang}}
-
- {% endif %}">Community Crowdfunding System</a></p>
- </div>
- </div>
- </div>
-
- <div class="site-wrap ffs-proposal ffs-con">
-
-<div class="container ffs-breadcrumbs">
- <div class="row">
- <div class="col-xs-12">
- <p><a href="/">Community Crowdfunding System</a></p>
- <p><a href="/funding-required/">Funding Required</a></p>
- <p><a href="/funding-required/">[TITLE HERE]</a></p>
- <p class="bread-active">Contribute</p>
- </div>
- </div>
-</div>
+---
+layout: customnt
+title: Donate to the Monero Project
+---
<section class="container full">
<div class="info-block">
<div class="row">
- <div class="col-xs-12">
- <h2>[TITLE HERE]</h2>
- <div class="row middle-xs between-xs">
- <p class="author-list">[AUTHOR NAME HERE]</p>
- <p class="date-list">[DATE HERE]</p>
- <p class="bar-fund-status">Raised <span class="progress-number-funded">[AMOUNT HERE]</span> of <span class="progress-number-goal">[AMOUNT RAISED HERE]</span> XMR</p>
- </div>
- <div class="progress-bar">
- <span class="fund-progress" style="width: [PERCENTAGE HERE]%"></span>
- </div>
- <p>Your contribution should be visible within 5 minutes of you sending your contribution. If for some reason it is not there, please contact a member of the Core Team!</p>
+ <div class="col-xs-12 dongf">
+ <h2>Donate to the Monero Project</h2>
+ <p>By donating to the following Monero address (General Fund), you are supporting the Monero Project. If you wish to donate to a specific proposal, please see <a href="/funding-required/index.html" class="white gf">Funding Required</a>.</p>
</div>
</div>
</div>
@@ -126,52 +17,23 @@
<section class="container full">
<div class="row">
<div class="col-xs-12">
- <div class="tabs con-how">
- <input class="input" name="tabs" type="radio" id="tab-1" checked="checked"/>
- <label class="label" for="tab-1">QR Code</label>
- <div class="panel col-xs-12">
+ <div class="tabs ffs-con">
+ <div class="col-xs-12">
<div class="panel-segment">
<h3>Contribute with a QR code</h3>
<p>1. Choose the amount of XMR you wish to contribute to this proposal</p>
<p>2. Scan this QR code or tap to open in your Monero wallet app:</p>
<p>
- <a href="[MONERO URL HERE]" class="qr"><img src="[QR CODE IMAGE HERE]"/></a>
+ <a href="monero:44AFFq5kSiGBoZ4NMDwYtN18obc8AemS33DBLWs3H7otXft3XjrpDtQGv7SqSsaBYBb98uNbr2VBBEt7f2wfn3RVGQBEP3A" class="qr"><img src="/img/donate-monero.png"/></a>
</p>
- <p>3. Send! Thank you! You are amazing!</p>
+ <p>OR</p>
+ <p>Enter the following XMR address:</p>
+ <p class="string">44AFFq5kSiGBoZ4NMDwYtN18obc8AemS33DBLWs3H7otXft3XjrpDtQGv7SqSsaBYBb98uNbr2VBBEt7f2wfn3RVGQBEP3A</p>
+ <p>3. Send! Thank you! Monero is grateful to you.</p>
+ <p class="if-issues">Your contribution should be visible within 5 minutes of you sending your contribution. If for some reason it is not there, please contact a member of the Core Team!</p>
</div>
</div>
- <input class="input" name="tabs" type="radio" id="tab-2"/>
- <label class="label" for="tab-2">Address</label>
- <div class="panel col-xs-12">
- <div class="panel-segment">
- <h3>Contribute using an address</h3>
- <p>1. Choose the amount of XMR you wish to contribute to this proposal</p>
- <p>2. Enter the following XMR address:</p> <p class="string">[SUBADDRESS HERE]</p>
- <p>3. Send! Thank you! You are amazing!</p>
- </div>
- </div>
</div>
</div>
</div>
- </section>
- </div>
-
- <footer class="container-fluid">
- <div class="container">
- <div class="row around-xs footer-wrapper">
-
- <div class="row center-xs">
- <div class="social-icons">
- </div>
- <div class="footer-links">
- <ul class="list-unstyled list-inline">
-
- </ul>
- </div>
- </div>
- </div>
- </div>
-</footer>
- </div>
- </body>
-</html>
+ </section>
\ No newline at end of file
diff --git a/funding-required/index.html b/funding-required/index.html
index 54db59143b8ec10703ced2ecbe7a6913ae5e3a87..004d70ef883ee1df2ce92f5fab4353a23765a50e 100644
--- a/funding-required/index.html
+++ b/funding-required/index.html
@@ -26,6 +26,7 @@ title: Funding Required
<h3>{{proposal.name}}</h3>
<p class="author-list">{{proposal.author}}</p>
<p class="date-list">{{proposal.date}}</p>
+ <p class="date-list contributor">{{proposal.contributions}} contributors</p>
<p class="bar-fund-status">Raised <span class="progress-number-funded">{{proposal.amount-funded}}</span> of <span class="progress-number-goal">{{proposal.amount}}</span> XMR</p>
<div class="progress-bar">
<span class="fund-progress" style="width: {{proposal.percentage}}%"></span>
diff --git a/work-in-progress/index.html b/work-in-progress/index.html
index 3ff28b24b117eb8eb698c1357afb9d958de3592e..0646761cb6f8ea8b4ccecd6aab39a72bb74a61fa 100644
--- a/work-in-progress/index.html
+++ b/work-in-progress/index.html
@@ -26,6 +26,8 @@ title: Work in Progress
<h3>{{proposal.name}}</h3>
<p class="author-list">{{proposal.author}}</p>
<p class="date-list">{{proposal.date}}</p>
+ <p class="date-list contributor">{{proposal.contributions}} contributors</p>
+ <p class="progress-number-goal">{{proposal.amount}} XMR</p>
<p class="bar-work-status">Completed <span class="progress-number-funded">{{proposal.milestones-completed}}</span> of <span class="progress-number-goal">{{proposal.milestones}}</span> milestones</p>
<div class="progress-bar">
<span class="work-progress" style="width: {{proposal.milestones-percentage}}%"></span>