Commit 544584f8 authored by Diego Salazar's avatar Diego Salazar
Browse files

Add the number of contributors & funds raised

- to Funding Required list view
- to Work in Progress list view
- to Completed Proposals list view
parent 152cb83a
<footer class="container-fluid"> <footer class="container-fluid">
<div class="container"> <div class="container">
<div class="row around-xs footer-wrapper"> <div class="row center-xs footer-wrapper">
{% for item in site.data.lang[site.lang].footer-1 %} <div class="col-md-8 col-sm-10 col-xs-12">
<div class="col-sm-3 col-xs-6"> <h3>Donate to the Monero Project</h3>
<h3>{{item.title}}</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>
<ul class="list-unstyled"> <p><a href="monero:44AFFq5kSiGBoZ4NMDwYtN18obc8AemS33DBLWs3H7otXft3XjrpDtQGv7SqSsaBYBb98uNbr2VBBEt7f2wfn3RVGQBEP3A" class="qr"><img src="/img/donate-monero.png" /></a></p>
{% for entry in item.subfolderitems %} <p class="gf-address">44AFFq5kSiGBoZ4NMDwYtN18obc8AemS33DBLWs3H7otXft3XjrpDtQGv7SqSsaBYBb98uNbr2VBBEt7f2wfn3RVGQBEP3A</p>
{% if entry.url contains 'https://' %} </div>
<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> </div>
{% endfor %}
<div class="row center-xs">
<div class="social-icons">
</div> </div>
<div class="row center-xs">
<div class="footer-links"> <div class="footer-links">
<ul class="list-unstyled list-inline"> <ul class="list-unstyled list-inline">
{% for item in site.data.lang[site.lang].footer-2 %} <li><a href="https://repo.getmonero.org/monero-project/ccs-front" class="white footer-link">CCS Front End Repo</a></li>
{% if item.url contains 'https://' %} <li><a href="https://repo.getmonero.org/monero-project/ccs-back" class="white footer-link">CCS Backend Repo</a></li>
<li><a href="{{item.url}}" class="white footer-link">{{item.name}}</a></li> <li><a href="https://repo.getmonero.org/monero-project/ccs-proposals" class="white footer-link">CCS Proposals Repo</a></li>
{%else%}
<li><a href="{{site.baseurl}}/{{item.url}}" class="white footer-link">{{item.name}}</a></li>
{%endif%}
{% endfor %}
</ul> </ul>
</div> </div>
</div> </div>
</div>
</div>
</footer> </footer>
<!-- Matomo --> <!-- Matomo -->
<script type="text/javascript"> <script type="text/javascript">
......
...@@ -18,6 +18,9 @@ ...@@ -18,6 +18,9 @@
<div class="text-center nav-item mob"> <div class="text-center nav-item mob">
<a href="/completed-proposals/">Completed Tasks</a> <a href="/completed-proposals/">Completed Tasks</a>
</div> </div>
<div class="text-center nav-item mob">
<a href="/donate/index.html">Donate</a>
</div>
<div class="text-center nav-item mob"> <div class="text-center nav-item mob">
<a href="/completed-proposals/">Back to Getmonero.org</a> <a href="/completed-proposals/">Back to Getmonero.org</a>
</div> </div>
...@@ -37,11 +40,18 @@ ...@@ -37,11 +40,18 @@
<div class="col-lg-8 col-md-8 col-sm-8 items end-xs"> <div class="col-lg-8 col-md-8 col-sm-8 items end-xs">
<div class="row end-xs middle-xs"> <div class="row end-xs middle-xs">
<div class="col-md-12"> <div class="col-md-12">
<a href="/ideas/" class="top-link">Ideas</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="/funding-required/">Funding Required</a>
<a href="/work-in-progress/">Work in Progress</a> <a href="/work-in-progress/">Work in Progress</a>
<a href="/completed-proposals/">Completed Tasks</a> <a href="/completed-proposals/">Completed Tasks</a>
</div>
</div>
<a href="https://getmonero.org">Getmonero.org</a> <a href="https://getmonero.org">Getmonero.org</a>
<a href="/donate/" class="donate-btn">Donate</a>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -25,6 +25,8 @@ title: Completed Tasks ...@@ -25,6 +25,8 @@ title: Completed Tasks
<h3>{{proposal.name}}</h3> <h3>{{proposal.name}}</h3>
<p class="author-list">{{proposal.author}}</p> <p class="author-list">{{proposal.author}}</p>
<p class="date-list">{{proposal.date}}</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> </div>
</a> </a>
</div> </div>
......
...@@ -1743,6 +1743,54 @@ a.btn-link:hover span.icon-blockchain, a.btn-link:focus span.icon-blockchain, a. ...@@ -1743,6 +1743,54 @@ a.btn-link:hover span.icon-blockchain, a.btn-link:focus span.icon-blockchain, a.
margin-bottom: 4rem; 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 { img.monero-logo {
max-width: 100%; max-width: 100%;
height: auto; height: auto;
...@@ -1764,19 +1812,20 @@ p.site-name a { ...@@ -1764,19 +1812,20 @@ p.site-name a {
font-size: 1.2rem; font-size: 1.2rem;
} }
.desktop-nav .items a { .desktop-nav .items a, .desktop-nav .dropdown {
color: #4c4c4c; color: #4c4c4c;
text-decoration: none; text-decoration: none;
-webkit-transition: all ease-out .1s; -webkit-transition: all ease-out .1s;
-moz-transition: all ease-out .1s; -moz-transition: all ease-out .1s;
-o-transition: all ease-out .1s; -o-transition: all ease-out .1s;
transition: all ease-out .1s; transition: all ease-out .1s;
font-size: 0.9rem; font-size: 1rem;
padding: 0.8rem 1rem; padding: 1.5rem;
cursor: pointer;
} }
.desktop-nav .items a:last-of-type { .desktop-nav .dropdown label {
margin-right: -1rem; cursor: pointer;
} }
.desktop-nav .items a:hover, .topnav .topnav-list a:focus, .topnav .topnav-list a:active { .desktop-nav .items a:hover, .topnav .topnav-list a:focus, .topnav .topnav-list a:active {
...@@ -1784,6 +1833,21 @@ p.site-name a { ...@@ -1784,6 +1833,21 @@ p.site-name a {
text-decoration: none; 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 { .white-nav {
margin-bottom: 1rem; margin-bottom: 1rem;
line-height: 1; line-height: 1;
...@@ -1797,13 +1861,17 @@ p.site-name a { ...@@ -1797,13 +1861,17 @@ p.site-name a {
@media only screen and (max-width: 75rem) { @media only screen and (max-width: 75rem) {
.desktop-nav .items a { .desktop-nav .items a, .desktop-nav .dropdown {
font-size: 0.85rem; font-size: 1rem;
padding: 0.8rem 0.5rem; padding: 1rem 1.3rem;
} }
.desktop-nav .items a:last-of-type { .desktop-nav a.donate-btn {
margin-right: -0.5rem; margin-left: 1.3rem;
}
.desktop-nav .dropdown-content {
top: 3.9rem;
} }
img.monero-logo { img.monero-logo {
...@@ -1972,7 +2040,7 @@ p.site-name a { ...@@ -1972,7 +2040,7 @@ p.site-name a {
display: -ms-flexbox; display: -ms-flexbox;
display: -webkit-box; display: -webkit-box;
display: flex; display: flex;
width: 100vw; width: 100%;
background-color: #fff; background-color: #fff;
-moz-transition: top 0.5s, right 0.5s; -moz-transition: top 0.5s, right 0.5s;
-webkit-transition: top 0.5s, right 0.5s; -webkit-transition: top 0.5s, right 0.5s;
...@@ -2245,7 +2313,7 @@ body { ...@@ -2245,7 +2313,7 @@ body {
footer { footer {
width: 100%; width: 100%;
background-color: #4c4c4c; background-color: #474c56;
color: #efefef; color: #efefef;
z-index: 1; z-index: 1;
} }
...@@ -2253,21 +2321,20 @@ footer { ...@@ -2253,21 +2321,20 @@ footer {
footer a.white { footer a.white {
color: #efefef; color: #efefef;
text-decoration: none; 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; font-size: 0.9375rem;
border-bottom: none;
}
footer a.white.gf {
border-bottom: 2px dotted #efefef;
} }
footer a.white:hover, a.white:focus { footer a.white:hover, a.white:focus {
color: #ff7519; border-bottom: 2px dotted #efefef;
text-decoration: underline;
} }
.footer-wrapper { .footer-wrapper {
padding: 4rem 1rem; padding: 4rem 1rem;
padding-bottom: 0.5rem;
} }
.footer-wrapper ul { .footer-wrapper ul {
...@@ -2275,11 +2342,41 @@ footer a.white:hover, a.white:focus { ...@@ -2275,11 +2342,41 @@ footer a.white:hover, a.white:focus {
} }
.footer-links { .footer-links {
margin-bottom: 3rem; background-color: #31353c;
width: 100%;
} }
.footer-link { .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) { @media only screen and (max-width: 75rem) {
...@@ -2295,7 +2392,6 @@ footer a.white:hover, a.white:focus { ...@@ -2295,7 +2392,6 @@ footer a.white:hover, a.white:focus {
footer { footer {
width: 100%; width: 100%;
background-color: #4c4c4c;
color: #efefef; color: #efefef;
z-index: 1; z-index: 1;
} }
...@@ -2313,13 +2409,12 @@ footer { ...@@ -2313,13 +2409,12 @@ footer {
position: initial; position: initial;
width: 100%; width: 100%;
height: auto; height: auto;
background-color: #4c4c4c;
color: #efefef; color: #efefef;
z-index: 1; z-index: 1;
} }
.footer-wrapper { .footer-wrapper {
padding: 2.5rem; padding: 2.5rem 1rem;
} }
.footer-wrapper div.col-xs-6 { .footer-wrapper div.col-xs-6 {
...@@ -2327,12 +2422,24 @@ footer { ...@@ -2327,12 +2422,24 @@ footer {
padding-right: 1rem; 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) { @media only screen and (max-width: 30rem) {
.footer-wrapper { .footer-wrapper {
padding: 2rem 2rem 0 2rem; padding: 2rem;
} }
.footer-wrapper div.col-xs-6 { .footer-wrapper div.col-xs-6 {
...@@ -2342,6 +2449,10 @@ footer { ...@@ -2342,6 +2449,10 @@ footer {
padding-right: 0; padding-right: 0;
} }
.list-inline>li {
display: inline-block;
}
} }
/*********************FORUM FUNDING SYSTEM*************************/ /*********************FORUM FUNDING SYSTEM*************************/
...@@ -2651,7 +2762,7 @@ h1 { ...@@ -2651,7 +2762,7 @@ h1 {
vertical-align: baseline; 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: ''; content: '';
display: inline-block; display: inline-block;
height: 0.8rem; height: 0.8rem;
...@@ -2669,7 +2780,7 @@ h1 { ...@@ -2669,7 +2780,7 @@ h1 {
background-image: url(/img/calendar.png); 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); background-image: url(/img/monero-amount.png);
} }
...@@ -2686,7 +2797,7 @@ h1 { ...@@ -2686,7 +2797,7 @@ h1 {
vertical-align: middle; 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; margin-left: 2rem;
} }
...@@ -2866,7 +2977,7 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status { ...@@ -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 { .fund-required p.bar-fund-status, .ffs-fr p.bar-fund-status, .ffs-con p.bar-fund-status {
text-align: left; text-align: left;
float: none; float: none;
font-size: 0.9rem; font-size: 1rem;
padding-top: 0; padding-top: 0;
margin-top: 1rem; margin-top: 1rem;
} }
...@@ -2899,6 +3010,14 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status { ...@@ -2899,6 +3010,14 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
vertical-align: middle; 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 { .ffs-proposal .btn {
width: 8rem; width: 8rem;
height: 3rem; height: 3rem;
...@@ -2921,6 +3040,7 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status { ...@@ -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; -o-transition: background .15s ease, box-shadow .15s ease;
transition: background .15s ease, box-shadow .15s ease; transition: background .15s ease, box-shadow .15s ease;
margin: 0 auto; margin: 0 auto;
border-radius: 2px;
} }
.ffs-proposal .btn-primary { .ffs-proposal .btn-primary {
...@@ -3048,13 +3168,14 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status { ...@@ -3048,13 +3168,14 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
margin-top: 1.7rem; margin-top: 1.7rem;
font-family: 'Hind', sans-serif; font-family: 'Hind', sans-serif;
font-weight: bold; font-weight: bold;
text-decoration: none;
} }
.panel-segment h3:first-child { .panel-segment h3:first-child {
margin-top: 0; 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; padding-top: 1rem;
font-size: 1.1rem; font-size: 1.1rem;
line-height: 1.7; line-height: 1.7;
...@@ -3168,7 +3289,7 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status { ...@@ -3168,7 +3289,7 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
padding-top: 2rem; 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; font-size: 1rem;
} }
...@@ -3191,6 +3312,17 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status { ...@@ -3191,6 +3312,17 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
margin-top: 2rem; 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) { @media (max-width: 600px) {
...@@ -3307,17 +3439,6 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status { ...@@ -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) { @media only screen and (max-width: 48rem) {
.in-progress p.author-list { .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; font-size: 0.9rem;
padding-top: 0; padding-top: 0;