Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(ui): remove Apple ProSF font and replace it with google provided Inter #1541

Merged
merged 14 commits into from
Dec 15, 2023
Merged

feat(ui): remove Apple ProSF font and replace it with google provided Inter #1541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2c9588b
feat(ui): remove Apple ProSF and replace it with google provided Inter
Dec 5, 2023
508c61d
chore: remove quotes to keep consistency
Dec 5, 2023
d24b1cb
fix: use medium font
Dec 6, 2023
1fab8ab
fix: remove apple font completely
Dec 6, 2023
4d753ff
feat: add regular and semibold fonts
Dec 6, 2023
ae3bfaa
fix: get a wallet typo
tomiir Dec 12, 2023
ad26600
fix: adjust footer, transaction rows and tags fonts
tomiir Dec 12, 2023
a674f3b
Merge branch 'V3' of github.com:WalletConnect/web3modal into feat/int…
tomiir Dec 13, 2023
0326a87
Merge branch 'V3' into feat/inter-font
svenvoskamp Dec 14, 2023
9c6ab58
Merge branch 'V3' into feat/inter-font
svenvoskamp Dec 14, 2023
f26bb2d
Merge branch 'V3' into feat/inter-font
svenvoskamp Dec 14, 2023
607f055
Merge branch 'V3' of github.com:WalletConnect/web3modal into feat/int…
tomiir Dec 15, 2023
2c38a9e
Merge branch 'feat/inter-font' of github.com:WalletConnect/web3modal …
tomiir Dec 15, 2023
ab1e445
Merge branch 'V3' into feat/inter-font
tomiir Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/scaffold/src/partials/w3m-header/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function headings() {
AllWallets: 'All Wallets',
WhatIsANetwork: 'What is a network?',
WhatIsAWallet: 'What is a wallet?',
GetWallet: 'Get a Wallet',
GetWallet: 'Get a wallet',
Downloads: name ? `Get ${name}` : 'Downloads',
EmailVerifyOtp: 'Confirm Email',
EmailVerifyDevice: '',
Expand Down
2 changes: 1 addition & 1 deletion packages/scaffold/src/partials/w3m-legal-footer/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export class W3mLegalFooter extends LitElement {

return html`
<wui-flex .padding=${['m', 's', 's', 's'] as const} justifyContent="center">
<wui-text color="fg-250" variant="small-500" align="center">
<wui-text color="fg-250" variant="small-400" align="center">
By connecting your wallet, you agree to our <br />
${this.termsTemplate()} ${this.andTemplate()} ${this.privacyTemplate()}
</wui-text>
Expand Down
2 changes: 1 addition & 1 deletion packages/scaffold/src/partials/w3m-legal-footer/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ export default css`
a {
text-decoration: none;
color: var(--wui-color-fg-175);
font-weight: 600;
font-weight: 500;
}
`
2 changes: 1 addition & 1 deletion packages/scaffold/src/views/w3m-networks-view/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export class W3mNetworksView extends LitElement {
<wui-separator></wui-separator>

<wui-flex padding="s" flexDirection="column" gap="m" alignItems="center">
<wui-text variant="small-500" color="fg-300" align="center">
<wui-text variant="small-400" color="fg-300" align="center">
Your connected wallet may not support some of the networks available for this dApp
</wui-text>
<wui-link @click=${this.onNetworkHelp.bind(this)}>
Expand Down
2 changes: 1 addition & 1 deletion packages/scaffold/src/views/w3m-what-is-a-wallet-view/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export class W3mWhatIsAWalletView extends LitElement {
<w3m-help-widget .data=${data}></w3m-help-widget>
<wui-button variant="fill" size="sm" @click=${this.onGetWallet.bind(this)}>
<wui-icon color="inherit" slot="iconLeft" name="wallet"></wui-icon>
Get a Wallet
Get a wallet
</wui-button>
</wui-flex>
`
Expand Down
3 changes: 2 additions & 1 deletion packages/ui/src/utils/ThemeUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export function setThemeVariables(themeVariables: ThemeVariables) {
function createRootStyles(themeVariables?: ThemeVariables) {
return {
core: css`
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap');
:root {
--w3m-color-mix-strength: ${unsafeCSS(
themeVariables?.['--w3m-color-mix-strength']
Expand All @@ -51,7 +52,7 @@ function createRootStyles(themeVariables?: ThemeVariables) {
)};
--w3m-font-family: ${unsafeCSS(
themeVariables?.['--w3m-font-family'] ||
'-apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif'
'Inter, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;'
)};
--w3m-font-size-master: ${unsafeCSS(themeVariables?.['--w3m-font-size-master'] || '10px')};
--w3m-border-radius-master: ${unsafeCSS(
Expand Down