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

Merge pull request #2765 from cmgustavo/feat/mobile-feedback-buttons

Browse source 
Mobile issues
This commit is contained in:
Matias Alejo Garcia 2015-05-21 18:22:51 -03:00
commit 289d7843b3
7 changed files with 59 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/create.html
View file

@ -103,7 +103,7 @@
</div>
<button type="submit" class="button round black expand m0" ng-disabled="setupForm.$invalid">
<button type="submit" class="button round black expand m0" ng-disabled="setupForm.$invalid || create.loading">
<span translate>Create</span>
{{requiredCopayers}}-<span translate>of</span>-{{totalCopayers}} <span translate>wallet</span>
</button>

18
public/views/import.html
View file

@ -19,7 +19,7 @@
</div>
<div class="row" ng-show="!import.loading">
<div class="row">
<div class="large-12 columns">
<form name="importForm" ng-submit="import.import(importForm)" novalidate>
<div class="box-notification" ng-show="import.error">
@ -50,19 +50,17 @@
name="password" ng-model="import.password">
</div>
<button translate type="submit" class="button round expand black"
ng-disabled="importForm.$invalid || !import.password">
ng-disabled="importForm.$invalid || !import.password || import.loading">
Import backup
</button>
</form>
<div class="text-center text-gray p20v" ng-click="$root.go('importLegacy')">
<p class="text-gray m5b size-14" translate> Have a Backup from Copay v0.9?</p>
<button class=" outline dark-gray tiny round"> <span translate>Import here</span>
<i class="icon-arrow-right3 size-14"></i>
</button>
</div>
<div class="text-center text-gray p20v" ng-click="$root.go('importLegacy')">
<p class="text-gray m5b size-14" translate> Have a Backup from Copay v0.9?</p>
<button class=" outline dark-gray tiny round"> <span translate>Import here</span>
<i class="icon-arrow-right3 size-14"></i>
</button>
</div>
</div>
</div>

54
public/views/importLegacy.html
View file

@ -4,26 +4,24 @@
ng-init="titleSection='Import legacy wallet'; goBackToState = 'import'; noColor = true">
</div>
<div class="content p20v" ng-controller="importLegacyController as importLegacy">
<div class="row m20t">
<div class="large-12 columns">
<div ng-show="importLegacy.importing">
<h1 class="m20b animated infinite flash" translate>Importing...</h1>
<ul>
<li ng-repeat="m in importLegacy.messages">
<span ng-style="{'opacity':m.opacity}">{{m.message|translate}}</span>
</ul>
</div>
<div class="large-12 columns">
<div ng-show="importLegacy.importing">
<h1 class="m20b animated infinite flash" translate>Importing...</h1>
<ul>
<li ng-repeat="m in importLegacy.messages">
<span ng-style="{'opacity':m.opacity}">{{m.message|translate}}</span>
</ul>
</div>
<div class="box-notification" ng-show="importLegacy.error">
<span class="text-warning size-14">
{{importLegacy.error|translate}}
</span>
</div>
<div class="box-notification" ng-show="importLegacy.error">
<span class="text-warning size-14">
{{importLegacy.error|translate}}
</span>
</div>
<div ng-show="!importLegacy.importing">
<div ng-show="!importLegacy.importing">
<form name="importForm" ng-submit="importLegacy.import(importForm)" novalidate>
<label for="fromCloud" class="line-b oh m20b">
@ -51,28 +49,18 @@
<button translate type="submit"
class="button black round expand m0"
ng-disabled="deviceForm.$invalid">
ng-disabled="importForm.$invalid">
Import
</button>
</form>
<form name="importLegacyForm" ng-submit="importLegacy.import(importLegacyForm)" novalidate>
<div class="box-notification" ng-show="error">
<span class="text-warning size-14">
{{error|translate}}
</span>
</div>
</form>
<div class="text-center p20v">
<a class="m20t tiny button outline round light-gray " ng-click="$root.openExternalLink('https://github.com/bitpay/copay/releases/tag/v0.10.0')" translate>
Learn more about Wallet Migration
</a>
</div>
<div class="text-center p20v">
<a class="m20t tiny button outline round light-gray " ng-click="$root.openExternalLink('https://github.com/bitpay/copay/releases/tag/v0.10.0')" translate>
Learn more about Wallet Migration
</a>
</div>
</div>
</div>
</div>
</div>

3
public/views/join.html
View file

@ -83,7 +83,8 @@
</label>
</div>
</div>
<button translate type="submit" class="button expand black m0 round" ng-disabled="joinForm.$invalid">Join</button>
<button translate type="submit" class="button expand black m0 round"
ng-disabled="joinForm.$invalid || join.loading">Join</button>
</form>
</div>
</div>

85
src/css/main.css
View file

@ -646,7 +646,12 @@ button.outline.light-gray:focus {
color: #7A8C9E;
}
.button.outline.white {
.button.outline.white,
.button.outline.white:hover,
.button.outline.white:focus,
button.outline.white,
button.outline.white:hover,
button.outline.white:focus {
background-color: transparent;
border: 1px solid #fff;
color: #fff;
@ -687,54 +692,43 @@ button.warning:focus,
/* WHITE */
button.white,
.button.white {
button.white:hover,
button.white:focus,
.button.white,
.button.white:hover,
.button.white:focus {
background-color: #fff;
color: #2C3E50;
}
/* BLACK */
button.black,
.button.black {
button.black:hover,
button.black:focus,
.button.black,
.button.black:hover,
.button.black:focus {
background-color: #2C3E50;
color: #fff;
}
/* GRAY */
button.gray,
.button.gray {
button.gray:hover,
button.gray:focus,
.button.gray,
.button.gray:hover,
.button.gray:focus {
background-color: #A9B2B8;
color: #2C3E50;
}
button.disabled, button[disabled], .button.disabled, .button[disabled] {
border-color: transparent;
}
button.disabled.black,
button[disabled].black,
.button.disabled.black,
.button[disabled].black,
button.disabled.white,
button[disabled].white,
.button.disabled.white,
.button[disabled].white,
button.disabled.warning,
button[disabled].warning,
.button.disabled.warning,
.button[disabled].warning,
button.disabled.primary,
button[disabled].primary,
.button.disabled.primary,
.button[disabled].primary,
button.disabled.secondary,
button[disabled].secondary,
.button.disabled.secondary,
.button[disabled].secondary {
border-color: transparent !important;
background-color: #A5B2BF !important;
color: #fff;
color: #fff !important;
}
.button, button {
text-transform: uppercase;
transition: none !important;
@ -797,39 +791,6 @@ label.postfix, a.postfix {
width: 40px;
}
.photo-container {
margin-right: 3px;
display: inline-block;
width: 35px;
height: 35px;
color: #fff;
background: #7A8C9E;
border-radius: 100%;
vertical-align: middle;
overflow: hidden;
text-align: center;
}
.photo-container.profile {
width: 80px;
height: 80px;
}
.need-backup {
background: #ED4A43;
-moz-box-shadow: 1px 1px 0px 0px #A02F23;
box-shadow: 1px 1px 0px 0px #A02F23;
position: absolute;
top: 22px;
left: 0px;
width: 14px;
height: 14px;
border-radius: 100%;
font-size: 9px;
padding-top: 2px;
color: #fff;
}
.pointer {
cursor: pointer;
}

2
src/css/mobile.css
View file

@ -11,6 +11,7 @@ body {
-khtml-user-select: none;
-ms-user-select: none;
user-select: none;
-webkit-touch-callout: none !important;
}
input {
@ -617,6 +618,7 @@ input:focus,
select:focus,
textarea:focus
{
outline: 0;
opacity: 1;
/*CSS transitions*/
-o-transition-property: none !important;

4
src/js/init.js
View file

@ -36,10 +36,10 @@ angular.element(document).ready(function() {
document.addEventListener('backbutton', function() {
var loc = window.location;
if (loc.toString().match(/index\.html#\/$/)) {
navigator.app.exitApp();
navigator.app.exitApp();
}
else {
window.location = '#/walletHome';
window.location = '#/cordova/walletHome';
}
}, false);