From 8c876322cbef257d33f2dc75dfde5cecd52a8fe8 Mon Sep 17 00:00:00 2001
From: <diego@DESKTOP-JD7IBSD.localdomain>
Date: Mon, 28 Jan 2019 19:23:38 -0700
Subject: [PATCH] More Updates - Added link to discussion on gitlab after
proposal - Fixed bug with payouts - Added contributors number - Other fixes
---
_layouts/cp.html | 22 ++--
_layouts/fr.html | 22 ++--
_layouts/wip.html | 21 ++--
completed-proposals/index.html | 6 +-
css/custom.css | 221 ++++++++++++++-------------------
funding-required/index.html | 10 +-
ideas/index.html | 8 +-
img/contributors.png | Bin 0 -> 4741 bytes
work-in-progress/index.html | 10 +-
9 files changed, 145 insertions(+), 175 deletions(-)
create mode 100644 img/contributors.png
diff --git a/_layouts/cp.html b/_layouts/cp.html
index f9bc85e..02d06ac 100644
--- a/_layouts/cp.html
+++ b/_layouts/cp.html
@@ -21,17 +21,15 @@ layout: base
{% for proposal in toplevel.proposals%}
{% if proposal.name == {{page.title}} %}
<h2>{{page.title}}</h2>
- <p class="author-list"><span><img src="/img/author-filled.png"></span>by {{proposal.author}}</p>
- <p class="date-list"><span><img src="/img/calendar.png"></span>{{proposal.date}}</p>
- <p class="progress-number-goal"><span><img src="/img/monero-amount.png"></span>{{proposal.amount}} XMR</p>
+ <p class="author-list">by {{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.contributors}} contributors</p>
<p class="bar-work-status">Completed</p>
<div class="progress-bar">
<span class="work-progress" style="width: 100%; background-color: #70af71;"></span>
</div>
- {%endif%}
- {%endfor%}
- {%endif%}
- {%endfor%}
+
</div>
</div>
</div>
@@ -47,6 +45,14 @@ layout: base
<div class="panel col-xs-12">
<div class="panel-segment">
{{content}}
+ <div class="gldiscuss">
+ <h3>Community Discussion and Updates</h3>
+ <p><a href="{{proposal.gitlab-url}}">View community discussion, comments, and proposal updates on GitLab</a></p>
+ </div>
+ {%endif%}
+ {%endfor%}
+ {%endif%}
+ {%endfor%}
</div>
</div>
<input class="input" name="tabs" type="radio" id="tab-2"/>
@@ -74,7 +80,7 @@ layout: base
<div class="panel col-xs-12">
{% if page.payouts != nil %}
{% for payouts in page.payouts %}
- <div class="panel-segment">
+ <div class="milestone panel-segment">
<span class="{{milestones.status}} ms-{{milestones.status}}"></span>
<p><span class="bold">Funds Awarded:</span> {{payouts.amount}}</p>
<p><span class="bold">Date:</span> {{payouts.date}}</p>
diff --git a/_layouts/fr.html b/_layouts/fr.html
index bae370a..13c7f48 100644
--- a/_layouts/fr.html
+++ b/_layouts/fr.html
@@ -53,19 +53,15 @@ layout: base
{% for proposal in toplevel.proposals%}
{% if proposal.name == {{page.title}} %}
<h2>{{page.title}}</h2>
- <div class="row middle-xs between-xs">
- <p class="author-list"><span><img src="/img/author-filled.png"></span>{{proposal.author}}</p>
- <p class="date-list"><span><img src="/img/calendar.png"></span>{{proposal.date}}</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>
+ <p class="author-list">{{proposal.author}}</p>
+ <p class="date-list">{{proposal.date}}</p>
+ <p class="date-list contributor">{{proposal.contributors}} 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>100 XMR</p>
<div class="progress-bar">
<span class="fund-progress" style="width: {{proposal.percentage}}%"></span>
</div>
<p><a href="{{proposal.donate-url}}" class="btn btn-primary">Contribute</a></p>
- {%endif%}
- {%endfor%}
- {%endif%}
- {%endfor%}
+
</div>
</div>
</div>
@@ -81,6 +77,14 @@ layout: base
<div class="panel col-xs-12">
<div class="panel-segment">
{{content}}
+ <div class="gldiscuss">
+ <h3>Community Discussion and Updates</h3>
+ <p><a href="{{proposal.gitlab-url}}">View community discussion, comments, and proposal updates on GitLab</a></p>
+ </div>
+ {%endif%}
+ {%endfor%}
+ {%endif%}
+ {%endfor%}
</div>
</div>
<input class="input" name="tabs" type="radio" id="tab-2"/>
diff --git a/_layouts/wip.html b/_layouts/wip.html
index dc131e5..a027a4e 100644
--- a/_layouts/wip.html
+++ b/_layouts/wip.html
@@ -23,17 +23,15 @@ layout: base
{% for proposal in toplevel.proposals%}
{% if proposal.name == {{page.title}} %}
<h2>{{page.title}}</h2>
- <p class="author-list"><span><img src="/img/author-filled.png"></span>{{page.author}}</p>
- <p class="date-list"><span><img src="/img/calendar.png"></span>{{page.date}}</p>
- <p class="progress-number-goal"><span><img src="/img/monero-amount.png"></span>{{proposal.amount}} XMR</p>
+ <p class="author-list">{{page.author}}</p>
+ <p class="date-list">{{page.date}}</p>
+ <p class="progress-number-goal">{{proposal.amount}} XMR</p>
+ <p class="date-list contributor">{{proposal.contributors}} contributors</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>
</div>
- {%endif%}
- {%endfor%}
- {%endif%}
- {%endfor%}
+
</div>
</div>
</div>
@@ -49,6 +47,13 @@ layout: base
<div class="panel col-xs-12">
<div class="panel-segment">
{{content}}
+ <div class="gldiscuss">
+ <h3>Community Discussion and Updates</h3>
+ <p><a href="{{proposal.gitlab-url}}">View community discussion, comments, and proposal updates on GitLab</a></p>
+ </div>{%endif%}
+ {%endfor%}
+ {%endif%}
+ {%endfor%}
</div>
</div>
<input class="input" name="tabs" type="radio" id="tab-2"/>
@@ -60,10 +65,8 @@ layout: base
<span class="{{milestones.status}} ms-{{milestones.status}}"></span>
<h3>{{milestones.name}}</h3>
<p><span>To be paid:</span> {{milestones.funds}}</p>
- {% if milestones.done != nil %}
<p><span>Completion date:</span> {{milestones.done}}</p>
</div>
- {%endif%}
{%endfor%}
{%else%}
<div class="panel-segment">
diff --git a/completed-proposals/index.html b/completed-proposals/index.html
index dea8c2a..27dade2 100644
--- a/completed-proposals/index.html
+++ b/completed-proposals/index.html
@@ -23,10 +23,8 @@ title: Completed Tasks
<a href="{{proposal.local-url}}" class="row middle-xs ffs-idea">
<div class="col-xs-12">
<h3>{{proposal.name}}</h3>
- <div class="row">
- <p class="author-list"><span><img src="/img/author-filled.png"></span>{{proposal.author}}</p>
- <p class="date-list"><span><img src="/img/calendar.png"></span>{{proposal.date}}</p>
- </div>
+ <p class="author-list">{{proposal.author}}</p>
+ <p class="date-list">{{proposal.date}}</p>
</div>
</a>
</div>
diff --git a/css/custom.css b/css/custom.css
index da132ae..2e6bf66 100644
--- a/css/custom.css
+++ b/css/custom.css
@@ -2648,6 +2648,32 @@ 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 {
+ content: '';
+ display: inline-block;
+ height: 0.8rem;
+ width: 0.8rem;
+ margin-right: 0.3rem;
+ vertical-align: baseline;
+ background-size: cover;
+}
+
+.ffs p.author-list:before, .ffs-proposal p.author-list:before {
+ background-image: url(/img/author-filled.png);
+}
+
+.ffs p.date-list:before, .ffs-proposal p.date-list:before {
+ background-image: url(/img/calendar.png);
+}
+
+.ffs p.progress-number-goal:before, .ffs-proposal p.progress-number-goal:before {
+ background-image: url(/img/monero-amount.png);
+}
+
+.ffs p.date-list.contributor:before, .ffs-proposal p.date-list.contributor:before {
+ background-image: url(/img/contributors.png);
+}
+
.ffs p.author-list, .ffs p.date-list, .ffs-proposal p.author-list, .ffs-proposal p.date-list {
padding-top: 0;
font-size: 1.1rem;
@@ -2657,6 +2683,10 @@ h1 {
vertical-align: middle;
}
+.ffs-proposal p.date-list, .ffs-proposal p.progress-number-goal, .ffs p.date-list {
+ margin-left: 2rem;
+}
+
p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
box-sizing: border-box;
-ms-flex: 0 0 auto;
@@ -2665,9 +2695,11 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
}
.ideas p.author-list, .ideas p.date-list, .complete-proposal p.author-list, .complete-proposal p.date-list {
- -ms-flex-preferred-size: 30%;
- flex-basis: 30%;
- max-width: 30%;
+ display: inline;
+}
+
+.ideas p.date-list, .complete-proposal p.date-list {
+ margin-left: 2rem;
}
.ffs p.list-button {
@@ -2704,9 +2736,6 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
}
.ideas p.author-list, .ideas p.date-list, .complete-proposal p.author-list, .complete-proposal p.date-list {
- -ms-flex-preferred-size: 40%;
- flex-basis: 40%;
- max-width: 40%;
font-size: 1rem;
}
@@ -2725,11 +2754,7 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
}
.ideas p.author-list, .ideas p.date-list, .complete-proposal p.author-list, .complete-proposal p.date-list {
- -ms-flex-preferred-size: 50%;
- flex-basis: 50%;
- max-width: 50%;
- font-size: 0.9rem;
- padding-top: 0.3rem;
+ padding-top: 0.7rem;
}
}
@@ -2750,14 +2775,16 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
margin-top: 0.5rem;
}
+.ideas p.author-list, .ideas p.date-list, .complete-proposal p.author-list, .complete-proposal p.date-list, .ffs p.author-list, .ffs p.date-list {
+ display: block;
+ margin-left: 0;
+}
+
}
@media only screen and (max-width: 28rem) {
.ideas p.author-list, .ideas p.date-list, .complete-proposal p.author-list, .complete-proposal p.date-list {
- -ms-flex-preferred-size: 100%;
- flex-basis: 100%;
- max-width: 100%;
padding-top: 0.7rem;
}
@@ -2778,18 +2805,6 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
margin-top: 1.5rem;
}
-.fund-required p.author-list, .fund-required p.date-list, .ffs-fr p.author-list, .ffs-fr p.date-list, .ffs-con p.author-list, .ffs-con p.date-list {
- -ms-flex-preferred-size: 25%;
- flex-basis: 25%;
- max-width: 25%;
-}
-
-.fund-required p.bar-fund-status, .ffs-fr p.bar-fund-status, .ffs-con p.bar-fund-status, .ffs-con p.bar-fund-status, .ffs-con p.bar-fund-status {
- -ms-flex-preferred-size: 40%;
- flex-basis: 40%;
- max-width: 40%;
-}
-
.fund-required p.author {
padding-top: 0.5rem;
}
@@ -2799,11 +2814,12 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
font-weight: bold;
font-family: 'Open Sans', sans-serif;
text-align: right;
+ float: right;
font-size: 1.1rem;
}
.fund-required .progress-bar {
- margin-top: 0.5rem;
+ margin-top: 1rem;
margin-bottom: 0.5rem;
}
@@ -2814,16 +2830,10 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
@media only screen and (max-width: 62rem) {
.fund-required p.author-list, .fund-required p.date-list, .ffs-fr p.author-list, .ffs-fr p.date-list, .ffs-con p.author-list, .ffs-con p.date-list {
- -ms-flex-preferred-size: 29%;
- flex-basis: 29%;
- max-width: 29%;
font-size: 1rem;
}
.fund-required p.bar-fund-status, .ffs-fr p.bar-fund-status, .ffs-con p.bar-fund-status {
- -ms-flex-preferred-size: 40%;
- flex-basis: 40%;
- max-width: 40%;
font-size: 1rem;
}
@@ -2831,28 +2841,7 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
@media only screen and (max-width: 48rem) {
-.fund-required p.author-list, .ffs-fr p.author-list, .ffs-con p.author-list, .ffs-con p.date-list {
- -ms-flex-preferred-size: 40%;
- flex-basis: 40%;
- max-width: 40%;
- font-size: 0.9rem;
- padding-top: 0;
-}
-
.fund-required p.date-list, .ffs-fr p.date-list {
- -ms-flex-preferred-size: 20%;
- flex-basis: 20%;
- max-width: 20%;
- font-size: 0.9rem;
- padding-top: 0;
-}
-
-.fund-required p.bar-fund-status, .ffs-fr p.bar-fund-status, .ffs-con p.bar-fund-status {
- -ms-flex-preferred-size: 40%;
- flex-basis: 40%;
- max-width: 40%;
- text-align: right;
- font-size: 0.9rem;
padding-top: 0;
}
@@ -2869,16 +2858,13 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
.fund-required p.author-list, .fund-required p.date-list, .ffs-fr p.author-list, .ffs-fr p.date-list, .ffs-con p.author-list, .ffs-con p.date-list {
padding-top: 0.3rem;
- -ms-flex-preferred-size: 50%;
- flex-basis: 50%;
- max-width: 50%;
}
.fund-required p.bar-fund-status, .ffs-fr p.bar-fund-status, .ffs-con p.bar-fund-status {
- -ms-flex-preferred-size: 100%;
- flex-basis: 100%;
- max-width: 100%;
text-align: left;
+ float: none;
+ font-size: 0.9rem;
+ padding-top: 0;
margin-top: 1rem;
}
@@ -2887,9 +2873,6 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
@media only screen and (max-width: 30rem) {
.fund-required p.author-list, .fund-required p.date-list, .ffs-fr p.author-list, .ffs-fr p.date-list, .ffs-con p.author-list, .ffs-con p.date-list {
- -ms-flex-preferred-size: 100%;
- flex-basis: 100%;
- max-width: 100%;
padding-top: 0.7rem;
}
}
@@ -2946,9 +2929,9 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
background-color: #ce5e14;
color: #ffffff;
border: none !important;
- -moz-box-shadow: 0 0 30px rgba(50, 50, 93, .2), 0 3px 30px rgba(0, 0, 0, .2);
- -webkit-box-shadow: 0 0 30px rgba(50, 50, 93, .2), 0 3px 30px rgba(0, 0, 0, .2);
- box-shadow: 0 0 30px rgba(50, 50, 93, .2), 0 3px 30px rgba(0, 0, 0, .2);
+ -moz-box-shadow: 0 0 30px rgba(50, 50, 93, .2), 0 3px 22px rgba(0, 0, 0, .2);
+ -webkit-box-shadow: 0 0 30px rgba(50, 50, 93, .2), 0 3px 22px rgba(0, 0, 0, .2);
+ box-shadow: 0 0 30px rgba(50, 50, 93, .2), 0 3px 22px rgba(0, 0, 0, .2);
}
.tabs {
@@ -3026,6 +3009,7 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
-webkit-box-shadow: 0 2px 4px rgba(50,50,93,.1);
box-shadow: 0 2px 4px rgba(50,50,93,.1);
margin-top: 0;
+ word-wrap: break-word;
}
.panel-segment:last-child {
@@ -3063,6 +3047,12 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
padding-top: 1rem;
}
+.panel-segment .gldiscuss {
+ padding-top: 2.5rem;
+ margin-top: 3rem;
+ border-top: 1.5px solid #d0d4dd;
+}
+
.milestone.panel-segment {
position: relative;
padding: 0 4rem 4rem 4rem;
@@ -3079,7 +3069,7 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
.milestone.panel-segment:after {
content: '';
width: 100%;
- display: block;
+ display: none;
border-bottom: 1.5px solid #d0d4dd;
padding-top: 4rem;
}
@@ -3119,6 +3109,11 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
margin-top: 2rem;
}
+.panel-segment .gldiscuss {
+ padding-top: 2rem;
+ margin-top: 2.5rem;
+}
+
.panel-segment p, .panel-segment ul li, .panel-segment ol li {
padding-top: 0.5rem;
}
@@ -3153,6 +3148,11 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
font-size: 1.3rem;
margin-top: 1.5rem;
}
+
+.panel-segment .gldiscuss {
+ padding-top: 1.5rem;
+ margin-top: 2rem;
+}
}
@@ -3241,7 +3241,7 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
}
.in-progress .progress-bar {
- margin-top: 0.5rem;
+ margin-top: 1rem;
margin-bottom: 0.5rem;
}
@@ -3251,31 +3251,13 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
font-family: 'Open Sans', sans-serif;
}
-.in-progress p.author-list, .in-progress p.date-list {
- -ms-flex-preferred-size: 25%;
- flex-basis: 25%;
- max-width: 25%;
-}
-
-.in-progress p.bar-work-status {
- -ms-flex-preferred-size: 40%;
- flex-basis: 40%;
- max-width: 40%;
-}
-
@media only screen and (max-width: 62rem) {
.in-progress p.author-list, .in-progress p.date-list {
- -ms-flex-preferred-size: 29%;
- flex-basis: 29%;
- max-width: 29%;
font-size: 1rem;
}
.in-progress p.bar-work-status {
- -ms-flex-preferred-size: 40%;
- flex-basis: 40%;
- max-width: 40%;
font-size: 1rem;
}
@@ -3299,15 +3281,6 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
padding-top: 0;
}
-.in-progress p.bar-work-status, .ffs-cp p.bar-work-status {
- -ms-flex-preferred-size: 45%;
- flex-basis: 45%;
- max-width: 45%;
- text-align: right;
- font-size: 0.9rem;
- padding-top: 0;
-}
-
}
@media only screen and (max-width: 41rem) {
@@ -3321,16 +3294,13 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
.in-progress p.author-list, .in-progress p.date-list {
padding-top: 0.3rem;
- -ms-flex-preferred-size: 50%;
- flex-basis: 50%;
- max-width: 50%;
}
-.in-progress p.bar-work-status {
- -ms-flex-preferred-size: 100%;
- flex-basis: 100%;
- max-width: 100%;
+.in-progress p.bar-work-status, .ffs-cp p.bar-work-status {
text-align: left;
+ float: none;
+ font-size: 0.9rem;
+ padding-top: 0;
margin-top: 1rem;
}
@@ -3339,24 +3309,17 @@ 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 {
- -ms-flex-preferred-size: 100%;
- flex-basis: 100%;
- max-width: 100%;
padding-top: 0.7rem;
}
}
/* FFS WORK IN PROGRESS SINGLE */
-.ffs-wip p.author-list, .ffs-cp p.author-list, .ffs-wip p.date-list, .ffs-wip p.progress-number-goal, .ffs-cp p.date-list, .ffs-cp p.progress-number-goal, .ffs-wip p.bar-work-status, .ffs-cp 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 {
display: inline;
}
-.ffs-wip p.date-list, .ffs-wip p.progress-number-goal, .ffs-cp p.date-list, .ffs-cp p.progress-number-goal {
- margin-left: 2rem;
-}
-
-.ffs-wip p.bar-work-status, .ffs-cp p.bar-work-status {
+.ffs-proposal p.bar-work-status, .ffs-proposal p.bar-fund-status {
text-align: right;
float: right;
}
@@ -3368,22 +3331,22 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
@media only screen and (max-width: 62rem) {
-.ffs-wip p.author-list, .ffs-cp p.author-list, .ffs-wip p.date-list, .ffs-wip p.progress-number-goal, .ffs-cp p.date-list, .ffs-cp p.progress-number-goal, .ffs-wip p.bar-work-status, .ffs-cp 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 {
font-size: 1rem;
}
-
-}
-
-@media only screen and (max-width: 48rem) {
-.ffs-wip p.bar-work-status, .ffs-cp p.bar-work-status {
+.ffs-proposal p.bar-work-status, .ffs-proposal p.bar-work-status, .ffs-proposal p.bar-fund-status {
text-align: left;
float: none;
display: block;
margin-top: 1rem;
}
+
+}
+
+@media only screen and (max-width: 48rem) {
-.ffs-wip p.author-list, .ffs-cp p.author-list, .ffs-wip p.date-list, .ffs-wip p.progress-number-goal, .ffs-cp p.date-list, .ffs-cp p.progress-number-goal, .ffs-wip p.bar-work-status, .ffs-cp 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 {
font-size: 0.9rem;
}
@@ -3394,23 +3357,25 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
}
@media only screen and (max-width: 37rem) {
-
-.ffs-wip p.author-list, .ffs-cp p.author-list, .ffs-wip p.date-list, .ffs-wip p.progress-number-goal, .ffs-cp p.date-list, .ffs-cp p.progress-number-goal {
+
+.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-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 {
+ display: block;
+ margin-left: 0;
+}
}
@media only screen and (max-width: 30rem) {
-.ffs-wip p.author-list, .ffs-cp p.author-list, .ffs-wip p.date-list, .ffs-wip p.progress-number-goal, .ffs-cp p.date-list, .ffs-cp p.progress-number-goal {
- display: block;
- margin-left: 0;
-}
+
}
@@ -3581,16 +3546,16 @@ p.author-list, p.date-list, p.progress-number-goal, p.bar-work-status {
@media only screen and (max-width: 62rem) {
-}
-
-@media only screen and (max-width: 48rem) {
-
.progress-bar {
margin-top: 0.2rem;
}
}
+@media only screen and (max-width: 48rem) {
+
+}
+
@media only screen and (max-width: 41rem) {
.ffs a.ffs-idea {
diff --git a/funding-required/index.html b/funding-required/index.html
index ff16054..54db591 100644
--- a/funding-required/index.html
+++ b/funding-required/index.html
@@ -24,13 +24,11 @@ title: Funding Required
<a href="{{proposal.local-url}}" class="row middle-xs ffs-idea">
<div class="col-xs-12">
<h3>{{proposal.name}}</h3>
- <div class="row between-xs middle-xs">
- <p class="author-list"><span><img src="/img/author-filled.png"></span>{{proposal.author}}</p>
- <p class="date-list"><span><img src="/img/calendar.png"></span>{{proposal.date}}</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>
+ <p class="author-list">{{proposal.author}}</p>
+ <p class="date-list">{{proposal.date}}</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>
+ <span class="fund-progress" style="width: {{proposal.percentage}}%"></span>
</div>
</div>
</a>
diff --git a/ideas/index.html b/ideas/index.html
index 374fcc4..3b86094 100644
--- a/ideas/index.html
+++ b/ideas/index.html
@@ -24,13 +24,11 @@ title: Ideas
{% if toplevel.stage == "Ideas" %}
{% for proposal in toplevel.proposals%}
<div class="col-xs-12">
- <a href="{{proposal.gitlab-url}}" class="row middle-xs ffs-idea">
+ <a href="{{proposal.gitlab-url}}" target="_blank" class="row middle-xs ffs-idea">
<div class="col-xs-12">
<h3>{{proposal.name}}</h3>
- <div class="row">
- <p class="author-list"><span><img src="/img/author-filled.png"></span>{{proposal.author}}</p>
- <p class="date-list"><span><img src="/img/calendar.png"></span>{{proposal.date}}</p>
- </div>
+ <p class="author-list"><span><img src="/img/author-filled.png"></span>{{proposal.author}}</p>
+ <p class="date-list"><span><img src="/img/calendar.png"></span>{{proposal.date}}</p>
</div>
</a>
</div>
diff --git a/img/contributors.png b/img/contributors.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ca4bbe2e27e52351138f0d366821c75913de87d
GIT binary patch
literal 4741
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
KOut;uDe`|9M)B(a
literal 0
HcmV?d00001
diff --git a/work-in-progress/index.html b/work-in-progress/index.html
index d1a414c..3ff28b2 100644
--- a/work-in-progress/index.html
+++ b/work-in-progress/index.html
@@ -24,13 +24,11 @@ title: Work in Progress
<a href="{{proposal.local-url}}" class="row middle-xs ffs-idea">
<div class="col-xs-12">
<h3>{{proposal.name}}</h3>
- <div class="row between-xs middle-xs">
- <p class="author-list"><span><img src="/img/author-filled.png"></span>{{proposal.author}}</p>
- <p class="date-list"><span><img src="/img/calendar.png"></span>{{proposal.date}}</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>
+ <p class="author-list">{{proposal.author}}</p>
+ <p class="date-list">{{proposal.date}}</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>
+ <span class="work-progress" style="width: {{proposal.milestones-percentage}}%"></span>
</div>
</div>
</a>
--
GitLab