diff --git a/assets/styles/base.less b/assets/styles/base.less
index f31e738f6f..b76e63b4ad 100644
--- a/assets/styles/base.less
+++ b/assets/styles/base.less
@@ -10,6 +10,9 @@ body {
&:extend(.full-width);
overscroll-behavior: none;
caret-color: @primary-color;
+}
+
+html {
&:extend(.background-gradient);
}
diff --git a/assets/styles/platforms/iOS.less b/assets/styles/platforms/iOS.less
index 95e3d62ec5..4f0be5c014 100644
--- a/assets/styles/platforms/iOS.less
+++ b/assets/styles/platforms/iOS.less
@@ -4,11 +4,7 @@
padding: env(safe-area-inset-top) env(safe-area-inset-right) env(safe-area-inset-bottom) env(safe-area-inset-left);
}
#app {
- border-top: none;
- height: 100%;
- }
- #__layout{
- height: calc(100% - 2px);
+ padding-top: calc(@normal-spacing * 2);
}
}
// @import '~/assets/styles/themes/moonless_night.less';
diff --git a/nuxt.config.js b/nuxt.config.js
index 2121641a67..b8861dd0c9 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -29,7 +29,7 @@ export default defineNuxtConfig({
{
name: 'viewport',
content:
- 'width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover',
+ 'viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no',
},
{ hid: 'description', name: 'description', content: '' },
],
diff --git a/pages/auth/register/Register.less b/pages/auth/register/Register.less
index 5bf649b1b4..dfea3a7107 100644
--- a/pages/auth/register/Register.less
+++ b/pages/auth/register/Register.less
@@ -8,6 +8,7 @@
.registration-body {
align-self: center;
+ justify-self: center;
}
}
diff --git a/pages/setup/InputAccount/InputAccount.html b/pages/setup/ImportAccount/ImportAccount.html
similarity index 100%
rename from pages/setup/InputAccount/InputAccount.html
rename to pages/setup/ImportAccount/ImportAccount.html
diff --git a/pages/setup/InputAccount/InputAccount.less b/pages/setup/ImportAccount/ImportAccount.less
similarity index 90%
rename from pages/setup/InputAccount/InputAccount.less
rename to pages/setup/ImportAccount/ImportAccount.less
index 2f99eeb0de..da0a0e7947 100644
--- a/pages/setup/InputAccount/InputAccount.less
+++ b/pages/setup/ImportAccount/ImportAccount.less
@@ -37,8 +37,6 @@
@media only screen and (max-width: @mobile-breakpoint) {
.container {
- margin: 0;
- width: @full;
.columns {
margin: 0;
}
@@ -47,15 +45,14 @@
margin-top: auto;
width: unset;
min-width: @full;
- &:extend(.full-width);
}
margin: 0;
- width: unset;
+ width: 100%;
display: flex;
flex-direction: column;
align-self: flex-start;
height: 100%;
- padding: 0 @normal-spacing;
}
+ padding-bottom: @normal-spacing;
}
}
diff --git a/pages/setup/InputAccount/README.md b/pages/setup/ImportAccount/README.md
similarity index 100%
rename from pages/setup/InputAccount/README.md
rename to pages/setup/ImportAccount/README.md
diff --git a/pages/setup/InputAccount/index.vue b/pages/setup/ImportAccount/index.vue
similarity index 91%
rename from pages/setup/InputAccount/index.vue
rename to pages/setup/ImportAccount/index.vue
index 96df092047..e8a87b8d92 100644
--- a/pages/setup/InputAccount/index.vue
+++ b/pages/setup/ImportAccount/index.vue
@@ -1,4 +1,4 @@
-
+
-
+
diff --git a/pages/setup/disclaimer/Disclaimer.less b/pages/setup/disclaimer/Disclaimer.less
index 54f2fbce85..b7c0ec223e 100644
--- a/pages/setup/disclaimer/Disclaimer.less
+++ b/pages/setup/disclaimer/Disclaimer.less
@@ -20,19 +20,16 @@
justify-content: center;
}
@media only screen and (max-width: @mobile-breakpoint) {
- .disclaimer-body {
- margin-top: @normal-spacing;
- }
- .buttons {
- button {
- margin-top: @light-spacing;
- width: @full !important;
- }
- display: inline-block;
- margin-top: auto;
- justify-self: flex-end;
- &:nth-child(2) {
- margin-bottom: @normal-spacing;
+ .container {
+ .buttons {
+ button {
+ margin-top: @light-spacing;
+ width: @full !important;
+ }
+ display: inline-block;
+ margin-top: auto;
+ justify-self: flex-end;
}
+ padding: 0 @normal-spacing;
}
}
diff --git a/pages/setup/disclaimer/index.vue b/pages/setup/disclaimer/index.vue
index a75ba41a64..990b09ee1d 100644
--- a/pages/setup/disclaimer/index.vue
+++ b/pages/setup/disclaimer/index.vue
@@ -15,7 +15,7 @@ export default Vue.extend({
this.$router.push('privacy')
},
importAccount() {
- this.$router.push('inputAccount')
+ this.$router.push('importAccount')
},
},
})
diff --git a/pages/setup/privacy/Privacy.html b/pages/setup/privacy/Privacy.html
index d21947afd1..2911734818 100644
--- a/pages/setup/privacy/Privacy.html
+++ b/pages/setup/privacy/Privacy.html
@@ -76,7 +76,6 @@
class="right"
type="primary"
:action="generateWallet"
- size="small"
>
{{ $t('pages.privacy.continue') }}
diff --git a/pages/setup/privacy/Privacy.less b/pages/setup/privacy/Privacy.less
index 4ecf96ec50..694878b19e 100644
--- a/pages/setup/privacy/Privacy.less
+++ b/pages/setup/privacy/Privacy.less
@@ -47,8 +47,6 @@
flex-direction: column;
align-self: flex-start;
}
- height: @full;
- padding-top: @normal-spacing;
justify-content: flex-start;
margin: 0;
padding: 0;