anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

add style on tx 01

Browse source
This commit is contained in:
bechi 2014-12-02 21:51:45 -03:00
commit dbb3db0fff
3 changed files with 43 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

36
css/src/main.css
View file

@ -407,6 +407,7 @@ a:hover {
.panel.last-transactions {
padding: 0;
margin-bottom: 2.25rem;
border-radius: 3px 3px 0 3px;
}
a.missing-copayers {
@ -414,7 +415,7 @@ a.missing-copayers {
position: absolute;
display: block;
right: -1px;
bottom: -23px;
bottom: -18px;
padding: 0.2rem 0.5rem;
font-size: 10px;
border-radius: 0 0 3px 3px;
@ -427,6 +428,8 @@ ul.tx-copayers {
background: #E4E8EC;
padding: 0.8rem;
margin-left: 0;
box-shadow: inset 0 1px 1px 0 rgba(10,19,28,.12);
border-radius: 0 0 3px 3px;
}
.tx-copayers li {
@ -441,6 +444,9 @@ ul.tx-copayers {
background: #2C3E50;
padding: 0.6rem;
color: #fff;
box-shadow: 1.5px 0px 0 0 rgba(32,48,64,1);
-moz-box-shadow: 1.5px 0px 0 0 rgba(32,48,64,1);
-o-box-shadow: 1.5px 0px 0 0 rgba(32,48,64,1);
}
.last-transactions-content {
@ -449,7 +455,7 @@ ul.tx-copayers {
}
.last-transactions-footer {
padding: 0.5rem;
padding: 0.8rem;
overflow: hidden;
}
@ -475,14 +481,19 @@ ul.tx-copayers {
color: #fff;
}
.tx-copayers .icon-active-check {
background-color: #3FBC9C;
.icon-sign {
padding: 0.2rem 0.3rem;
border-radius: 100%;
color: #fff;
margin-right: 7px;
}
.last-transactions-content .icon-active-x {
.icon-sign.check {
background-color: #3FBC9C;
}
.icon-sign.x {
background-color: #C0392B;
color: #fff;
}
.date-message {
@ -1009,8 +1020,8 @@ button[disabled].secondary:focus,
.button.disabled.secondary:focus,
.button[disabled].secondary:hover,
.button[disabled].secondary:focus {
background-color: #95a5a6;
color: #E6E6E6;
background-color: #E4E8EC;
color: #A5B2BF;
}
/* PRIMARY */
@ -1385,15 +1396,6 @@ a:hover .photo-container {
float: right;
}
.icon-status {
background-color: #34495E;
color: #7A8C9E;
border-radius: 100%;
padding: 0.17rem 0.3rem;
float: left;
margin-bottom: 0.2rem;
}
.has-error {
color: #C0392A;
}

15
css/src/mobile.css
View file

@ -173,6 +173,10 @@
padding: 0.5rem;
}
.panel.last-transactions {
margin-bottom: 3.25rem;
}
.addresses .list-addr contact {
margin-left: 0;
font-size: 14px;
@ -182,11 +186,12 @@
width: auto;
padding: 0 5px;
}
table.last-transactions-content .icon-status {
border-radius: 0;
padding: 0.1rem 0.3rem;
margin-bottom: 0;
a.missing-copayers {
bottom: -34px;
text-align: center;
padding: .7rem;
width: 100%;
}
.button, button {

25
views/includes/transaction.html
View file

@ -38,32 +38,32 @@
<div class="last-transactions-footer">
<div class="row collapse">
<div class="large-5 medium-12 small-12 columns" ng-show="!tx.sentTs">
<div class="large-6 medium-12 small-12 columns" ng-show="!tx.sentTs">
<div ng-show="tx.signedBy[myId]">
<button class="secondary tiny m0" ng-disabled="true"> <i class="fi-check"></i>
<button class="secondary left m10r tiny m0 radius" ng-disabled="true"> <i class="fi-check icon-sign check"></i>
<span translate>I signed</span>
</button>
</div>
<div ng-show="tx.rejectedBy[myId]">
<button class="warning tiny m0" ng-disabled="true"> <i class="fi-x"></i>
<button class="warning left m10r tiny m0 radius" ng-disabled="true"> <i class="fi-x icon-sign x"></i>
<span translate>I rejected</span>
</button>
</div>
<div ng-show="!tx.signedBy[myId] && !tx.rejectedBy[myId]">
<div class="hide-for-small-only">
<button class="primary tiny m0 m15r" ng-click="sign(tx.ntxid)" ng-disabled="loading">
<i class="fi-check"></i> <span translate>Sign</span>
<i class="fi-check icon-sign check"></i> <span translate>Sign</span>
</button>
<button class="warning tiny m0" ng-click="reject(tx.ntxid)" ng-disabled="loading">
<i class="fi-x" ></i> <span translate>Reject</span>
<i class="fi-x icon-sign x" ></i> <span translate>Reject</span>
</button>
</div>
<div class="show-for-small-only row">
<button class="primary tiny small-5 columns m10b" ng-click="sign(tx.ntxid)" ng-disabled="loading">
<i class="fi-check"></i> <span translate>Sign</span>
<i class="fi-check icon-sign check"></i> <span translate>Sign</span>
</button>
<button class="warning tiny small-5 columns m10b" ng-click="reject(tx.ntxid)" ng-disabled="loading">
<i class="fi-x" ></i> <span translate>Reject</span>
<i class="fi-x icon-sign x" ></i> <span translate>Reject</span>
</button>
</div>
</div>
@ -74,7 +74,7 @@
</div>
</div>
<div class="large-7 columns small text-gray show-for-large-up text-right">
<div class="large-6 columns small text-gray show-for-large-up text-right">
<div>
<strong translate>Fee</strong>: {{tx.fee}} {{$root.wallet.settings.unitName}}
</div>
@ -94,14 +94,17 @@
<i class="icon-people"></i>
{{tx.missingSignatures}} signatures missing
</span>
<i ng-class="{'icon-arrow-up':tx.showDetails, 'icon-arrow-down':!tx.showDetails}"></i>
<span ng-show="!tx.finallyRejected && tx.missingSignatures==0">
Copayers
</span>
<i ng-class="{'icon-arrow-up2':tx.showDetails, 'icon-arrow-down2':!tx.showDetails}"></i>
</a>
<ul class="tx-copayers" ng-show="tx.showDetails">
<li ng-repeat="c in tx.actionList">
<span>
<i ng-if="c.actions.rejected" class="fi-x icon-status icon-active-x m10r"></i>
<i ng-if="c.actions.sign" class="fi-check icon-status icon-active-check m10r"></i>
<i ng-if="c.actions.rejected" class="fi-x icon-sign x"></i>
<i ng-if="c.actions.sign" class="fi-check icon-sign check"></i>
<i ng-if="!c.actions.sign && !c.actions.rejected && tx.missingSignatures" class="m10r fi-loop icon-rotate"></i>
</span>
<span>