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

Merge pull request #2512 from cmgustavo/bug/wp8-12 

Bug/wp8 12
This commit is contained in:
Matias Alejo Garcia 2015-04-14 09:42:40 -03:00
parent da3fda878d 959cd57fe1
commit 461b73f63e
6 changed files with 42 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/index.html
View File

@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
<meta name="msapplication-tap-highlight" content="no">
<link rel="stylesheet" type="text/css" href="css/foundation.css">
<link rel="stylesheet" type="text/css" href="icons/foundation-icons.css">
@ -37,8 +37,7 @@
<section
class="main-dark"
ng-class="{'main animation': index.hasProfile, 'animation-left': index.swipeLeft,
ng-class="{'main': index.hasProfile, 'main-dark': !index.hasProfile, 'animation-left': index.swipeLeft,
'animation-right': index.swipeRight}"
ui-view="main"></section>
<div ui-view="menu"></div>

2
public/views/receive.html
View File

@ -26,7 +26,7 @@
</div>
<div ng-show="!index.needsBackup || receive.skipBackup">
<div class="row" ng-show="receive.generatingAddress">
<div class="row m20t" ng-show="receive.generatingAddress">
<div class="large-12 columns">
<div class="oh text-center">
<span class="text-gray" translate>Generating a new address...</span>

27
public/views/send.html
View File

@ -27,7 +27,7 @@
</span>
</div>
<form ng-show="!send.fetchingURL" name="sendForm" ng-submit="send.submitForm(sendForm)" ng-disabled="send.blockUx" novalidate>
<div class="box-notification" ng-show="send.error && !send.hideForWP ">
<div class="box-notification" ng-show="send.error">
<div class="box-icon error">
<i class="fi-x size-24"></i>
</div>
@ -67,10 +67,7 @@
</div>
<div class="input">
<input type="text" id="address" name="address" ng-disabled="send.blockUx || send.lockAddress" placeholder="{{'Bitcoin address'|translate}}" ng-model="_address" valid-address required ng-focus="send.formFocus('address')" ng-blur="send.formFocus(false)">
<!--
<a class="postfix" ng-click="openAddressBook()"><i class="fi-address-book size-24"></i></a>
-->
<input type="text" id="address" name="address" ng-disabled="send.blockUx || send.lockAddress" ng-attr-placeholder="{{'Bitcoin address'|translate}}" ng-model="_address" valid-address required ng-blur="send.formFocus(false)">
</div>
</div>
<div ng-show="send._paypro && !send.hideAddress">
@ -105,7 +102,7 @@
</label>
<div class="input">
<input type="number" id="amount" ng-disabled="send.blockUx || send.lockAmount" name="amount" placeholder="{{'Amount'|translate}}" ng-minlength="0.00000001" ng-maxlength="10000000000" ng-model="_amount" valid-amount required autocomplete="off" ng-focus="send.formFocus('amount')" ng-blur="send.formFocus(false)">
<input type="number" id="amount" ng-disabled="send.blockUx || send.lockAmount" name="amount" ng-attr-placeholder="{{'Amount'|translate}}" ng-minlength="0.00000001" ng-maxlength="10000000000" ng-model="_amount" valid-amount required autocomplete="off" ng-blur="send.formFocus(false)">
<a class="postfix" ng-click="showAlternative = true">{{send.unitName}}</a>
</div>
</div>
@ -113,7 +110,7 @@
<label for="alternative"><span translate>Amount in</span> {{ send.alternativeName }}
</label>
<div class="input">
<input type="number" id="alternative" ng-disabled="send.blockUx || !send.isRateAvailable || send.lockAmount" name="alternative" placeholder="{{'Amount'|translate}}" ng-model="_alternative" requiredautocomplete="off" ng-focus="send.formFocus('amount')" ng-blur="send.formFocus(false)">
<input type="number" id="alternative" ng-disabled="send.blockUx || !send.isRateAvailable || send.lockAmount" name="alternative" ng-attr-placeholder="{{'Amount'|translate}}" ng-model="_alternative" requiredautocomplete="off" ng-blur="send.formFocus(false)">
<a class="postfix" ng-click="showAlternative = false"> {{ send.alternativeIsoCode }}</a>
</div>
</div>
@ -126,13 +123,8 @@
<small translate class="has-error" ng-show="sendForm.comment.$invalid && !sendForm.comment.$pristine">too long!</small>
</label>
<div class="input">
<textarea id="comment" ng-disabled="send.blockUx" name="comment" ng-if="index.n > 1"
placeholder="{{'Leave a private message to your copayers'|translate}}"
ng-maxlength="100" ng-model="_comment" ng-focus="send.formFocus('msg')"
ng-blur="send.formFocus(false)"></textarea>
<textarea id="comment" ng-disabled="send.blockUx" name="comment" ng-if="index.n == 1"
placeholder="{{'Add a private comment to identify the transaction'|translate}}"
ng-maxlength="100" ng-model="_comment" ng-focus="send.formFocus('msg')"
<textarea id="comment" ng-disabled="send.blockUx" name="comment"
ng-maxlength="100" ng-model="_comment"
ng-blur="send.formFocus(false)"></textarea>
</div>
</div>
@ -145,15 +137,14 @@
<div class="row" ng-show="!send.onGoingProcess">
<div class="large-6 medium-6 small-12 columns">
<div class="columns" ng-class="{'small-6 medium-6 large-6':(send._paypro || send.lockAddress)}">
<button type="submit" class="button black radius expand" ng-disabled="sendForm.$invalid || send.blockUx"
ng-style="{'background-color':index.backgroundColor}" translate>
Send
</button>
</div>
<div class="large-4 medium-4 small-12 columns text-right">
<a ng-click="send.resetForm(sendForm)" class="button expand warning"
ng-show="(send._paypro || send.lockAddress) && !send.blockUx" translate>Cancel</a>
<div class="large-6 medium-6 small-6 columns" ng-show="!send.blockUx && (send._paypro || send.lockAddress)">
<a ng-click="send.resetForm(sendForm)" class="button expand warning" translate>Cancel</a>
</div>
</div>
</form>

23
src/css/main.css
View File

@ -7,27 +7,6 @@
color: #2C3E50;
}
body, div, .row {
-webkit-overflow-scrolling: touch;
};
::-webkit-input-placeholder {
color: #B7C2CD;
}
:-moz-placeholder { /* Firefox 18- */
color: #B7C2CD;
}
::-moz-placeholder { /* Firefox 19+ */
color: #B7C2CD;
}
:-ms-input-placeholder {
color: #B7C2CD;
}
#qr-canvas { display: none; }
#qrcode-scanner-video {
display: block;
@ -526,7 +505,7 @@ input {
}
input[type=date], input[type=datetime-local], input[type=datetime], input[type=email], input[type=month], input[type=number], input[type=password], input[type=search], input[type=tel], input[type=text], input[type=time], input[type=url], input[type=week], textarea {
color: #2C3E50;
color: #B7C2CD;
margin-bottom: 1.5rem;
height: 35px;
background: transparent;

36
src/css/mobile.css
View File

@ -28,6 +28,10 @@ input {
user-drag: none;
}
body, div, .row {
-webkit-overflow-scrolling: touch;
}
.enable_text_select {
-webkit-user-select: text;
-khtml-user-select: text;
@ -44,7 +48,7 @@ input {
body {
overflow: hidden;
-ms-content-zooming: none;
-ms-content-zooming: none;
}
/* Fix IE 10 */
@ -171,6 +175,11 @@ _:-ms-fullscreen, :root .main {
height:100%;
}
.home-wallet {
height: 100%;
background-color: #fff;
}
.home-wallet .avatar-wallet {
padding: 1.7rem 1rem;
width: 75px;
@ -615,17 +624,20 @@ a.pin-button:active {
padding-top: 1rem;
}
.animation {
position: absolute;
background: #fff;
display: block;
width: 100%;
height: 100%;
top: 0;
left: 0;
-webkit-backface-visibility: hidden;
-webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
::-webkit-input-placeholder {
color: #B7C2CD;
}
:-moz-placeholder { /* Firefox 18- */
color: #B7C2CD;
}
::-moz-placeholder { /* Firefox 19+ */
color: #B7C2CD;
}
:-ms-input-placeholder {
color: #B7C2CD;
}
.animation-left.ng-enter, .animation-left.ng-leave,

10
src/js/routes.js
View File

@ -466,10 +466,10 @@ angular
}
var pageWeight = {
walletHome: 10,
receive: 20,
send: 30,
history: 40,
walletHome: 0,
receive: 0,
send: 0,
history: 0,
preferences: 11,
preferencesColor: 12,
backup: 12,
@ -477,7 +477,7 @@ angular
preferencesUnit: 12,
preferencesAltCurrency: 12,
preferencesBwsUrl: 12,
add: 11,
add: 0,
create: 12,
join: 12,
import: 12,