diff --git a/package.json b/package.json index d7f115660..82a3b5faf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "polkaswap-exchange-web", - "version": "1.22.0", + "version": "1.22.1", "repository": { "type": "git", "url": "https://github.com/sora-xor/polkaswap-exchange-web.git" diff --git a/public/marketing.json b/public/marketing.json index 3361cdc15..95504f8fa 100644 --- a/public/marketing.json +++ b/public/marketing.json @@ -2,18 +2,16 @@ { "title": "GET SORA CARD", "img": "/marketing/card.png", - "backgroundColor": "var(--s-color-theme-accent)", "link": "/#/card" }, { "title": "CONNECT WITH GOOGLE", - "backgroundColor": "var(--s-color-theme-accent)", + "img": "/marketing/google.png", "link": "https://medium.com/polkaswap/how-to-use-connect-with-google-on-polkawap-a4f9ea2cd2f2" }, { "title": "LEARN ABOUT SYNTHETICS", "img": "/marketing/synths.png", - "backgroundColor": "var(--s-color-theme-accent)", "link": "https://medium.com/polkaswap/unveiling-synthetic-assets-a-game-changer-in-the-financial-landscape-1720e5858422" } ] diff --git a/public/marketing/google.png b/public/marketing/google.png new file mode 100644 index 000000000..dc4f7122a Binary files /dev/null and b/public/marketing/google.png differ diff --git a/public/marketing/synths.png b/public/marketing/synths.png index 8085cd52f..9a111343d 100644 Binary files a/public/marketing/synths.png and b/public/marketing/synths.png differ diff --git a/src/components/App/Header/AppMarketing.vue b/src/components/App/Header/AppMarketing.vue index f9f05df6b..5cd9343f5 100644 --- a/src/components/App/Header/AppMarketing.vue +++ b/src/components/App/Header/AppMarketing.vue @@ -35,6 +35,8 @@ import { Component, Mixins } from 'vue-property-decorator'; import { state } from '@/store/decorators'; import type { Ad } from '@/store/settings/types'; +import type { CSSProperties } from 'vue/types/jsx'; + // PS. Do not call this component & css classes like ad/ads -> it'll be blocked by any blocker browser extension @Component export default class AppMarketing extends Mixins(mixins.TranslationMixin) { @@ -62,7 +64,11 @@ export default class AppMarketing extends Mixins(mixins.TranslationMixin) { } getStyles(ad: Ad) { - return { backgroundImage: `url(${ad.img})`, backgroundColor: ad.backgroundColor }; + const styles: CSSProperties = { backgroundImage: `url(${ad.img})` }; + if (ad.backgroundColor) { + styles.backgroundColor = ad.backgroundColor; + } + return styles; } prev(): void { diff --git a/src/store/settings/types.ts b/src/store/settings/types.ts index cd1143bf1..35d135b74 100644 --- a/src/store/settings/types.ts +++ b/src/store/settings/types.ts @@ -6,7 +6,7 @@ import type { Subscription } from 'rxjs'; export type Ad = { title: string; img: string; - backgroundColor: string; + backgroundColor?: string; link: string; }; diff --git a/src/views/Explore/Tokens.vue b/src/views/Explore/Tokens.vue index dbcdfb493..ba424ca49 100644 --- a/src/views/Explore/Tokens.vue +++ b/src/views/Explore/Tokens.vue @@ -30,7 +30,7 @@