BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2623 from bechi/layout-details-11 

Layout details 11
This commit is contained in:
Gustavo Maximiliano Cortez 2015-04-24 16:24:18 -03:00
parent d2117bff01 b009be8457
commit 3f605b37dd
6 changed files with 66 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
public/views/includes/menu.html
View File

@ -1,17 +1,15 @@
<div <div
class="bottom-bar row collapse"> class="bottom-bar row collapse">
<div class="medium-3 small-3 columns text-center bottombar-item" ng-repeat="item in index.menu"> <div class="medium-3 small-3 columns text-center bottombar-item" ng-repeat="item in index.menu">
<a ng-click="index.setTab(item.link)" ng-class="{'active': index.tab == item.link}" <a ng-click="index.setTab(item.link)" ng-class="{'active': index.tab == item.link}">
ng-style="{'border-top-color':index.tab==item.link ? index.backgroundColor : ''}"> <i class="size-36 {{item.icon}} db"></i>
<i class="size-36 {{item.icon}} db"></i>
<div class="size-10 tu"> <div class="size-10 tu">
{{item.title|translate}} {{item.title|translate}}
<span <span
class="label alert round" class="label alert round"
ng-if="item.link=='walletHome' && index.pendingTxProposalsCountForUs > 0">{{index.pendingTxProposalsCountForUs}}</span> ng-if="item.link=='walletHome' && index.pendingTxProposalsCountForUs > 0">{{index.pendingTxProposalsCountForUs}}</span>
</div> </div>
</a> </a>
</div> </div>
</div> </div>

28
public/views/modals/txp-details.html
View File

@ -13,13 +13,13 @@
<div class="p45t" ng-init="updateCopayerList()"> <div class="p45t" ng-init="updateCopayerList()">
<h4 class="title m0" translate>Information</h4> <h4 class="title m0" translate>Information</h4>
<ul class="no-bullet size-14 m0"> <ul class="no-bullet size-14 m0">
<li class="line-b p10"> <li class="line-b p10 oh">
<span class="text-gray" translate>To</span>: <span class="text-gray" translate>To</span>:
<span class="right">{{tx.toAddress}}</span> <span class="right">{{tx.toAddress}}</span>
</li> </li>
<li class="line-b p10"> <li class="line-b p10">
<span class="text-gray" translate>Amount</span>: <span class="text-gray" translate>Amount</span>:
<span class="right">{{amountStr}} <span class="right">{{amountStr}}
<span class="label gray radius">{{alternativeAmountStr}}</span> <span class="label gray radius">{{alternativeAmountStr}}</span>
</span> </span>
</li> </li>
@ -44,7 +44,7 @@
<li class="line-b p10"> <li class="line-b p10">
<span class="text-gray" translate>To</span>: <span class="text-gray" translate>To</span>:
<span class="right"> <span class="right">
<span> <span>
<span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.paypro.domain}}</span> <span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.paypro.domain}}</span>
<span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock"></i> {{tx.paypro.domain}}</span> <span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock"></i> {{tx.paypro.domain}}</span>
</span> </span>
@ -87,32 +87,32 @@
<div class="row column m20t text-center text-warning" ng-if="tx.removed" translate> <div class="row column m20t text-center text-warning" ng-if="tx.removed" translate>
The transaction was removed by creator The transaction was removed by creator
</div> </div>
<div class="row m20t" ng-if="tx.pendingForUs"> <div class="row m20t" ng-if="tx.pendingForUs">
<div class="large-5 medium-5 small-6 columns"> <div class="large-5 medium-5 small-6 columns">
<button class="button outline dark-gray m0 expand" ng-click="reject(tx);" <button class="button outline dark-gray m0 expand" ng-click="reject(tx);"
ng-disabled="loading"> ng-disabled="loading">
<i class="fi-x"></i> <i class="fi-x"></i>
<span translate>Reject</span> <span translate>Reject</span>
</button> </button>
</div> </div>
<div class="large-5 medium-5 small-6 columns text-right"> <div class="large-5 medium-5 small-6 columns text-right">
<button class="button primary m0 expand" ng-click="sign(tx)" <button class="button primary m0 expand" ng-click="sign(tx)"
ng-style="{'background-color':color}" ng-style="{'background-color':color}"
ng-disabled="loading"> ng-disabled="loading">
<i class="fi-check"></i> <i class="fi-check"></i>
<span translate>Sign</span> <span translate>Sign</span>
</button> </button>
</div> </div>
</div> </div>
<div class="text-center text-gray" ng-show="tx.status != 'pending'"> <div class="text-center text-gray" ng-show="tx.status != 'pending'">
<div class="m10t" <div class="m10t"
ng-show="tx.status=='accepted'" translate> ng-show="tx.status=='accepted'" translate>
Transaction accepted... Transaction accepted...
</div> </div>
<div class="m10t" <div class="m10t"
ng-show="!loading && tx.status!='broadcasted' && tx.status=='accepted' && tx.status!='rejected'"> ng-show="!loading && tx.status!='broadcasted' && tx.status=='accepted' && tx.status!='rejected'">
<div translate>But not broadcasted. Try to send manually</div> <div translate>But not broadcasted. Try to send manually</div>
<button class="primary" <button class="primary"
@ -121,7 +121,7 @@
<span translate>Broadcast Transaction</span> <span translate>Broadcast Transaction</span>
</button> </button>
</div> </div>
<div class="text-success m10t" <div class="text-success m10t"
ng-show="tx.status=='broadcasted'" translate> ng-show="tx.status=='broadcasted'" translate>
Transaction sent! Transaction sent!
</div> </div>
@ -132,9 +132,9 @@
</div> </div>
<div class="row column m20t" ng-if="tx.couldRemove"> <div class="row column m20t" ng-if="tx.couldRemove">
<button class="tiny expand outline dark-gray" ng-click="remove(tx)" <button class="tiny expand outline dark-gray" ng-click="remove(tx)"
ng-disabled="loading" ng-show="tx.couldRemove"> ng-disabled="loading" ng-show="tx.couldRemove">
<i class="fi-x icon-sign x"></i> <i class="fi-trash size-14 m5r"></i>
<span translate>Remove transaction</span> <span translate>Remove transaction</span>
</button> </button>
<div class="text-gray size-12 text-center" show="tx.couldRemove" translate> <div class="text-gray size-12 text-center" show="tx.couldRemove" translate>

6
public/views/preferencesBwsUrl.html
View File

@ -1,8 +1,8 @@
<div class="content preferences p20v columns" ng-controller="preferencesBwsUrlController as prefBwsUrl"> <div class="content preferences p20v" ng-controller="preferencesBwsUrlController as prefBwsUrl">
<form name="settingsBwsUrlForm" ng-submit="prefBwsUrl.save()" class="m20t"> <form name="settingsBwsUrlForm" ng-submit="prefBwsUrl.save()" class="columns">
<label>Bitcore Wallet Service URL</label> <label>Bitcore Wallet Service URL</label>
<input type="text" id="bwsurl" type="text" name="bwsurl" ng-model="prefBwsUrl.bwsurl"> <input type="text" id="bwsurl" type="text" name="bwsurl" ng-model="prefBwsUrl.bwsurl">
<input type="submit" class="button expand black radius" value="{{'Save'|translate}}" <input type="submit" class="button expand black radius" value="{{'Save'|translate}}"
ng-style="{'background-color':index.backgroundColor}"> ng-style="{'background-color':index.backgroundColor}">
</form> </form>
</div> </div>

25
public/views/walletHome.html
View File

@ -407,19 +407,18 @@ history
{{btx.message || btx.addressTo}} {{btx.message || btx.addressTo}}
</div> </div>
</div> </div>
<div class="m20t row"> <div class="m20t columns text-center" ng-show="index.txHistoryPaging || index.updatingTxHistory">
<div class="columns"> <button class="outline light-gray small expand"
ng-click="index.updateTxHistory(index.skipHistory)"
<button class="outline light-gray small expand" ng-if="!index.updatingTxHistory">
ng-disabled="index.updatingTxHistory" <span translate>More</span> <i class="icon-arrow-down4 ng-scope"></i>
ng-click="index.updateTxHistory(index.skipHistory)" </button>
ng-show="index.txHistoryPaging || index.updatingTxHistory" <div class="spinner" ng-if="index.updatingTxHistory">
> <div class="rect1"></div>
<span ng-show="!index.updatingTxHistory"> <div class="rect2"></div>
<span translate>More</span> <i class="icon-arrow-down4 ng-scope"></i> <div class="rect3"></div>
</span> <div class="rect4"></div>
<span translate ng-show="index.updatingTxHistory">Loading...</span> <div class="rect5"></div>
</button>
</div> </div>
</div> </div>
</div> </div>

8
src/css/main.css
View File

@ -26,7 +26,6 @@ h2 {
font-size: 20px; font-size: 20px;
font-weight: 100; font-weight: 100;
} }
h3 { h3 {
font-weight: 300; font-weight: 300;
font-size: 16px; font-size: 16px;
@ -147,7 +146,7 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
.content { .content {
width:100%; width:100%;
position: absolute; position: absolute;
top: 46px; top: 46px;
bottom: 0; bottom: 0;
overflow: auto; overflow: auto;
@ -1152,6 +1151,10 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
vertical-align: middle; vertical-align: middle;
} }
#history .spinner > div {
background-color: #7A8C9E;
}
.spinner > div { .spinner > div {
background-color: #fff; background-color: #fff;
height: 100%; height: 100%;
@ -1196,4 +1199,3 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
-webkit-transform: scaleY(1.0); -webkit-transform: scaleY(1.0);
} }
} }

53
src/css/mobile.css
View File

@ -39,14 +39,14 @@ body, div, .row {
/* END disabling text selection */ /* END disabling text selection */
.inner-wrap { .inner-wrap {
-webkit-transition-duration: 250ms; -webkit-transition-duration: 250ms;
transition-duration: 250ms; transition-duration: 250ms;
} }
body { body {
overflow: hidden; overflow: hidden;
-ms-content-zooming: none; -ms-content-zooming: none;
} }
/* Fix IE 10 */ /* Fix IE 10 */
.extra-margin-bottom { .extra-margin-bottom {
@ -121,7 +121,7 @@ _:-ms-fullscreen, :root .main {
left: -5px; left: -5px;
height: 45px; height: 45px;
top: 0px; top: 0px;
} }
.tab-bar .text-back { .tab-bar .text-back {
margin-left: 26px; margin-left: 26px;
@ -169,7 +169,7 @@ _:-ms-fullscreen, :root .main {
} }
.off-canvas-wrap,.inner-wrap{ .off-canvas-wrap,.inner-wrap{
height:100%; height:100%;
} }
.walletHome { .walletHome {
@ -212,15 +212,15 @@ ul.copayer-list img {
} }
.bottombar-item a { .bottombar-item a {
color: #7A8C9E; color: #9EA9B3;
padding: 0.5rem 0; padding: 0.5rem 0;
display: block; display: block;
border-top: 3px solid #213140; border-top: 3px solid #122232;
} }
.bottombar-item a.active { .bottombar-item a.active {
color: #E4E8EC; color: #E4E8EC;
background-color: #213140; background-color: #122232;
} }
.box-founds { .box-founds {
@ -261,7 +261,7 @@ a.missing-copayers {
.footer-setup { .footer-setup {
margin-bottom: 50px; margin-bottom: 50px;
} }
.label { .label {
font-size: 70%; font-size: 70%;
@ -282,7 +282,7 @@ a.missing-copayers {
.sidebar li.nav-item.selected { .sidebar li.nav-item.selected {
background-color: #f1f3f5; background-color: #f1f3f5;
box-shadow: inset -1px 0px 1px 0px rgba(0,0,0,0.20); box-shadow: inset -1px 0px 1px 0px rgba(0,0,0,0.20);
} }
.sidebar .avatar-wallet, .payment-uri .avatar-wallet { .sidebar .avatar-wallet, .payment-uri .avatar-wallet {
background-color: #2C3E50; background-color: #2C3E50;
@ -344,8 +344,8 @@ a.missing-copayers {
line-height: 24px; line-height: 24px;
} }
/* /*
* Remove all vendors hover / shadow / fade * Remove all vendors hover / shadow / fade
*/ */
.tooltip { .tooltip {
@ -432,7 +432,7 @@ a.pin-button:active {
} }
.tx-comment { .tx-comment {
border-top: 1px solid #eee; border-top: 1px solid #eee;
padding-top: 10px; padding-top: 10px;
margin-top: 10px; margin-top: 10px;
} }
@ -563,17 +563,17 @@ a.pin-button:active {
padding-bottom: 20px; padding-bottom: 20px;
} }
.modal.fade, .modal.fade,
.reveal-modal.fade { .reveal-modal.fade {
opacity: 1; opacity: 1;
} }
.modal.fade .modal-dialog, .modal.fade .modal-dialog,
.modal.in .modal-dialog, .modal.in .modal-dialog,
.reveal-modal-bg, .reveal-modal-bg,
.reveal-modal-bg .fade .in, .reveal-modal-bg .fade .in,
.reveal-modal, .reveal-modal,
.reveal-modal .fade, .reveal-modal .fade,
.reveal-modal .fade .out, .reveal-modal .fade .out,
.reveal-modal .fade .in { .reveal-modal .fade .in {
-webkit-transition: none !important; -webkit-transition: none !important;
@ -641,12 +641,12 @@ a.pin-button:active {
color: #B7C2CD; color: #B7C2CD;
} }
:-ms-input-placeholder { :-ms-input-placeholder {
color: #B7C2CD; color: #B7C2CD;
} }
.animation-left.ng-enter, .animation-left.ng-leave, .animation-left.ng-enter, .animation-left.ng-leave,
.animation-right.ng-enter, .animation-right.ng-leave { .animation-right.ng-enter, .animation-right.ng-leave {
-webkit-transition: all ease-in-out 250ms; -webkit-transition: all ease-in-out 250ms;
transition: all ease-in-out 250ms; transition: all ease-in-out 250ms;
} }
@ -668,7 +668,7 @@ a.pin-button:active {
-webkit-transform: translate3d(0, 0, 0); -webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0);
} }
.animation-left.ng-leave, .animation-left.ng-leave,
.animation-right.ng-leave { .animation-right.ng-leave {
-webkit-transform: translate3d(0, 0, 0); -webkit-transform: translate3d(0, 0, 0);
@ -691,7 +691,7 @@ a.pin-button:active {
-webkit-transform: translate3d(-100%, 0, 0); -webkit-transform: translate3d(-100%, 0, 0);
transform: translate3d(-100%, 0, 0); transform: translate3d(-100%, 0, 0);
width:100%; width:100%;
position: absolute; position: absolute;
top: 46px; top: 46px;
bottom: 70px; bottom: 70px;
overflow: auto; overflow: auto;
@ -707,6 +707,3 @@ a.pin-button:active {
-webkit-transform: translate3d(-100%, 0, 0) !important; -webkit-transform: translate3d(-100%, 0, 0) !important;
transform: translate3d(-100%, 0, 0) !important; transform: translate3d(-100%, 0, 0) !important;
} }