diff --git a/src/asset/font/Mondwest-Bold.eot b/src/asset/font/Mondwest-Bold.eot deleted file mode 100644 index 6f6330595..000000000 Binary files a/src/asset/font/Mondwest-Bold.eot and /dev/null differ diff --git a/src/asset/font/Mondwest-Bold.otf b/src/asset/font/Mondwest-Bold.otf deleted file mode 100644 index 7efc6c957..000000000 Binary files a/src/asset/font/Mondwest-Bold.otf and /dev/null differ diff --git a/src/asset/font/Mondwest-Bold.ttf b/src/asset/font/Mondwest-Bold.ttf deleted file mode 100644 index 3f3840e60..000000000 Binary files a/src/asset/font/Mondwest-Bold.ttf and /dev/null differ diff --git a/src/asset/font/Mondwest-Bold.woff b/src/asset/font/Mondwest-Bold.woff deleted file mode 100644 index ad9d9877c..000000000 Binary files a/src/asset/font/Mondwest-Bold.woff and /dev/null differ diff --git a/src/asset/font/Mondwest-Bold.woff2 b/src/asset/font/Mondwest-Bold.woff2 deleted file mode 100644 index 1e2f52118..000000000 Binary files a/src/asset/font/Mondwest-Bold.woff2 and /dev/null differ diff --git a/src/asset/font/Mondwest-Regular.eot b/src/asset/font/Mondwest-Regular.eot deleted file mode 100644 index 79c2a2681..000000000 Binary files a/src/asset/font/Mondwest-Regular.eot and /dev/null differ diff --git a/src/asset/font/Mondwest-Regular.otf b/src/asset/font/Mondwest-Regular.otf deleted file mode 100644 index 25ad49aa0..000000000 Binary files a/src/asset/font/Mondwest-Regular.otf and /dev/null differ diff --git a/src/asset/font/Mondwest-Regular.ttf b/src/asset/font/Mondwest-Regular.ttf deleted file mode 100644 index 955a3bc27..000000000 Binary files a/src/asset/font/Mondwest-Regular.ttf and /dev/null differ diff --git a/src/asset/font/Mondwest-Regular.woff b/src/asset/font/Mondwest-Regular.woff deleted file mode 100644 index 0f1bed12d..000000000 Binary files a/src/asset/font/Mondwest-Regular.woff and /dev/null differ diff --git a/src/asset/font/Mondwest-Regular.woff2 b/src/asset/font/Mondwest-Regular.woff2 deleted file mode 100644 index c1cbcd926..000000000 Binary files a/src/asset/font/Mondwest-Regular.woff2 and /dev/null differ diff --git a/src/asset/font/NeueBit-Bold.eot b/src/asset/font/NeueBit-Bold.eot deleted file mode 100644 index f8f888017..000000000 Binary files a/src/asset/font/NeueBit-Bold.eot and /dev/null differ diff --git a/src/asset/font/NeueBit-Bold.otf b/src/asset/font/NeueBit-Bold.otf deleted file mode 100644 index 2d334e8d3..000000000 Binary files a/src/asset/font/NeueBit-Bold.otf and /dev/null differ diff --git a/src/asset/font/NeueBit-Bold.ttf b/src/asset/font/NeueBit-Bold.ttf deleted file mode 100644 index 4fe31647e..000000000 Binary files a/src/asset/font/NeueBit-Bold.ttf and /dev/null differ diff --git a/src/asset/font/NeueBit-Bold.woff b/src/asset/font/NeueBit-Bold.woff deleted file mode 100644 index 57b517574..000000000 Binary files a/src/asset/font/NeueBit-Bold.woff and /dev/null differ diff --git a/src/asset/font/NeueBit-Bold.woff2 b/src/asset/font/NeueBit-Bold.woff2 deleted file mode 100644 index 469737282..000000000 Binary files a/src/asset/font/NeueBit-Bold.woff2 and /dev/null differ diff --git a/src/asset/font/NeueBit-Regular.eot b/src/asset/font/NeueBit-Regular.eot deleted file mode 100644 index 373a6c978..000000000 Binary files a/src/asset/font/NeueBit-Regular.eot and /dev/null differ diff --git a/src/asset/font/NeueBit-Regular.otf b/src/asset/font/NeueBit-Regular.otf deleted file mode 100644 index 38d24ac72..000000000 Binary files a/src/asset/font/NeueBit-Regular.otf and /dev/null differ diff --git a/src/asset/font/NeueBit-Regular.ttf b/src/asset/font/NeueBit-Regular.ttf deleted file mode 100644 index ca004716c..000000000 Binary files a/src/asset/font/NeueBit-Regular.ttf and /dev/null differ diff --git a/src/asset/font/NeueBit-Regular.woff b/src/asset/font/NeueBit-Regular.woff deleted file mode 100644 index 9da0aeaf5..000000000 Binary files a/src/asset/font/NeueBit-Regular.woff and /dev/null differ diff --git a/src/asset/font/NeueBit-Regular.woff2 b/src/asset/font/NeueBit-Regular.woff2 deleted file mode 100644 index 6814222af..000000000 Binary files a/src/asset/font/NeueBit-Regular.woff2 and /dev/null differ diff --git a/src/config/help.ts b/src/config/help.ts index 50cf4593a..f98849f60 100644 --- a/src/config/help.ts +++ b/src/config/help.ts @@ -72,7 +72,7 @@ export const HelpConfig: HelpItems = [ 'Commission', 'Over Subscribed', 'Blocked Nominations', - 'Rewards By Country And Network', + // 'Rewards By Country And Network', ], external: [], }, diff --git a/src/config/pages.tsx b/src/config/pages.tsx index a0bd1fa20..c4c45b827 100644 --- a/src/config/pages.tsx +++ b/src/config/pages.tsx @@ -38,7 +38,7 @@ export const PagesConfig: PagesConfigItems = [ uri: `${BASE_URL}`, hash: '/overview', Entry: Overview, - icon: () => , + icon: () => , }, { category: 2, @@ -46,7 +46,7 @@ export const PagesConfig: PagesConfigItems = [ uri: `${BASE_URL}pools`, hash: '/pools', Entry: Pools, - icon: () => , + icon: () => , }, { category: 2, @@ -54,7 +54,7 @@ export const PagesConfig: PagesConfigItems = [ uri: `${BASE_URL}nominate`, hash: '/nominate', Entry: Nominate, - icon: () => , + icon: () => , }, { category: 2, @@ -62,7 +62,7 @@ export const PagesConfig: PagesConfigItems = [ uri: `${BASE_URL}payouts`, hash: '/payouts', Entry: Payouts, - icon: () => , + icon: () => , }, { category: 3, @@ -70,7 +70,7 @@ export const PagesConfig: PagesConfigItems = [ uri: `${BASE_URL}validators`, hash: '/validators', Entry: Validators, - icon: () => , + icon: () => , }, { category: 3, @@ -78,6 +78,6 @@ export const PagesConfig: PagesConfigItems = [ uri: `${BASE_URL}community`, hash: '/community', Entry: Community, - icon: () => , + icon: () => , }, ]; diff --git a/src/img/ic_community.svg b/src/img/ic_community.svg index b7782e3a1..5ae1e88ba 100644 --- a/src/img/ic_community.svg +++ b/src/img/ic_community.svg @@ -1,79 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/img/ic_feedback.svg b/src/img/ic_feedback.svg index 5d2e6eea0..0eff3954f 100644 --- a/src/img/ic_feedback.svg +++ b/src/img/ic_feedback.svg @@ -1,50 +1,54 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/img/ic_nominate.svg b/src/img/ic_nominate.svg index 81cf935a0..731b36bad 100644 --- a/src/img/ic_nominate.svg +++ b/src/img/ic_nominate.svg @@ -1,20 +1,20 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/src/img/ic_overview.svg b/src/img/ic_overview.svg index 93845e338..4cdc0e659 100644 --- a/src/img/ic_overview.svg +++ b/src/img/ic_overview.svg @@ -1,137 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/img/ic_payouts.svg b/src/img/ic_payouts.svg index b3f209d03..4c517942f 100644 --- a/src/img/ic_payouts.svg +++ b/src/img/ic_payouts.svg @@ -1,57 +1,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/img/ic_pools.svg b/src/img/ic_pools.svg index aa40d92d2..02caac08f 100644 --- a/src/img/ic_pools.svg +++ b/src/img/ic_pools.svg @@ -1,45 +1,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/img/ic_resources.svg b/src/img/ic_resources.svg index 063446654..4e22b8b6e 100644 --- a/src/img/ic_resources.svg +++ b/src/img/ic_resources.svg @@ -1,66 +1,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/src/img/ic_validators.svg b/src/img/ic_validators.svg index 499ffe336..3791233b4 100644 --- a/src/img/ic_validators.svg +++ b/src/img/ic_validators.svg @@ -1,45 +1,27 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/img/info-outline.svg b/src/img/info-outline.svg index dc6e7376a..dfe1f3934 100644 --- a/src/img/info-outline.svg +++ b/src/img/info-outline.svg @@ -1 +1,3 @@ - + + + diff --git a/src/library/BarChart/Wrappers.ts b/src/library/BarChart/Wrappers.ts index b6da82e9b..68617bc49 100644 --- a/src/library/BarChart/Wrappers.ts +++ b/src/library/BarChart/Wrappers.ts @@ -29,7 +29,7 @@ export const BarChartWrapper = styled.div<{ $lessPadding?: boolean }>` background: var(--accent-color-primary); color: rgba(255, 255, 255, 0.95); span { - color: var(--accent-color-secondary); + color: #fff; } } .d2 { @@ -42,7 +42,7 @@ export const BarChartWrapper = styled.div<{ $lessPadding?: boolean }>` } .d4 { background: var(--button-tertiary-background); - color: var(--text-color-secondary); + color: var(--text-color-primary); } `; @@ -77,7 +77,7 @@ export const Legend = styled.div` width: 1rem; height: 1rem; margin-right: 0.5rem; - border-radius: 0.25rem; + // border-radius: 0.25rem; } } `; diff --git a/src/library/Graphs/PayoutLine.tsx b/src/library/Graphs/PayoutLine.tsx index 1c2a54506..991fcaaa5 100644 --- a/src/library/Graphs/PayoutLine.tsx +++ b/src/library/Graphs/PayoutLine.tsx @@ -48,11 +48,40 @@ export const PayoutLine = ({ const { t } = useTranslation('library'); const { mode } = useTheme(); const { payouts, poolClaims } = useSubscan(); - const { unit, units, colors } = useNetwork().networkData; + const { + unit, + units, + // colors, + } = useNetwork().networkData; const { isSyncing } = useUi(); const { inSetup } = useStaking(); const { membership: poolMembership } = usePoolMemberships(); + graphColors.grid.dark = '#e1e1e1'; + + const colors = { + primary: { + light: 'rgb(211, 48, 121)', + dark: '#3dc77a', + }, + secondary: { + light: '#552bbf', + dark: '#6d39ee', + }, + stroke: { + light: 'rgb(211, 48, 121)', + dark: 'rgb(211, 48, 121)', + }, + transparent: { + light: 'rgb(211, 48, 121, 0.05)', + dark: 'rgb(211, 48, 121, 0.05)', + }, + pending: { + light: 'rgb(211, 48, 121, 0.33)', + dark: 'rgb(211, 48, 121, 0.33)', + }, + }; + const notStaking = !isSyncing && inSetup() && !poolMembership; const poolingOnly = !isSyncing && inSetup() && poolMembership !== null; diff --git a/src/library/Help/Wrappers.ts b/src/library/Help/Wrappers.ts index face240cd..163bf0b85 100644 --- a/src/library/Help/Wrappers.ts +++ b/src/library/Help/Wrappers.ts @@ -37,7 +37,8 @@ export const ListWrapper = styled(motion.div)` export const DefinitionWrapper = styled(motion.div)` background: var(--background-floating-card); - border-radius: 1.5rem; + border-radius: 0.5rem; + box-shadow: 0 1.75px 0 1.25px rgba(0, 0, 0, 0.1); display: flex; flex-flow: row wrap; flex: 1; @@ -98,7 +99,8 @@ export const ItemWrapper = styled(motion.div)` > * { background: var(--background-floating-card); - border-radius: 1.5rem; + border-radius: 0.5rem; + box-shadow: 0 1.75px 0 1.25px rgba(0, 0, 0, 0.1); flex: 1; padding: 1.5rem; display: flex; diff --git a/src/library/Import/Wrappers.ts b/src/library/Import/Wrappers.ts index 54f72dbe8..7135bff89 100644 --- a/src/library/Import/Wrappers.ts +++ b/src/library/Import/Wrappers.ts @@ -113,7 +113,7 @@ export const QRViewerWrapper = styled.div` .title { color: var(--accent-color-primary); - font-family: 'NeueBit-R'; + font-family: 'SF-Pro-R'; margin-bottom: 1rem; } diff --git a/src/library/ListItem/Wrappers.ts b/src/library/ListItem/Wrappers.ts index 79c645c25..5a8236e86 100644 --- a/src/library/ListItem/Wrappers.ts +++ b/src/library/ListItem/Wrappers.ts @@ -39,7 +39,7 @@ export const Wrapper = styled.div` border: none; } - border-radius: 1rem; + border-radius: 1.2rem; display: flex; flex-flow: row wrap; align-items: center; @@ -50,6 +50,7 @@ export const Wrapper = styled.div` left: 0px; width: 100%; height: 100%; + box-shadow: 0 1.25px 0 1.75px rgba(0, 0, 0, 0.1); .row { flex: 1 0 100%; @@ -118,8 +119,8 @@ export const Labels = styled.div` } &.canvas button { - background: none; - border: 1px solid var(--border-secondary-color); + background: --grid-color-primary: #ebebeb; + // border: 1px solid var(--border-secondary-color); } .label { diff --git a/src/library/Modal/Wrappers.ts b/src/library/Modal/Wrappers.ts index 44bf68894..dc6921417 100644 --- a/src/library/Modal/Wrappers.ts +++ b/src/library/Modal/Wrappers.ts @@ -32,7 +32,7 @@ export const TitleWrapper = styled.div<{ $fixed: boolean }>` > h2 { display: flex; align-items: center; - font-family: 'NeueBit-R', 'sans-serif', sans-serif; + font-family: 'SF-Pro-R', 'sans-serif', sans-serif; font-size: 2.3rem; margin: 0; diff --git a/src/library/NetworkBar/Wrappers.ts b/src/library/NetworkBar/Wrappers.ts index ce9f2c195..ecc68c4e2 100644 --- a/src/library/NetworkBar/Wrappers.ts +++ b/src/library/NetworkBar/Wrappers.ts @@ -13,7 +13,7 @@ export const Wrapper = styled.div` bottom: 0px; left: 0px; overflow: hidden; - z-index: 6; + z-index: 7; backdrop-filter: blur(4px); position: relative; padding-top: 0.15rem; diff --git a/src/library/Notifications/Wrapper.ts b/src/library/Notifications/Wrapper.ts index d014dbf1e..71e33bd37 100644 --- a/src/library/Notifications/Wrapper.ts +++ b/src/library/Notifications/Wrapper.ts @@ -5,7 +5,7 @@ import styled from 'styled-components'; export const Wrapper = styled.ul` position: fixed; - top: 0; + bottom: 10px; right: 0; display: flex; flex-direction: column; @@ -23,8 +23,8 @@ export const Wrapper = styled.ul` flex-flow: column wrap; justify-content: center; cursor: pointer; - overflow: hidden; width: 375px; + box-shadow: 0 1.75px 0 1.25px rgba(0, 0, 0, 0.1); h3 { color: var(--accent-color-primary); diff --git a/src/library/Pool/Rewards.tsx b/src/library/Pool/Rewards.tsx index 11ac4d90e..2bfafa817 100644 --- a/src/library/Pool/Rewards.tsx +++ b/src/library/Pool/Rewards.tsx @@ -132,7 +132,7 @@ export const RewardsGraph = ({ points = [], syncing }: RewardsGraphProps) => { key={`line_coord_${index}`} strokeWidth={5} opacity={1} - stroke="var(--accent-color-tertiary)" + stroke="var(--grid-color-primary)" x1={x1} y1={y1} x2={x2} @@ -151,7 +151,7 @@ export const RewardsGraph = ({ points = [], syncing }: RewardsGraphProps) => { stroke={ zero ? 'var(--text-color-tertiary)' - : 'var(--accent-color-secondary)' + : 'var(--accent-color-stroke)' } x1={x1} y1={y1} diff --git a/src/library/Prompt/Wrappers.ts b/src/library/Prompt/Wrappers.ts index c3d76a3a4..2243034af 100644 --- a/src/library/Prompt/Wrappers.ts +++ b/src/library/Prompt/Wrappers.ts @@ -5,6 +5,7 @@ import styled from 'styled-components'; export const PromptWrapper = styled.div` background: var(--overlay-background-color); + backdrop-filter: blur(1.4rem); position: fixed; width: 100%; height: 100%; @@ -49,10 +50,11 @@ export const HeightWrapper = styled.div<{ size: string }>` z-index: 9; position: relative; overflow: auto; + box-shadow: 0 1.75px 0 1.25px rgba(0, 0, 0, 0.1); `; export const ContentWrapper = styled.div` - background: var(--background-default); + background: #fff; width: 100%; height: auto; overflow: hidden; @@ -103,7 +105,7 @@ export const TitleWrapper = styled.div` > h2 { display: flex; align-items: center; - font-family: 'NeueBit-R', 'sans-serif', sans-serif; + font-family: 'SF-Pro-R', 'sans-serif', sans-serif; font-size: 1.3rem; > button { diff --git a/src/library/SideMenu/Secondary/Wrappers.ts b/src/library/SideMenu/Secondary/Wrappers.ts index 4deceeaeb..77880afd1 100644 --- a/src/library/SideMenu/Secondary/Wrappers.ts +++ b/src/library/SideMenu/Secondary/Wrappers.ts @@ -6,7 +6,7 @@ import styled from 'styled-components'; import type { MinimisedProps } from '../types'; export const Wrapper = styled(motion.button)` - border: 1px solid var(--border-primary-color); + border: 1px solid var(--custom-side-button-border); border-radius: 0.7rem; height: 3.2rem; display: flex; @@ -18,7 +18,7 @@ export const Wrapper = styled(motion.button)` width: 100%; .name { - color: var(--text-color-primary); + color: #fff; font-family: InterSemiBold, sans-serif; font-size: 1.1rem; } @@ -35,10 +35,10 @@ export const Wrapper = styled(motion.button)` } &.active { - background: var(--highlight-primary); + background: #262a2d; } &.inactive:hover { - background: var(--highlight-secondary); + background: #262a2d; } &.success { border: 1px solid var(--status-success-color-transparent); diff --git a/src/library/SideMenu/Wrapper.ts b/src/library/SideMenu/Wrapper.ts index 1f230562f..ba7c434ca 100644 --- a/src/library/SideMenu/Wrapper.ts +++ b/src/library/SideMenu/Wrapper.ts @@ -83,7 +83,7 @@ export const LogoWrapper = styled.button` `; export const Separator = styled.div` - border-bottom: 1px solid var(--border-primary-color); + border-bottom: 1px solid transparent; width: 100%; margin: 1rem 1rem 0.5rem 0; `; diff --git a/src/library/SideMenu/index.tsx b/src/library/SideMenu/index.tsx index 78f82f400..d215174c3 100644 --- a/src/library/SideMenu/index.tsx +++ b/src/library/SideMenu/index.tsx @@ -85,7 +85,7 @@ export const SideMenu = () => { minimised={sideMenuMinimised} icon={{ Svg: ResourcesSVG, - size: sideMenuMinimised ? '1.4em' : '1.2em', + size: sideMenuMinimised ? '18' : '18', }} /> { minimised={sideMenuMinimised} icon={{ Svg: FeedbackSVG, - size: sideMenuMinimised ? '1.4em' : '1.2em', + size: sideMenuMinimised ? '18' : '18', }} /> @@ -105,7 +105,7 @@ export const SideMenu = () => { onClick={() => openModal({ key: 'Networks' })} icon={{ Svg: networkData.brand.inline.svg, - size: networkData.brand.inline.size, + size: '12.6', }} minimised={sideMenuMinimised} action={ diff --git a/src/library/Stat/index.tsx b/src/library/Stat/index.tsx index 2d25c096a..de6d12256 100644 --- a/src/library/Stat/index.tsx +++ b/src/library/Stat/index.tsx @@ -14,7 +14,7 @@ import { applyWidthAsPadding, minDecimalPlaces } from '@polkadot-cloud/utils'; import React, { useEffect, useLayoutEffect, useRef } from 'react'; import { useHelp } from 'contexts/Help'; import { useNotifications } from 'contexts/Notifications'; -import { useNetwork } from 'contexts/Network'; +// import { useNetwork } from 'contexts/Network'; import { Wrapper } from './Wrapper'; import type { StatAddress, StatProps } from './types'; @@ -28,9 +28,9 @@ export const Stat = ({ type = 'string', buttonType = 'primary', }: StatProps) => { - const { - brand: { token: Token }, - } = useNetwork().networkData; + // const { + // brand: { token: Token }, + // } = useNetwork().networkData; const { openHelp } = useHelp(); const { addNotification } = useNotifications(); @@ -62,13 +62,13 @@ export const Stat = ({ case 'odometer': display = (

- + /> */} span { opacity: 0.7; diff --git a/src/modals/Connect/Vault.tsx b/src/modals/Connect/Vault.tsx index 80ba50d00..a5fa0d521 100644 --- a/src/modals/Connect/Vault.tsx +++ b/src/modals/Connect/Vault.tsx @@ -40,7 +40,7 @@ export const Vault = (): React.ReactElement => { style={{ opacity: 1, color: 'var(--accent-color-primary)', - // fontFamily: 'NeueBit-R', + // fontFamily: 'SF-Pro-R', }} /> diff --git a/src/modals/Connect/index.tsx b/src/modals/Connect/index.tsx index aa6bcca8f..cb7f81854 100644 --- a/src/modals/Connect/index.tsx +++ b/src/modals/Connect/index.tsx @@ -30,13 +30,14 @@ import { ReadOnly } from './ReadOnly'; import { Vault } from './Vault'; import { ExtensionsWrapper } from './Wrappers'; +// some Extensions removed by SS-463 const desiredOrder = [ 'subwallet-js', - 'metamask-polkadot-snap', + // 'metamask-polkadot-snap', 'talisman', - 'enkrypt', - 'polkagate', - 'fearless-wallet', + // 'enkrypt', + // 'polkagate', + // 'fearless-wallet', ]; interface ExtensionItem { @@ -52,6 +53,23 @@ export const Connect = () => { const { extensionsStatus } = useExtensions(); const { replaceModal, setModalHeight, modalMaxHeight } = useOverlay().modal; + const sortOutExtensions = ( + dataArray: ExtensionItem[], + orderArray: string[] + ) => { + const resultArray: ExtensionItem[] = []; + + dataArray.forEach((item) => { + orderArray.forEach((key) => { + if (item.id === key) { + resultArray.push(item); + } + }); + }); + + return resultArray; + }; + const sortByDesiredOrder = ( dataArray: ExtensionItem[], orderArray: string[] @@ -72,10 +90,8 @@ export const Connect = () => { }); }; - const ExtensionsArray = sortByDesiredOrder( - OriginExtensionsArray, - desiredOrder - ); + let ExtensionsArray = sortOutExtensions(OriginExtensionsArray, desiredOrder); + ExtensionsArray = sortByDesiredOrder(ExtensionsArray, desiredOrder); const inNova = !!window?.walletExtension?.isNovaWallet || false; diff --git a/src/pages/Nominate/Active/ManageBond.tsx b/src/pages/Nominate/Active/ManageBond.tsx index 2ea40e940..0ad17d90b 100644 --- a/src/pages/Nominate/Active/ManageBond.tsx +++ b/src/pages/Nominate/Active/ManageBond.tsx @@ -61,7 +61,7 @@ export const ManageBond = () => { openHelp('Bonding')} />

- + {

{t('overview.balance')}

- + {

{t('overview.recentPayouts')}

- + { openHelp('Bonded in Pool')} />

- + .inner { + background: transparent !important; } -} -html, -body { - background-color: #0d0f10; + .btn-secondary:hover { + color: #fff; + } } html { body { font-family: 'SF-Pro-M', sans-serif; + background-color: #ebebeb !important; + } + + .btn-tab { + font-family: 'SF-Pro-M'; + font-weight: normal; + color: #777; + font-size: 12px; + padding: 7.5px 11px; + } + .btn-tab.active { + color: #000; } h1, @@ -53,10 +93,6 @@ html { font-family: 'SF-Pro-SB', sans-serif; } - .btn-primary { - color: black; - } - button { font-family: 'SF-Pro-SB', sans-serif; } @@ -76,6 +112,11 @@ html { } } +.core-entry h5 { + opacity: 1 !important; + color: var(--accent-color-primary) !important; +} + // Patch .core-page-title { margin-bottom: 1rem; @@ -87,17 +128,53 @@ html { .core-page-title h1, .modal-custom-header > div.first h1 { - font-family: 'NeueBit-B' !important; + font-family: 'SF-Pro-SB' !important; +} + +.modal-content { + padding: 5rem 5px; +} + +.modal-content h1 { + font-family: 'SF-Pro-SB' !important; + font-size: 30px !important; } .core-page-title h1 { - font-size: 40px !important; + font-size: 30px !important; + line-height: initial; } .modal-custom-header > div.first h1 { - font-size: 40px !important; + font-size: 30px !important; } .inner > .row:last-child > div > div > div { color: var(--text-color-secondary); } + +.modal-card { + box-shadow: 0 1.25px 0 1.75px rgba(0, 0, 0, 0.1); + border-radius: 1.2rem; +} + +.modal-card h2.title { + font-family: 'SF-Pro-SB' !important; + font-weight: normal; + font-size: 15px; +} + +.modal-scroll { + padding: 5px; + box-sizing: content-box; +} + +.modal-action-item .toggle { + border-color: var(--accent-color-primary); + background: #fff; + color: var(--accent-color-primary); +} + +.modal-fixed-title.with-style { + background: transparent !important; +}