Instadapp/assembly
1
0
Fork 0
mirror of https://github.com/Instadapp/assembly.git synced 2024-07-29 22:37:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into vue-web3

Browse Source
This commit is contained in:
Georges KABBOUCHI 2021-09-03 00:07:42 +03:00
commit 3ab7a80d99
7 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/AccountDropdown.vue
View File

@ -1,10 +1,6 @@
<template>
<div>
<div
v-if="active && activeAccount"
class="relative w-[193px]"
v-click-outside="hide"
>
<div class="mt-3 w-full md:w-auto md:mt-0">
<div v-if="active && activeAccount" class="relative w-full md:w-[193px]" v-click-outside="hide">
<button
type="button"
class=" relative w-full border border-primary-blue-border rounded pl-3 pr-10 py-2 text-left focus:outline-none focus:ring-1 focus:ring-[#0846E4] focus:border-[#0846E4] sm:text-sm"
@ -14,7 +10,7 @@
@click="show = !show"
>
<span
class="flex items-center capitalize text-center text-sm font-bold"
class="flex items-center capitalize text-center text-sm font-bold truncate"
>
<div class="mr-2">
<svg

2
components/AccountSwitcher.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="relative w-[160px] md:w-[178px]" v-click-outside="hide" v-if="activeAccount">
<div class="relative w-1/2 md:w-[178px]" v-click-outside="hide" v-if="activeAccount">
<button
type="button"
class="bg-primary-blue-dark hover:bg-primary-blue-hover relative w-full border border-primary-blue-border rounded pl-3 pr-10 py-2 text-left focus:outline-none focus:ring-1 focus:ring-[#0846E4] focus:border-[#0846E4] sm:text-sm"

2
components/Navbar.vue
View File

@ -40,7 +40,7 @@
</div>
<div
class="mt-8 md:mt-0 ml-auto flex items-center justify-center space-x-2.5"
class="mt-8 md:mt-0 md:ml-auto flex-wrap flex items-center md:justify-center md:space-x-2.5"
>
<AccountSwitcher v-if="active" />

2
components/NetworkSwitcher.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="relative w-[160px] md:w-[178px]" v-click-outside="hide">
<div class="relative w-1/2 md:w-[178px]" v-click-outside="hide">
<button
type="button"
class="bg-primary-blue-dark hover:bg-primary-blue-hover relative w-full border border-primary-blue-border rounded pl-2.5 pr-10 py-1.5 text-left focus:outline-none focus:ring-1 focus:ring-[#0846E4] focus:border-[#0846E4] sm:text-sm"

2
layouts/default.vue
View File

@ -43,7 +43,7 @@
<NotificationBar />
<div class="fixed bottom-0 right-0 mr-10 mb-28">
<div class="fixed bottom-0 right-0 mr-5 md:mr-10 mb-5 md:mb-28">
<button
@click="showSidebarBalances"
class="px-9 h-[56px] bg-primary-blue-dark hover:bg-primary-blue-hover text-white rounded-[28px] text-lg font-semibold shadow flex items-center"

2
package.json
View File

@ -23,7 +23,7 @@
"bignumber.js": "^9.0.1",
"core-js": "^3.15.1",
"css-color-function": "^1.3.3",
"dsa-connect": "^0.4.4-beta.2",
"dsa-connect": "^0.4.4",
"nuxt": "^2.15.7",
"qrcode": "^1.4.4",
"v-click-outside": "^3.1.2",

8
yarn.lock
View File

@ -4910,10 +4910,10 @@ drbg.js@^1.0.1:
create-hash "^1.1.2"
create-hmac "^1.1.4"
dsa-connect@^0.4.4-beta.2:
version "0.4.4-beta.2"
resolved "https://registry.yarnpkg.com/dsa-connect/-/dsa-connect-0.4.4-beta.2.tgz#d26739c4d67176e7f29b08cb84ee4f510e0bb830"
integrity sha512-ZRk4OAHD0GFJW74fggNfwXCho4AdWKJdXCyGtuCxwTY7Pm1ycisa/469vD6UjcB8j2CrNDk3AsPgXs5IBmkzDQ==
dsa-connect@^0.4.4:
version "0.4.4"
resolved "https://registry.yarnpkg.com/dsa-connect/-/dsa-connect-0.4.4.tgz#c47ded36b23d089c85f61bff3a781b5d577d4fe7"
integrity sha512-QSR8uiDXRwbInh2muGJfJPEK5KkMRX1Rc5wrcOL3Ov1bKkpZxQ0iSAoO3R/5OD5MV23n6vKiIa9ZX/BVId/exg==
duplexer3@^0.1.4:
version "0.1.4"