Skip to content

Commit

Permalink
Merge pull request #272 from lidofinance/feat/local-fonts
Browse files Browse the repository at this point in the history
feat: get rid of google fonts api
  • Loading branch information
AnnaSila authored Oct 14, 2024
2 parents 001ac46 + 7615e2a commit c8bf56a
Show file tree
Hide file tree
Showing 8 changed files with 55 additions and 20 deletions.
2 changes: 1 addition & 1 deletion modules/globalStyles/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const GlobalStyle = createGlobalStyle`
}
b {
font-weight: 600;
font-weight: 800;
}
html.html-scroll-lock {
Expand Down
30 changes: 30 additions & 0 deletions modules/shared/ui/UiProvider/index.tsx

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions modules/stonks/ui/StonksOrderCard/StonksOrderCardStyle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export const Row = styled(Text).attrs({
gap: 4px;
&:last-child {
font-weight: 600;
font-weight: 800;
}
}
`
Expand Down Expand Up @@ -133,5 +133,5 @@ export const MessageBox = styled.div`
export const Link = styled.a`
color: ${({ theme }) => theme.colors.primary};
text-decoration: none;
font-weight: 600;
font-weight: 800;
`
2 changes: 1 addition & 1 deletion modules/wallet/ui/WalletModal/WalletModalStyle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ export const Address = styled.div`
margin-left: ${({ theme }) => theme.spaceMap.sm}px;
font-size: ${({ theme }) => theme.fontSizesMap.lg}px;
line-height: 1.2em;
font-weight: 600;
font-weight: 800;
`
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
"prom-client": "14.0.1",
"react": "^17",
"react-dom": "^17",
"react-helmet-async": "^2.0.5",
"react-hook-form": "7.27.1",
"react-use": "17.3.2",
"reef-knot": "^1.8.0",
Expand Down
13 changes: 4 additions & 9 deletions pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,7 @@ import { useErrorMessage } from 'modules/blockChain/hooks/useErrorMessage'
import { useSupportedChains } from 'reef-knot/web3-react'
import { PageLayout } from 'modules/shared/ui/Layout/PageLayout'
import { GlobalStyle } from 'modules/globalStyles'
import {
toast,
ThemeProvider,
themeLight,
ToastContainer,
ToastError,
} from '@lidofinance/lido-ui'
import { toast, ToastContainer, ToastError } from '@lidofinance/lido-ui'
import { ConfigProvider } from 'modules/config/providers/configProvider'
import { ModalProvider } from 'modules/modal/ModalProvider'
import { NetworkSwitcher } from 'modules/blockChain/ui/NetworkSwitcher'
Expand All @@ -22,6 +16,7 @@ import { withCsp } from 'modules/shared/utils/csp'
import { CustomAppProps } from 'modules/shared/utils/utilTypes'
import { AppProviderWeb3 } from 'modules/appProviderWeb3'
import { AppWagmiConfig } from 'modules/appWagmiConfig'
import { UiProvider } from 'modules/shared/ui/UiProvider'

const basePath = getConfig().publicRuntimeConfig.basePath || ''

Expand Down Expand Up @@ -105,7 +100,7 @@ const AppRootMemo = memo(AppRoot)

function App({ envConfig, ...appProps }: CustomAppProps) {
return (
<ThemeProvider theme={themeLight}>
<UiProvider>
<GlobalStyle />
<ConfigProvider envConfig={envConfig}>
<AppWagmiConfig>
Expand All @@ -116,7 +111,7 @@ function App({ envConfig, ...appProps }: CustomAppProps) {
</AppProviderWeb3>
</AppWagmiConfig>
</ConfigProvider>
</ThemeProvider>
</UiProvider>
)
}

Expand Down
7 changes: 1 addition & 6 deletions pages/_document.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,7 @@ export default class MyDocument extends Document {
render() {
return (
<Html>
<Head>
<link
href="https://fonts.googleapis.com/css2?family=Manrope:wght@500;800&display=swap"
rel="stylesheet"
/>
</Head>
<Head />
<body>
<Main />
<NextScript />
Expand Down
16 changes: 15 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7827,7 +7827,7 @@ internal-slot@^1.0.3, internal-slot@^1.0.4:
has "^1.0.3"
side-channel "^1.0.4"

invariant@2, invariant@^2.2.2:
invariant@2, invariant@^2.2.2, invariant@^2.2.4:
version "2.2.4"
resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
Expand Down Expand Up @@ -10145,6 +10145,20 @@ react-dom@^17, react-dom@^17.0.2:
object-assign "^4.1.1"
scheduler "^0.20.2"

react-fast-compare@^3.2.2:
version "3.2.2"
resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.2.tgz#929a97a532304ce9fee4bcae44234f1ce2c21d49"
integrity sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==

react-helmet-async@^2.0.5:
version "2.0.5"
resolved "https://registry.yarnpkg.com/react-helmet-async/-/react-helmet-async-2.0.5.tgz#cfc70cd7bb32df7883a8ed55502a1513747223ec"
integrity sha512-rYUYHeus+i27MvFE+Jaa4WsyBKGkL6qVgbJvSBoX8mbsWoABJXdEO0bZyi0F6i+4f0NuIb8AvqPMj3iXFHkMwg==
dependencies:
invariant "^2.2.4"
react-fast-compare "^3.2.2"
shallowequal "^1.1.0"

[email protected]:
version "7.27.1"
resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.27.1.tgz#fe5fbcb6bf58751f66d9569e998d671480cc57f6"
Expand Down

0 comments on commit c8bf56a

Please sign in to comment.