Skip to content
This repository has been archived by the owner on Nov 21, 2019. It is now read-only.

Commit

Permalink
recompile
Browse files Browse the repository at this point in the history
  • Loading branch information
@tayvano
tayvano committed May 31, 2016
1 parent a4c2071 commit 84aa88a
Show file tree
Hide file tree
Showing 14 changed files with 19,782 additions and 19,678 deletions.
18 changes: 18 additions & 0 deletions chrome-extension/css/etherwallet-master.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4319,6 +4319,24 @@ input[type="password"] + .eye:before {
.input-group-addon {
cursor: pointer;
}
article + .no-items {
display: none;
}
.no-items {
margin-top: 2em;
animation: fadein 1.5s;
}
@keyframes fadein {
0% {
opacity: 0;
}
70% {
opacity: 0;
}
100% {
opacity: 1;
}
}
#etherWalletPopUp {
padding: 25px 8px 10px;
width: 355px;
Expand Down
2 changes: 1 addition & 1 deletion chrome-extension/css/etherwallet-master.min.css
View file

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions chrome-extension/cx-wallet.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1075,7 +1075,8 @@ <h4 class="col-xs-12"> Show.... </h4>
</section>
<!-- / DAO Filters -->

<article class="proposal-item col-xs-12" ng-show="objProposal.show" ng-repeat="objProposal in AllProposals | filter:filters:comparator " >
<article class="proposal-item col-xs-12" ng-show="objProposal.show" ng-repeat="objProposal in AllProposals | filter:filters:comparator | orderBy : '-id' " >

<section class="proposal-top clearfix" ng-click="showProposal(objProposal.id)">
<div class="graph-container">
<div class="graph-unfilled" style="width:100%"></div>
Expand Down Expand Up @@ -1126,7 +1127,7 @@ <h4> Split </h4>
<em>({{ (objProposal.nay * 100) | number:2 }} DAO) </em></td>
</tr>
<tr ng-show="objProposal.split==false">
<td class="label">Quroum:</td>
<td class="label">Quorum:</td>
<td class="output">
<div class="votes-needed">{{ objProposal.quorumCurrent | number:2 }}% of {{ objProposal.quorumPer | number:2}}%</div>
</td>
Expand Down Expand Up @@ -1166,7 +1167,12 @@ <h4> Split </h4>
<a class="btn btn-primary" ng-click="openVote(objProposal.id)">VOTE ON THIS PROPOSAL</a>
</div>
</section>

</article>
<section class="no-items text-center">
<h4> Sorry...there are results with these filters. </h4>
<a class="btn btn-info" ng-class="filters=={} ? 'active' : ''" ng-click="filters={};">Show All Proposals</a>
</section>

<!-- Vote Modal -->
<div class="modal fade" tabindex="-1" role="dialog" aria-labelledby="sendTransactionLabel" id="voteProposal">
Expand Down
4 changes: 2 additions & 2 deletions chrome-extension/embedded-daoproposals.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<br/><br/>
<section class="proposal-container" ng-controller='theDaoProposalCtrl'>
<!-- DAO Filters -->
<article class="proposal-item col-xs-12" ng-show="objProposal.show" ng-repeat="objProposal in AllProposals | filter:filters:comparator " >
<article class="proposal-item col-xs-12" ng-show="objProposal.show" ng-repeat="objProposal in AllProposals | filter:filters:comparator | orderBy : '-id' " >
<section class="proposal-top clearfix" ng-click="showProposal(objProposal.id)">
<div class="graph-container">
<div class="graph-unfilled" style="width:100%"></div>
Expand Down Expand Up @@ -97,7 +97,7 @@ <h4> Split </h4>
<em>({{ (objProposal.nay * 100) | number:2 }} DAO) </em></td>
</tr>
<tr ng-show="objProposal.split==false">
<td class="label">Quroum:</td>
<td class="label">Quorum:</td>
<td class="output">
<div class="votes-needed">{{ objProposal.quorumCurrent | number:2 }}% of {{ objProposal.quorumPer | number:2}}%</div>
</td>
Expand Down
10 changes: 8 additions & 2 deletions chrome-extension/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,8 @@ <h4 class="col-xs-12"> Show.... </h4>
</section>
<!-- / DAO Filters -->

<article class="proposal-item col-xs-12" ng-show="objProposal.show" ng-repeat="objProposal in AllProposals | filter:filters:comparator " >
<article class="proposal-item col-xs-12" ng-show="objProposal.show" ng-repeat="objProposal in AllProposals | filter:filters:comparator | orderBy : '-id' " >

<section class="proposal-top clearfix" ng-click="showProposal(objProposal.id)">
<div class="graph-container">
<div class="graph-unfilled" style="width:100%"></div>
Expand Down Expand Up @@ -975,7 +976,7 @@ <h4> Split </h4>
<em>({{ (objProposal.nay * 100) | number:2 }} DAO) </em></td>
</tr>
<tr ng-show="objProposal.split==false">
<td class="label">Quroum:</td>
<td class="label">Quorum:</td>
<td class="output">
<div class="votes-needed">{{ objProposal.quorumCurrent | number:2 }}% of {{ objProposal.quorumPer | number:2}}%</div>
</td>
Expand Down Expand Up @@ -1015,7 +1016,12 @@ <h4> Split </h4>
<a class="btn btn-primary" ng-click="openVote(objProposal.id)">VOTE ON THIS PROPOSAL</a>
</div>
</section>

</article>
<section class="no-items text-center">
<h4> Sorry...there are results with these filters. </h4>
<a class="btn btn-info" ng-class="filters=={} ? 'active' : ''" ng-click="filters={};">Show All Proposals</a>
</section>

<!-- Vote Modal -->
<div class="modal fade" tabindex="-1" role="dialog" aria-labelledby="sendTransactionLabel" id="voteProposal">
Expand Down
Loading

0 comments on commit 84aa88a

Please sign in to comment.