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 @@ - + Create {{requiredCopayers}}-of-{{totalCopayers}} wallet 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"> + ng-disabled="importForm.$invalid || !import.password || import.loading"> Import backup - - Have a Backup from Copay v0.9? - Import here - - - - - + + Have a Backup from Copay v0.9? + Import here + + + 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}} + + - + @@ -51,28 +49,18 @@ + ng-disabled="importForm.$invalid"> Import - - - - {{error|translate}} - - - - - - - Learn more about Wallet Migration - - - + + + Learn more about Wallet Migration + + - - + 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 @@ - Join + Join diff --git a/src/css/main.css b/src/css/main.css index d29a7c9b7..b25d4fd1f 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,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; } 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; 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);
Have a Backup from Copay v0.9?