From 3b8fff5bff99fb39216ec1b39fe0935ab59b66a3 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 21 May 2015 15:44:09 -0300 Subject: [PATCH 1/4] Disables opening link by long time pressing. Active button --- src/css/main.css | 90 +++++++++++++++------------------------------- src/css/mobile.css | 2 ++ 2 files changed, 30 insertions(+), 62 deletions(-) diff --git a/src/css/main.css b/src/css/main.css index d29a7c9b7..cdfda1aaf 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -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,59 +692,53 @@ 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; } +.button:active, button:active { + background: -webkit-linear-gradient(top, rgba(0,0,0,0.1) 100%,rgba(0,0,0,0) 0%); + background: linear-gradient(to bottom, rgba(0,0,0,0.1) 100%,rgba(0,0,0,0) 0%); +} + .button:focus, button:focus { outline:0; } @@ -797,39 +796,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; } diff --git a/src/css/mobile.css b/src/css/mobile.css index 63063bb38..7c810d919 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -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; From aade8cd84bcff2c929cb75461c8aec9f1a1ee0f6 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 21 May 2015 16:04:44 -0300 Subject: [PATCH 2/4] No gradient for active button --- src/css/main.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/css/main.css b/src/css/main.css index cdfda1aaf..b25d4fd1f 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -734,11 +734,6 @@ button.disabled, button[disabled], .button.disabled, .button[disabled] { transition: none !important; } -.button:active, button:active { - background: -webkit-linear-gradient(top, rgba(0,0,0,0.1) 100%,rgba(0,0,0,0) 0%); - background: linear-gradient(to bottom, rgba(0,0,0,0.1) 100%,rgba(0,0,0,0) 0%); -} - .button:focus, button:focus { outline:0; } From eb58604692313035ed387589e70d299c4a6bca1b Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 21 May 2015 16:11:00 -0300 Subject: [PATCH 3/4] Fix back button --- src/js/init.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/init.js b/src/js/init.js index 8cacff9a5..a0070e3f7 100644 --- a/src/js/init.js +++ b/src/js/init.js @@ -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); From 6d5f39610254a451d7908e425ff8f5b883f8abda Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 21 May 2015 17:25:14 -0300 Subject: [PATCH 4/4] Disable button after pressing --- public/views/create.html | 2 +- public/views/import.html | 18 +++++------- public/views/importLegacy.html | 54 +++++++++++++--------------------- public/views/join.html | 3 +- 4 files changed, 32 insertions(+), 45 deletions(-) diff --git a/public/views/create.html b/public/views/create.html index 31713598b..14f1c6abd 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -103,7 +103,7 @@ - diff --git a/public/views/import.html b/public/views/import.html index 5bcaa27ef..6c6213392 100644 --- a/public/views/import.html +++ b/public/views/import.html @@ -19,7 +19,7 @@ -
+
@@ -50,19 +50,17 @@ name="password" ng-model="import.password">
-
-

Have a Backup from Copay v0.9?

- - - -
+
+

Have a Backup from Copay v0.9?

+ +
diff --git a/public/views/importLegacy.html b/public/views/importLegacy.html index cc0476816..ceac39936 100644 --- a/public/views/importLegacy.html +++ b/public/views/importLegacy.html @@ -4,26 +4,24 @@ ng-init="titleSection='Import legacy wallet'; goBackToState = 'import'; noColor = true">
- -
-
-
-

Importing...

-
    -
  • - {{m.message|translate}} -
-
+
+
+

Importing...

+
    +
  • + {{m.message|translate}} +
+
-
- - {{importLegacy.error|translate}} - -
+
+ + {{importLegacy.error|translate}} + +
-
+
- -
+
diff --git a/public/views/join.html b/public/views/join.html index 9fd8e2b62..9e38fc796 100644 --- a/public/views/join.html +++ b/public/views/join.html @@ -83,7 +83,8 @@
- +