Skip to content

Commit

Permalink
Merge branch 'master' into mxc-geneva
Browse files Browse the repository at this point in the history
  • Loading branch information
Mr.Mao committed Apr 3, 2024
2 parents 914bc60 + 897588e commit eea1ce9
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ STABLE_MODE=500
NEXT_PUBLIC_PROVIDER=https://geneva-rpc.moonchain.com
NEXT_PUBLIC_DEPLOYMENT_ADDRESSES={"ENSRegistry":"0x9691E2eFb8C7f6d714A7b35da3184b8cB927a415","PublicResolver":"0xd241E9681B22Ae47e94c523d25CDdC1a4960cDC3","BaseRegistrarImplementation":"0xcf83cFaB3E0755557136d5f43860C304d24ccac1","NameWrapper":"0xCE5e3c318BFC7c2dee486cF7c62Ba95feFd6d2bD","ETHRegistrarController":"0x231cFEAE98514F825740707Fb0C95BBf8C526AB1","BulkRenewal":"0x7cA72a22d34C4A1236E087218430E9D6c4360386","DNSRegister":"0x8Ac21Cc278B67BbBc079CA1987F83c21F271734F","ReverseRegistrar":"0x8Ac21Cc278B67BbBc079CA1987F83c21F271734F","UniversalResolver":"0x207CD63fbf5717e8ae0b311102a99601757D840F","Multicall":"0xa7AE33E9aEFc8d4abC8e0E6898a00C8C88BeAC94"}
NEXT_PUBLIC_GRAPH_URI=https://geneva-graph-node.moonchain.com/subgraphs/name/mnsdomains/mns
MEP1002_ADDR=0x181eC6Bc420FAEce0228c91936938F438F2a33df
MEP1002_ADDR=0x181eC6Bc420FAEce0228c91936938F438F2a33df
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
"@ethersproject/units": "^5.7.0",
"@ethersproject/web": "^5.7.1",
"@hairy/browser-utils": "^0.2.5",
"@moonchain/metadata": "^0.0.5",
"@rainbow-me/rainbowkit": "0.12.7",
"@svgr/webpack": "^6.3.1",
"@tanstack/query-persist-client-core": "4.14.5",
Expand Down
7 changes: 7 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ const Label = styled.label<{ $highlighted?: boolean }>(
font-size: ${$highlighted ? theme.fontSizes.headingTwo : theme.fontSizes.large};
line-height: ${theme.space['11']};
text-align: center;
color: #6300ff;
color: #2196F3;
pointer-events: none;
opacity: 1;
transition: opacity 150ms ease-in-out;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const calcPercent = (percent: number, order: number) => {
const Bar = styled.div<{ $highlightPercent: number }>(
({ theme, $highlightPercent }) => css`
--bar-width: calc(${$highlightPercent}% - ${theme.space['1']});
background: linear-gradient(90deg, #6300ff var(--bar-width), #b63d29 var(--bar-width));
background: linear-gradient(90deg, #2196F3 var(--bar-width), #b63d29 var(--bar-width));
width: 100%;
height: ${theme.space['4']};
border-radius: ${theme.radii.medium};
Expand Down Expand Up @@ -62,7 +62,7 @@ const Marker = styled.div<{ $percent: number }>(
border-radius: ${theme.radii.medium};
background-color: ${theme.colors.background};
&:last-of-type {
background-color: #6300ff;
background-color: #2196F3;
color: ${theme.colors.background};
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ export const Header = () => {
</BaseLink>
)}
>
<MXCLOGO height={space['12']} width="100" />
<span className='spacex' style={{color: '#fff'}}>MOONCHAIN</span>
</ConditionalWrapper>
{router.asPath !== '/' && breakpoints.sm && (
<>
Expand Down
13 changes: 7 additions & 6 deletions src/pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { chains, wagmiClient } from '@app/utils/query'

import i18n from '../i18n'
import '../styles.css'
import "@moonchain/metadata/style.css"

const rainbowKitTheme: Theme = {
...lightTheme({
Expand Down Expand Up @@ -73,7 +74,7 @@ const GlobalStyle = createGlobalStyle`
body {
// background: radial-gradient(50% 50% at 50% 50%, rgba(82, 152, 255, 0.062) 0%, rgba(255, 255, 255, 0) 100%), #F7F7F7;
background: #2a0f69;
background: #101010;
}
body, .min-safe {
Expand All @@ -86,19 +87,19 @@ const GlobalStyle = createGlobalStyle`
}
button.connect-button {
background-color: #f43178;
background-color: #2196F3;
&:hover {
background: #f43178;
background: #2196F3;
}
}
button.action-button {
background: #6300ff;
background: #2196F3;
&:hover {
background: #6300ff;
background: #2196F3;
}
}
.theme-text {
color: #6300ff;
color: #2196F3;
}
a {
Expand Down
13 changes: 1 addition & 12 deletions src/pages/_document.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,7 @@ export default class MyDocument extends Document {
</>
)}
<link rel="apple-touch-icon" sizes="256x256" href={makeIPFSURL('/icon/AppIcon.png')} />
<link
rel="icon"
type="image/png"
sizes="32x32"
href={makeIPFSURL('/favicon-32x32.png')}
/>
<link
rel="icon"
type="image/png"
sizes="16x16"
href={makeIPFSURL('/favicon-16x16.png')}
/>
<link rel="icon" href="https://raw.githubusercontent.com/MXCzkEVM/metadata/main/logo-circle.svg" />
<link rel="manifest" href={makeIPFSURL('/manifest.webmanifest')} />
<link rel="manifest" href={makeIPFSURL('/manifest.json')} />
<link rel="mask-icon" href={makeIPFSURL('/safari-pinned-tab.svg')} color="#5bbad5" />
Expand Down
4 changes: 2 additions & 2 deletions src/pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ export default function Page() {
{/* This script will check all MXC operations and if the system experiences any downtime It will notify with a small notification */}
<script src="https://mxc.instatus.com/en/13076080/widget/script.js" async />
</Head>
<SupportButton />
{/* <SupportButton /> */}
<StyledLeadingHeading>
<LogoAndLanguage>
<StyledENS as={ENSFull} />
<span className='spacex' style={{color: '#fff', fontSize: '14px'}}>MOONCHAIN</span>
</LogoAndLanguage>
<Hamburger />
</StyledLeadingHeading>
Expand Down
2 changes: 1 addition & 1 deletion src/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@


.helpbox {
border: 1px solid #f43178 !important;
border: 1px solid #2196F3 !important;
background-color: rgba(244,49,120,.08) !important;
}

0 comments on commit eea1ce9

Please sign in to comment.