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

Merge pull request #3576 from cmgustavo/bug/camera-position 

Fix camera position
This commit is contained in:
Gustavo Maximiliano Cortez 2015-12-02 16:07:06 -03:00
parent 6d4dfca60d eec710d87b
commit 6f32927a72
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bower.json
View File

@ -9,15 +9,15 @@
"dependencies": { "dependencies": {
"angular": "1.4.6", "angular": "1.4.6",
"angular-bitcore-wallet-client": "1.1.7", "angular-bitcore-wallet-client": "1.1.7",
"angular-foundation": "0.7.0", "angular-foundation": "0.8.0",
"angular-gettext": "2.1.0", "angular-gettext": "2.1.2",
"angular-moment": "0.10.1", "angular-moment": "0.10.1",
"angular-qrcode": "monospaced/angular-qrcode#~6.0.3", "angular-qrcode": "monospaced/angular-qrcode#~6.0.3",
"angular-ui-router": "0.2.15", "angular-ui-router": "0.2.15",
"angular-ui-switch": "0.1.1", "angular-ui-switch": "0.1.1",
"animate.css": "3.4.0", "animate.css": "3.4.0",
"fastclick": "1.0.6", "fastclick": "1.0.6",
"foundation": "5.5.2", "foundation": "5.5.3",
"foundation-icon-fonts": "*", "foundation-icon-fonts": "*",
"moment": "2.10.3", "moment": "2.10.3",
"ng-lodash": "0.2.3", "ng-lodash": "0.2.3",

12
public/views/walletHome.html
View File

@ -72,7 +72,7 @@
--> -->
<div id="walletHome" class="walletHome tab-view tab-in"> <div id="walletHome" class="walletHome tab-view tab-in">
<div class="oh"> <div class="oh pr">
<div class="amount" ng-style="{'background-color':index.backgroundColor}"> <div class="amount" ng-style="{'background-color':index.backgroundColor}">
<div ng-if="!index.anyOnGoingProcess && !index.notAuthorized"> <div ng-if="!index.anyOnGoingProcess && !index.notAuthorized">
<div ng-show="index.updateError" ng-click='index.openWallet(); index.updateTxHistory()'> <div ng-show="index.updateError" ng-click='index.openWallet(); index.updateTxHistory()'>
@ -111,9 +111,6 @@
<div class="avatar-wallet left" <div class="avatar-wallet left"
ng-style="{'background-color':index.backgroundColor}">{{ (index.alias || index.walletName) | limitTo: 1}} ng-style="{'background-color':index.backgroundColor}">{{ (index.alias || index.walletName) | limitTo: 1}}
</div> </div>
<div class="camera-icon" ng-show="index.isComplete">
<qr-scanner on-scan="home.onQrCodeScanned(data)" before-scan="home.openSendScreen()"></qr-scanner>
</div>
<div class="wallet-info"> <div class="wallet-info">
<div ng-show="index.isShared"> <div ng-show="index.isShared">
<p class="m0"> <p class="m0">
@ -133,6 +130,9 @@
</div> </div>
</div> </div>
</div> </div>
<div class="camera-icon" ng-show="index.isComplete">
<qr-scanner on-scan="home.onQrCodeScanned(data)" before-scan="home.openSendScreen()"></qr-scanner>
</div>
</div> <!-- oh --> </div> <!-- oh -->
@ -265,10 +265,10 @@
--> -->
<div id="send" class="send tab-view"> <div id="send" class="send tab-view">
<div class="pr"> <div class="pr p20b">
<h4 class="title m0"> <h4 class="title m0">
<available-balance></available-balance> <available-balance></available-balance>
<a class="db" <a
ng-if="index.feeToSendMaxStr && index.availableBalanceSat > 0 && !home.blockUx && !home.lockAmount" ng-if="index.feeToSendMaxStr && index.availableBalanceSat > 0 && !home.blockUx && !home.lockAmount"
ng-click="home.sendAll(index.availableMaxBalance, index.feeToSendMaxStr)" ng-click="home.sendAll(index.availableMaxBalance, index.feeToSendMaxStr)"
translate> Send All translate> Send All

2
src/css/main.css
View File

@ -54,7 +54,6 @@ h4 {
font-size: 0.75rem; font-size: 0.75rem;
text-align: center; text-align: center;
line-height: 1.5; line-height: 1.5;
min-height: 62px;
} }
h4.title a { h4.title a {
@ -525,6 +524,7 @@ ul.manage li {
.p5h {padding: 0 5px;} .p5h {padding: 0 5px;}
.p20h {padding: 0 20px;} .p20h {padding: 0 20px;}
.p20v {padding: 20px 0;} .p20v {padding: 20px 0;}
.p20b {padding-bottom: 20px;}
.p25l {padding-left: 25px;} .p25l {padding-left: 25px;}
.p15 {padding:15px;} .p15 {padding:15px;}
.p20 {padding:20px;} .p20 {padding:20px;}

8
src/css/mobile.css
View File

@ -171,7 +171,7 @@ _:-ms-fullscreen, :root .main {
.amount { .amount {
width: 100%; width: 100%;
text-align: center; text-align: center;
padding: 2.5rem 1rem 1.5rem 1rem; padding: 1.5rem 1rem 1.5rem 1rem;
margin-bottom: 11px; margin-bottom: 11px;
color: #fff; color: #fff;
height: 175px; height: 175px;
@ -227,12 +227,14 @@ _:-ms-fullscreen, :root .main {
position: absolute; position: absolute;
padding: 15px 17px; padding: 15px 17px;
border-radius: 100%; border-radius: 100%;
top: -40px; top: inherit;
right: 15px; right: 15px;
bottom: 45px;
} }
.send .camera-icon a { .send .camera-icon a {
top: 32px; top: inherit;
bottom: 0;
} }
.copayers { .copayers {