From cee98424bcb6ab9294bd38c4c5a373860180dba2 Mon Sep 17 00:00:00 2001 From: Kirill Goncharov Date: Fri, 23 Oct 2020 00:40:33 +0300 Subject: [PATCH 1/8] Frontend: Fix various UI bugs --- vue-app/src/App.vue | 2 +- vue-app/src/components/Cart.vue | 5 +++-- vue-app/src/components/Profile.vue | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/vue-app/src/App.vue b/vue-app/src/App.vue index ad57e8496..6044df84b 100644 --- a/vue-app/src/App.vue +++ b/vue-app/src/App.vue @@ -93,7 +93,7 @@ a { img { height: 1em; - margin: 0 10px; + margin: 0 10px 0 0; vertical-align: middle; } diff --git a/vue-app/src/components/Cart.vue b/vue-app/src/components/Cart.vue index 2591be5a1..322074ec5 100644 --- a/vue-app/src/components/Cart.vue +++ b/vue-app/src/components/Cart.vue @@ -355,7 +355,7 @@ export default class Cart extends Vue { .cart { display: flex; flex-direction: column; - height: calc(100vh - 110px); + min-height: calc(100vh - 110px); } .cart-item { @@ -381,11 +381,12 @@ $project-image-size: 50px; } .project-name { + align-self: center; display: -webkit-box; -webkit-line-clamp: 3; -webkit-box-orient: vertical; flex-grow: 1; - height: $project-image-size; + max-height: $project-image-size; overflow: hidden; text-overflow: ellipsis; } diff --git a/vue-app/src/components/Profile.vue b/vue-app/src/components/Profile.vue index f648475cc..3ebd86272 100644 --- a/vue-app/src/components/Profile.vue +++ b/vue-app/src/components/Profile.vue @@ -134,6 +134,10 @@ export default class Profile extends Vue { padding: $content-space; } +.provider-error { + text-align: center; +} + .connect-btn { display: block; margin: 0 auto; From 466a1ba3929ea088555b1ab9c470effe25e14ce7 Mon Sep 17 00:00:00 2001 From: Kirill Goncharov Date: Fri, 23 Oct 2020 01:14:59 +0300 Subject: [PATCH 2/8] Frontend: Show correct network name when working with xDai --- vue-app/src/components/Profile.vue | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/vue-app/src/components/Profile.vue b/vue-app/src/components/Profile.vue index 3ebd86272..0c85da19c 100644 --- a/vue-app/src/components/Profile.vue +++ b/vue-app/src/components/Profile.vue @@ -5,7 +5,7 @@ v-else-if="walletProvider && !isCorrectNetwork()" class="provider-error" > - Please change network to {{ jsonRpcNetwork.name }} + Please change network to {{ networkName }}