diff --git a/cordova/build.sh b/cordova/build.sh index ffe2fff2b..a638ea1e4 100755 --- a/cordova/build.sh +++ b/cordova/build.sh @@ -83,6 +83,9 @@ if [ ! -d $PROJECT ]; then cordova plugin add https://github.com/EddyVerbruggen/LaunchMyApp-PhoneGap-Plugin.git --variable URL_SCHEME=bitcoin checkOK + cordova plugin add org.apache.cordova.inappbrowser + checkOK + fi echo "${OpenColor}${Green}* Generating copay bundle...${CloseColor}" diff --git a/css/src/main.css b/css/src/main.css index 91c84b376..0bcd192a0 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -975,24 +975,13 @@ table tr.deleting { background: #FCD5D5; } -/* SECONDARY */ - -input[type='submit'] -{ - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; -} - - 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: #343c43; margin-bottom: 1.3rem; height: 40px; - border-radius: 3px; background: #F2F5F8; - -moz-box-shadow: inset 1px 1px 0px 0px rgba(0,0,0,0.05); - box-shadow: inset 1px 1px 0px 0px rgba(0,0,0,0.05); + -moz-box-shadow: none; + box-shadow: none; border: none; padding-left: 45px; } @@ -1001,8 +990,6 @@ button.secondary, .button.secondary { color: #fff; background: #008CC1; - -moz-box-shadow: 1px 1px 0px 0px #10769D; - box-shadow: 1px 1px 0px 0px #10769D; } button.secondary:hover, button.secondary:focus, @@ -1034,8 +1021,6 @@ button.primary, color: #fff; border-radius: 3px; border-radius: 3px; - -moz-box-shadow: 1px 1px 0px 0px #16A085; - box-shadow: 1px 1px 0px 0px #16A085; } button.primary:hover, button.primary:focus, @@ -1056,8 +1041,6 @@ button[disabled].primary:focus, .button.disabled.primary:focus, .button[disabled].primary:hover, .button[disabled].primary:focus { - -moz-box-shadow: 1px 1px 0px 0px #687D80; - box-shadow: 1px 1px 0px 0px #687D80; background-color: #95a5a6; color: #E6E6E6; } @@ -1068,8 +1051,6 @@ button.warning, background-color: #C0392A; color: #fff; border-radius: 3px; - -moz-box-shadow: 1px 1px 0px 0px #A02F23; - box-shadow: 1px 1px 0px 0px #A02F23; } button.warning:hover, button.warning:focus, @@ -1130,8 +1111,6 @@ button[disabled].white:focus, /* BLACK */ button.black, .button.black { - -moz-box-shadow: 1px 1px 0px 0px #1B2937; - box-shadow: 1px 1px 0px 0px #1B2937; background-color: #2C3E50; color: #fff; } diff --git a/js/controllers/createProfile.js b/js/controllers/createProfile.js index bd857cd46..13dcd9dd5 100644 --- a/js/controllers/createProfile.js +++ b/js/controllers/createProfile.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('CreateProfileController', function($scope, $rootScope, $location, $timeout, notification, pluginManager, identityService, pinService, isMobile, configService) { +angular.module('copayApp.controllers').controller('CreateProfileController', function($scope, $rootScope, $location, $timeout, notification, pluginManager, identityService, pinService, isMobile, configService, go) { var _credentials, _firstpin; @@ -172,4 +172,8 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun }); }; + $scope.openExternalLink = function(url) { + go.openExternalLink(url); + }; + }); diff --git a/js/controllers/history.js b/js/controllers/history.js index 77c632d97..2e8382620 100644 --- a/js/controllers/history.js +++ b/js/controllers/history.js @@ -2,7 +2,7 @@ var bitcore = require('bitcore'); angular.module('copayApp.controllers').controller('HistoryController', - function($scope, $rootScope, $filter, $timeout, $modal, rateService, notification) { + function($scope, $rootScope, $filter, $timeout, $modal, rateService, notification, go) { var w = $rootScope.wallet; $rootScope.title = 'History'; @@ -145,6 +145,9 @@ angular.module('copayApp.controllers').controller('HistoryController', return w.getNetworkName().substring(0, 4); }; + $scope.openExternalLink = function(url) { + go.openExternalLink(url); + }; $scope.cancel = function() { $modalInstance.dismiss('cancel'); diff --git a/js/services/go.js b/js/services/go.js index ac9d9d85b..550693288 100644 --- a/js/services/go.js +++ b/js/services/go.js @@ -40,6 +40,10 @@ angular.module('copayApp.services').factory('go', function($window, $location) { } }; + root.openExternalLink = function(url) { + var ref = window.open(url, '_blank', 'location=no'); + }; + root.go = function(path) { var parts = path.split('#'); $location.path(parts[0]); diff --git a/views/create.html b/views/create.html index 2b61e5873..b1c33c403 100644 --- a/views/create.html +++ b/views/create.html @@ -30,7 +30,7 @@
-
-
+
- - - Show - Hide - advanced options - - - +
+ + + Show + Hide + advanced options + + + +
-
+
-
- +
+ Show Hide @@ -64,13 +64,18 @@
-
-

- +

+
+ +
- +
diff --git a/views/modals/tx-details.html b/views/modals/tx-details.html index 529fec962..9ef101e81 100644 --- a/views/modals/tx-details.html +++ b/views/modals/tx-details.html @@ -79,8 +79,11 @@
-
- See it on the blockchain +
+ + See it on the blockchain +

diff --git a/views/more.html b/views/more.html index 8d5940974..d6af76cd0 100644 --- a/views/more.html +++ b/views/more.html @@ -27,7 +27,7 @@
- + Show Hide @@ -89,7 +89,8 @@

- Join Secret

+ Join Secret +

This is the initial secret join string. Since your wallet it is already complete, this is only useful to rejoin peers that lost their backup BUT have the extended private key stored (they will be rejected on other case). They need to enter their extended private key during the join process (in advanced options).

diff --git a/views/profile.html b/views/profile.html index 5309927df..4ea689d2d 100644 --- a/views/profile.html +++ b/views/profile.html @@ -108,9 +108,9 @@
-
+
- + Show Hide @@ -122,17 +122,15 @@
-
-
-
-

- Delete Profile -

-

Permanently delete this profile and all its wallets. WARNING: this action cannot be reversed.

- Delete Profile - -
+
+
+

+ Delete Profile +

+

Permanently delete this profile and all its wallets. WARNING: this action cannot be reversed.

+ Delete Profile +