From 48e3a7609954048c01f851116e709fd5c47a87eb Mon Sep 17 00:00:00 2001 From: gabaldon Date: Fri, 4 Mar 2022 14:08:52 +0100 Subject: [PATCH 1/5] fix(ui): fix DOM error in production --- packages/api/test/validateFeedsConfig.spec.ts | 5 ++++- packages/api/test/web3Middleware/dataFeedsRouter.json | 2 +- packages/ui/components/Main.vue | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/api/test/validateFeedsConfig.spec.ts b/packages/api/test/validateFeedsConfig.spec.ts index 31699424..ce558e37 100644 --- a/packages/api/test/validateFeedsConfig.spec.ts +++ b/packages/api/test/validateFeedsConfig.spec.ts @@ -5,7 +5,10 @@ import { normalizeConfig } from '../src/utils/index' describe('validateDataFeedsConfig', () => { it('check if the structure is correct', async () => { const dataFeedsRouterConfig = JSON.parse( - fs.readFileSync(path.resolve('./test/web3Middleware/dataFeedsRouter.json'), 'utf-8') + fs.readFileSync( + path.resolve('./test/web3Middleware/dataFeedsRouter.json'), + 'utf-8' + ) ) const feeds = normalizeConfig(dataFeedsRouterConfig) diff --git a/packages/api/test/web3Middleware/dataFeedsRouter.json b/packages/api/test/web3Middleware/dataFeedsRouter.json index b1125b47..420b0ed0 100644 --- a/packages/api/test/web3Middleware/dataFeedsRouter.json +++ b/packages/api/test/web3Middleware/dataFeedsRouter.json @@ -521,4 +521,4 @@ } } } -} \ No newline at end of file +} diff --git a/packages/ui/components/Main.vue b/packages/ui/components/Main.vue index 731912b5..c70a46b4 100644 --- a/packages/ui/components/Main.vue +++ b/packages/ui/components/Main.vue @@ -8,11 +8,11 @@ />
-

+

{{ $t('main.network_subtitle') }} {{ selected[0].network }} From 8035c0e86b929eabdf04d3b93917933c34ff6728 Mon Sep 17 00:00:00 2001 From: gabaldon Date: Fri, 4 Mar 2022 14:22:11 +0100 Subject: [PATCH 2/5] fix(ui): fix svg width in production --- packages/ui/components/InfoTooltip.vue | 2 ++ packages/ui/components/IntegrationDetails.vue | 2 ++ packages/ui/components/ThemeSwitch.vue | 2 ++ packages/ui/components/Transaction.vue | 2 ++ packages/ui/nuxt.config.js | 1 - 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/ui/components/InfoTooltip.vue b/packages/ui/components/InfoTooltip.vue index 45092590..bafdc909 100644 --- a/packages/ui/components/InfoTooltip.vue +++ b/packages/ui/components/InfoTooltip.vue @@ -95,6 +95,8 @@ export default { display: flex; align-items: center; font-size: 10px; + width: 10px; + height: 10px; cursor: pointer; } @media (max-width: 300px) { diff --git a/packages/ui/components/IntegrationDetails.vue b/packages/ui/components/IntegrationDetails.vue index 34c8d382..0777089f 100644 --- a/packages/ui/components/IntegrationDetails.vue +++ b/packages/ui/components/IntegrationDetails.vue @@ -141,6 +141,8 @@ export default { } .icon { font-size: 10px; + width: 10px; + height: 10px; } } } diff --git a/packages/ui/components/ThemeSwitch.vue b/packages/ui/components/ThemeSwitch.vue index 7913763c..72ccf550 100644 --- a/packages/ui/components/ThemeSwitch.vue +++ b/packages/ui/components/ThemeSwitch.vue @@ -51,6 +51,8 @@ export default { .mode-icon { color: var(--icon-color); font-size: 20px; + width: 20px; + height: 20px; } .icon-container { cursor: pointer; diff --git a/packages/ui/components/Transaction.vue b/packages/ui/components/Transaction.vue index 836bbcfd..d62465ca 100644 --- a/packages/ui/components/Transaction.vue +++ b/packages/ui/components/Transaction.vue @@ -76,6 +76,8 @@ export default { color: var(--witnet-transaction); font-family: Roboto Mono, monospace; .icon { + width: 10px; + height: 10px; font-size: var(--text-size-small); } } diff --git a/packages/ui/nuxt.config.js b/packages/ui/nuxt.config.js index 858bdc1b..22bb0f6a 100644 --- a/packages/ui/nuxt.config.js +++ b/packages/ui/nuxt.config.js @@ -15,7 +15,6 @@ export default { }, meta: [ { charset: 'utf-8' }, - { name: 'theme-color', content: '#0094a8' }, { name: 'viewport', content: 'width=device-width, initial-scale=1' }, { hid: 'title', From 8b266da36255f03058b24927d7f44bbdf4b1fdd5 Mon Sep 17 00:00:00 2001 From: gabaldon Date: Fri, 4 Mar 2022 16:58:07 +0100 Subject: [PATCH 3/5] fix(ui): fix gradient in dark mode --- packages/ui/assets/styles/main.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/ui/assets/styles/main.scss b/packages/ui/assets/styles/main.scss index f8050aad..9653a87b 100644 --- a/packages/ui/assets/styles/main.scss +++ b/packages/ui/assets/styles/main.scss @@ -190,7 +190,8 @@ //sidebar --tab-gradient: linear-gradient(90deg, #2d2c39d3 95%, #4ab6a02c); - --tab-gradient-selected: linear-gradient(90deg, #2d2c39d3 0%, rgba(74, 182, 160, 0.05) 20%, rgba(74, 182, 160, 0.10) 24%, rgba(74, 182, 160, 0.15) 30%, rgba(74, 182, 160, 0.173) 35%); + --tab-background: #2D2C39; + --tab-gradient-selected: linear-gradient(90deg, #2D2C39 0%, rgba(74, 182, 160, 0.05) 20%, rgba(74, 182, 160, 0.10) 24%, rgba(74, 182, 160, 0.15) 30%, rgba(74, 182, 160, 0.173) 35%); //breadcrumbs --selected-option: #4AB6A1; From 6f3ac597353d18f8ae42747db492508f126fc36d Mon Sep 17 00:00:00 2001 From: gabaldon Date: Fri, 4 Mar 2022 17:03:58 +0100 Subject: [PATCH 4/5] fix(ui): fix label and align info icon --- packages/api/src/dataFeedsRouter.json | 2 +- packages/ui/components/InfoTooltip.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/api/src/dataFeedsRouter.json b/packages/api/src/dataFeedsRouter.json index a40697a5..eeefab0e 100644 --- a/packages/api/src/dataFeedsRouter.json +++ b/packages/api/src/dataFeedsRouter.json @@ -48,7 +48,7 @@ "minSecsBetweenUpdates": 900 }, "Price-OLO/USDC-6": { - "label": "($)", + "label": "$", "deviationPercentage": 0.1, "maxSecsBetweenUpdates": 86400, "minSecsBetweenUpdates": 900 diff --git a/packages/ui/components/InfoTooltip.vue b/packages/ui/components/InfoTooltip.vue index bafdc909..8996262d 100644 --- a/packages/ui/components/InfoTooltip.vue +++ b/packages/ui/components/InfoTooltip.vue @@ -90,6 +90,7 @@ export default { } .container { display: flex; + align-items: center; } .info { display: flex; From 31e8e9c7bfccf3749a6b8518a893f894681d33e3 Mon Sep 17 00:00:00 2001 From: gabaldon Date: Fri, 4 Mar 2022 17:57:01 +0100 Subject: [PATCH 5/5] fix(ui): fix nav-bar double scroll --- packages/ui/components/NavBar.vue | 3 +++ packages/ui/layouts/default.vue | 19 +++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/packages/ui/components/NavBar.vue b/packages/ui/components/NavBar.vue index dfea5c5c..629d75eb 100644 --- a/packages/ui/components/NavBar.vue +++ b/packages/ui/components/NavBar.vue @@ -107,9 +107,11 @@ export default { }, closeMenu() { this.isMenuVisible = false + this.$emit('scroll', this.isMenuVisible) }, toggleMenu() { this.isMenuVisible = !this.isMenuVisible + this.$emit('scroll', this.isMenuVisible) }, displayDropDown() { this.displayBox = !this.displayBox @@ -184,6 +186,7 @@ export default { &.last-item { display: flex; justify-content: center; + padding-bottom: 24px; } .btn-container { width: max-content; diff --git a/packages/ui/layouts/default.vue b/packages/ui/layouts/default.vue index 1d80f6af..391c1ed2 100644 --- a/packages/ui/layouts/default.vue +++ b/packages/ui/layouts/default.vue @@ -1,7 +1,7 @@