Commit b36ff117 authored by 's avatar
Browse files

Updates

- Updated Donate page and CSS for subaddresses
- Fixed bugs in Funding Required and Work in Progress
parent 91e624aa
......@@ -59,7 +59,7 @@ layout: base
<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>
<div class="progress-bar">
<span class="fund-progress" style="width: {{proposal-percentage}}%"></span>
<span class="fund-progress" style="width: {{proposal.percentage}}%"></span>
</div>
<p><a href="{{proposal.donate-url}}" class="btn btn-primary">Contribute</a></p>
{%endif%}
......@@ -72,36 +72,30 @@ layout: base
</section>
<section class="container full">
<div class="">
<div class="row between-xs">
<div class="row">
<div class="col-xs-12">
<div class="tabs">
<div class="tabs con-how">
<input class="input" name="tabs" type="radio" id="tab-1" checked="checked"/>
<label class="label" for="tab-1">Proposal</label>
<label class="label" for="tab-1">QR Code</label>
<div class="panel col-xs-12">
<div class="panel-segment">
{{content}}
<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:45ttEikQEZWN1m7VxaVN9rjQkpSdmpGZ82GwUps66neQ1PqbQMno4wMY8F5jiDt2GoHzCtMwa7PDPJUJYb1GYrMP4CwAwNp" class="qr"><img src="/img/qrcode.png"/></a>
</p>
<p>3. Send! Thank you! You are amazing!</p>
</div>
</div>
<input class="input" name="tabs" type="radio" id="tab-2"/>
<label class="label" for="tab-2">Milestones</label>
<label class="label" for="tab-2">Address</label>
<div class="panel col-xs-12">
{% if page.milestones != nil %}
{% for milestones in page.milestones %}
<div class="milestone panel-segment">
<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">
<p>No milestones</p>
</div>
{%endif%}
<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">45ttEikQEZWN1m7VxaVN9rjQkpSdmpGZ82GwUps66neQ1PqbQMno4wMY8F5jiDt2GoHzCtMwa7PDPJUJYb1GYrMP4CwAwNp</p>
<p>3. Send! Thank you! You are amazing!</p>
</div>
</div>
</div>
......
......@@ -84,8 +84,7 @@
/*FLEXBOX*/
.container,
.container-fluid {
.container, .container-fluid {
margin-left: auto;
margin-right: auto;
}
......@@ -111,6 +110,20 @@
flex-wrap: wrap;
}
.row.reverse {
-ms-flex-direction: row-reverse;
-webkit-box-orient: horizontal;
-webkit-box-direction: reverse;
flex-direction: row-reverse;
}
.col.reverse {
-ms-flex-direction: column-reverse;
-webkit-box-orient: vertical;
-webkit-box-direction: reverse;
flex-direction: column-reverse;
}
.col-xs,
.col-xs-1,
.col-xs-2,
......@@ -142,6 +155,18 @@
max-width: 100%;
}
.col-xs-1 {
-ms-flex-preferred-size: 8.333%;
flex-basis: 8.333%;
max-width: 8.333%;
}
.col-xs-2 {
-ms-flex-preferred-size: 16.667%;
flex-basis: 16.667%;
max-width: 16.667%;
}
.col-xs-3 {
-ms-flex-preferred-size: 25%;
flex-basis: 25%;
......@@ -184,12 +209,68 @@
max-width: 75%;
}
.col-xs-10 {
-ms-flex-preferred-size: 83.333%;
flex-basis: 83.333%;
max-width: 83.333%;
}
.col-xs-11 {
-ms-flex-preferred-size: 91.667%;
flex-basis: 91.667%;
max-width: 91.667%;
}
.col-xs-12 {
-ms-flex-preferred-size: 100%;
flex-basis: 100%;
max-width: 100%;
}
.col-xs-offset-1 {
margin-left: 8.333%;
}
.col-xs-offset-2 {
margin-left: 16.667%;
}
.col-xs-offset-3 {
margin-left: 25%;
}
.col-xs-offset-4 {
margin-left: 33.333%;
}
.col-xs-offset-5 {
margin-left: 41.667%;
}
.col-xs-offset-6 {
margin-left: 50%;
}
.col-xs-offset-7 {
margin-left: 58.333%;
}
.col-xs-offset-8 {
margin-left: 66.667%;
}
.col-xs-offset-9 {
margin-left: 75%;
}
.col-xs-offset-10 {
margin-left: 83.333%;
}
.col-xs-offset-11 {
margin-left: 91.667%;
}
.start-xs {
-ms-flex-pack: start;
-webkit-box-pack: start;
......@@ -253,7 +334,6 @@
}
@media only screen and (min-width: 48em) {
.col-sm,
.col-sm-1,
.col-sm-2,
......@@ -285,6 +365,18 @@
max-width: 100%;
}
.col-sm-1 {
-ms-flex-preferred-size: 8.333%;
flex-basis: 8.333%;
max-width: 8.333%;
}
.col-sm-2 {
-ms-flex-preferred-size: 16.667%;
flex-basis: 16.667%;
max-width: 16.667%;
}
.col-sm-3 {
-ms-flex-preferred-size: 25%;
flex-basis: 25%;
......@@ -327,12 +419,68 @@
max-width: 75%;
}
.col-sm-10 {
-ms-flex-preferred-size: 83.333%;
flex-basis: 83.333%;
max-width: 83.333%;
}
.col-sm-11 {
-ms-flex-preferred-size: 91.667%;
flex-basis: 91.667%;
max-width: 91.667%;
}
.col-sm-12 {
-ms-flex-preferred-size: 100%;
flex-basis: 100%;
max-width: 100%;
}
.col-sm-offset-1 {
margin-left: 8.333%;
}
.col-sm-offset-2 {
margin-left: 16.667%;
}
.col-sm-offset-3 {
margin-left: 25%;
}
.col-sm-offset-4 {
margin-left: 33.333%;
}
.col-sm-offset-5 {
margin-left: 41.667%;
}
.col-sm-offset-6 {
margin-left: 50%;
}
.col-sm-offset-7 {
margin-left: 58.333%;
}
.col-sm-offset-8 {
margin-left: 66.667%;
}
.col-sm-offset-9 {
margin-left: 75%;
}
.col-sm-offset-10 {
margin-left: 83.333%;
}
.col-sm-offset-11 {
margin-left: 91.667%;
}
.start-sm {
-ms-flex-pack: start;
-webkit-box-pack: start;
......@@ -420,6 +568,28 @@
flex: 0 0 auto;
}
.col-md {
-webkit-flex-grow: 1;
-ms-flex-positive: 1;
-webkit-box-flex: 1;
flex-grow: 1;
-ms-flex-preferred-size: 0;
flex-basis: 0;
max-width: 100%;
}
.col-md-1 {
-ms-flex-preferred-size: 8.333%;
flex-basis: 8.333%;
max-width: 8.333%;
}
.col-md-2 {
-ms-flex-preferred-size: 16.667%;
flex-basis: 16.667%;
max-width: 16.667%;
}
.col-md-3 {
-ms-flex-preferred-size: 25%;
flex-basis: 25%;
......@@ -462,12 +632,68 @@
max-width: 75%;
}
.col-md-10 {
-ms-flex-preferred-size: 83.333%;
flex-basis: 83.333%;
max-width: 83.333%;
}
.col-md-11 {
-ms-flex-preferred-size: 91.667%;
flex-basis: 91.667%;
max-width: 91.667%;
}
.col-md-12 {
-ms-flex-preferred-size: 100%;
flex-basis: 100%;
max-width: 100%;
}
.col-md-offset-1 {
margin-left: 8.333%;
}
.col-md-offset-2 {
margin-left: 16.667%;
}
.col-md-offset-3 {
margin-left: 25%;
}
.col-md-offset-4 {
margin-left: 33.333%;
}
.col-md-offset-5 {
margin-left: 41.667%;
}
.col-md-offset-6 {
margin-left: 50%;
}
.col-md-offset-7 {
margin-left: 58.333%;
}
.col-md-offset-8 {
margin-left: 66.667%;
}
.col-md-offset-9 {
margin-left: 75%;
}
.col-md-offset-10 {
margin-left: 83.333%;
}
.col-md-offset-11 {
margin-left: 91.667%;
}
.start-md {
-ms-flex-pack: start;
-webkit-box-pack: start;
......@@ -557,14 +783,193 @@
flex: 0 0 auto;
}
.col-lg-8 {
.col-lg {
-webkit-flex-grow: 1;
-ms-flex-positive: 1;
-webkit-box-flex: 1;
flex-grow: 1;
-ms-flex-preferred-size: 0;
flex-basis: 0;
max-width: 100%;
}
.col-lg-1 {
-ms-flex-preferred-size: 8.333%;
flex-basis: 8.333%;
max-width: 8.333%;
}
.col-lg-2 {
-ms-flex-preferred-size: 16.667%;
flex-basis: 16.667%;
max-width: 16.667%;
}
.col-lg-3 {
-ms-flex-preferred-size: 25%;
flex-basis: 25%;
max-width: 25%;
}
.col-lg-4 {
-ms-flex-preferred-size: 33.333%;
flex-basis: 33.333%;
max-width: 33.333%;
}
.col-lg-5 {
-ms-flex-preferred-size: 41.667%;
flex-basis: 41.667%;
max-width: 41.667%;
}
.col-lg-6 {
-ms-flex-preferred-size: 50%;
flex-basis: 50%;
max-width: 50%;
}
.col-lg-7 {
-ms-flex-preferred-size: 58.333%;
flex-basis: 58.333%;
max-width: 58.333%;
}
.col-lg-8 {
-ms-flex-preferred-size: 66.667%;
flex-basis: 66.667%;
max-width: 66.667%;
}
}
.col-lg-9 {
-ms-flex-preferred-size: 75%;
flex-basis: 75%;
max-width: 75%;
}
.col-lg-10 {
-ms-flex-preferred-size: 83.333%;
flex-basis: 83.333%;
max-width: 83.333%;
}
.col-lg-11 {
-ms-flex-preferred-size: 91.667%;
flex-basis: 91.667%;
max-width: 91.667%;
}
.col-lg-12 {
-ms-flex-preferred-size: 100%;
flex-basis: 100%;
max-width: 100%;
}
.col-lg-offset-1 {
margin-left: 8.333%;
}
.col-lg-offset-2 {
margin-left: 16.667%;
}
.col-lg-offset-3 {
margin-left: 25%;
}
.col-lg-offset-4 {
margin-left: 33.333%;
}
.col-lg-offset-5 {
margin-left: 41.667%;
}
.col-lg-offset-6 {
margin-left: 50%;
}
.col-lg-offset-7 {
margin-left: 58.333%;
}
.col-lg-offset-8 {
margin-left: 66.667%;
}
.col-lg-offset-9 {
margin-left: 75%;
}
.col-lg-offset-10 {
margin-left: 83.333%;
}
.col-lg-offset-11 {
margin-left: 91.667%;
}
.start-lg {
-ms-flex-pack: start;
-webkit-box-pack: start;
justify-content: flex-start;
text-align: start;
}
.center-lg {
-ms-flex-pack: center;
-webkit-box-pack: center;
justify-content: center;
text-align: center;
}
.end-lg {
-ms-flex-pack: end;
-webkit-box-pack: end;
justify-content: flex-end;
text-align: right;
}
.top-lg {
-ms-flex-align: start;
-webkit-box-align: start;
align-items: flex-start;
}
.middle-lg {
-ms-flex-align: center;
-webkit-box-align: center;
align-items: center;
}
.bottom-lg {
-ms-flex-align: end;
-webkit-box-align: end;
align-items: flex-end;
}
.around-lg {
-ms-flex-pack: distribute;
justify-content: space-around;
}
.between-lg {
-ms-flex-pack: justify;
-webkit-box-pack: justify;
justify-content: space-between;
}
.first-lg {
-ms-flex-order: -1;
-webkit-box-ordinal-group: 0;
order: -1;
}
.last-lg {
-ms-flex-order: 1;
-webkit-box-ordinal-group: 2;
order: 1;
}
}
/******************GENERAL**********************/
......@@ -578,9 +983,7 @@ body {
background-color: #edeef0;
}
body p,
body blockquote,
body ul {
body p, body blockquote, body ul {
line-height: 1.7;
font-size: 1rem;
}
......@@ -590,62 +993,36 @@ a {
text-decoration: none;
}
a:hover,
a:focus,
a:active {
a:hover, a:focus, a:active {
text-decoration: underline;
outline: 0;
}
textarea:focus,
input:focus {
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);
a, button, input, select, textarea, label, label:checked, label:focus {
-webkit-tap-highlight-color: rgba(0,0,0,0);
-webkit-tap-highlight-color: transparent;
}
h1,
h2,
h3,
h4,
h5,
h6,
p {
margin: 0;
padding: 0;
}
h1, h2, h3, h4, h5, h6, p {margin: 0; padding: 0;}
img,
video {
max-width: 100%;
}
img, video {max-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;
}
......@@ -655,13 +1032,11 @@ video {
padding-left: 0;
}