diff --git a/packages/extension-ui/src/Popup/Accounts/Account.tsx b/packages/extension-ui/src/Popup/Accounts/Account.tsx index c0017965..689644c6 100644 --- a/packages/extension-ui/src/Popup/Accounts/Account.tsx +++ b/packages/extension-ui/src/Popup/Accounts/Account.tsx @@ -161,7 +161,6 @@ export default styled(Account)` .menuItem { border-radius: 8px; display: block; - font-weight: 600; font-size: 15px; line-height: 20px; margin: 0; diff --git a/packages/extension-ui/src/Popup/Signing/TransactionIndex.tsx b/packages/extension-ui/src/Popup/Signing/TransactionIndex.tsx index ed008aa2..8929ada7 100644 --- a/packages/extension-ui/src/Popup/Signing/TransactionIndex.tsx +++ b/packages/extension-ui/src/Popup/Signing/TransactionIndex.tsx @@ -70,7 +70,6 @@ export default styled(TransactionIndex)(({ theme }: ThemeProps) => ` color: ${theme.primaryColor}; font-size: ${theme.labelFontSize}; line-height: ${theme.labelLineHeight}; - font-weight: 600; margin-left: 10px; } @@ -78,6 +77,5 @@ export default styled(TransactionIndex)(({ theme }: ThemeProps) => ` font-size: ${theme.labelFontSize}; line-height: ${theme.labelLineHeight}; color: ${theme.textColor}; - font-weight: 600; } `); diff --git a/packages/extension-ui/src/assets/fonts/Nunitosanslight.woff b/packages/extension-ui/src/assets/fonts/Nunitosanslight.woff deleted file mode 100644 index 04ab251c..00000000 Binary files a/packages/extension-ui/src/assets/fonts/Nunitosanslight.woff and /dev/null differ diff --git a/packages/extension-ui/src/assets/fonts/Nunitosanslight.woff2 b/packages/extension-ui/src/assets/fonts/Nunitosanslight.woff2 deleted file mode 100644 index cdf5d074..00000000 Binary files a/packages/extension-ui/src/assets/fonts/Nunitosanslight.woff2 and /dev/null differ diff --git a/packages/extension-ui/src/assets/fonts/Nunitosansregular.woff b/packages/extension-ui/src/assets/fonts/Nunitosansregular.woff deleted file mode 100644 index 1be9d287..00000000 Binary files a/packages/extension-ui/src/assets/fonts/Nunitosansregular.woff and /dev/null differ diff --git a/packages/extension-ui/src/assets/fonts/Nunitosansregular.woff2 b/packages/extension-ui/src/assets/fonts/Nunitosansregular.woff2 deleted file mode 100644 index c5c68a80..00000000 Binary files a/packages/extension-ui/src/assets/fonts/Nunitosansregular.woff2 and /dev/null differ diff --git a/packages/extension-ui/src/assets/fonts/Nunitosanssemibold.woff b/packages/extension-ui/src/assets/fonts/Nunitosanssemibold.woff deleted file mode 100644 index 50e9822c..00000000 Binary files a/packages/extension-ui/src/assets/fonts/Nunitosanssemibold.woff and /dev/null differ diff --git a/packages/extension-ui/src/assets/fonts/Nunitosanssemibold.woff2 b/packages/extension-ui/src/assets/fonts/Nunitosanssemibold.woff2 deleted file mode 100644 index 79c75410..00000000 Binary files a/packages/extension-ui/src/assets/fonts/Nunitosanssemibold.woff2 and /dev/null differ diff --git a/packages/extension-ui/src/components/Address.tsx b/packages/extension-ui/src/components/Address.tsx index 373672a7..dd9a93fe 100644 --- a/packages/extension-ui/src/components/Address.tsx +++ b/packages/extension-ui/src/components/Address.tsx @@ -305,7 +305,6 @@ export default styled(Address)(({ theme }: ThemeProps) => ` .name { font-size: 16px; - font-weight: 600; line-height: 22px; margin: 2px 0; overflow: hidden; @@ -320,7 +319,6 @@ export default styled(Address)(({ theme }: ThemeProps) => ` .parentName { color: ${theme.labelColor}; font-size: 10px; - font-weight: 600; line-height: 14px; overflow: hidden; padding: 0.25rem 0 0 0.8rem; diff --git a/packages/extension-ui/src/components/Button.tsx b/packages/extension-ui/src/components/Button.tsx index 541cab57..a949f376 100644 --- a/packages/extension-ui/src/components/Button.tsx +++ b/packages/extension-ui/src/components/Button.tsx @@ -55,7 +55,6 @@ export default styled(Button)(({ isDanger, theme }: Props) => ` border-radius: ${theme.borderRadius}; color: ${theme.buttonTextColor}; font-size: 15px; - font-weight: 800; line-height: 20px; padding: 0 1rem; position: relative; diff --git a/packages/extension-ui/src/components/ButtonWithSubtitle.tsx b/packages/extension-ui/src/components/ButtonWithSubtitle.tsx index 7adee1e7..879b4419 100644 --- a/packages/extension-ui/src/components/ButtonWithSubtitle.tsx +++ b/packages/extension-ui/src/components/ButtonWithSubtitle.tsx @@ -30,14 +30,12 @@ const StyledButton = styled(Button)` p { margin: 0; - font-weight: 800; font-size: 15px; line-height: 20px; } span { display: block; - font-weight: 600; font-size: 12px; line-height: 16px; } diff --git a/packages/extension-ui/src/components/Dropdown.tsx b/packages/extension-ui/src/components/Dropdown.tsx index 7c0363da..3c72e44e 100644 --- a/packages/extension-ui/src/components/Dropdown.tsx +++ b/packages/extension-ui/src/components/Dropdown.tsx @@ -75,7 +75,6 @@ export default React.memo(styled(Dropdown)(({ isError, theme }: Props) => ` display: block; font-family: ${theme.fontFamily}; font-size: ${theme.fontSize}; - font-weight: 600; padding: 0.5rem 0.75rem; width: 100%; cursor: pointer; diff --git a/packages/extension-ui/src/components/Fonts.ts b/packages/extension-ui/src/components/Fonts.ts deleted file mode 100644 index 91862dc7..00000000 --- a/packages/extension-ui/src/components/Fonts.ts +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2019-2020 @polkadot/extension-ui authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import { createGlobalStyle } from 'styled-components'; - -import NunitosansregularWoff2 from '../assets/fonts/Nunitosansregular.woff2'; -import NunitosansregularWoff from '../assets/fonts/Nunitosansregular.woff'; -import NunitosanssemiboldWoff2 from '../assets/fonts/Nunitosanssemibold.woff2'; -import NunitosanssemiboldWoff from '../assets/fonts/Nunitosanssemibold.woff'; -import NunitosanslightWoff2 from '../assets/fonts/Nunitosanslight.woff2'; -import NunitosanslightWoff from '../assets/fonts/Nunitosanslight.woff'; - -export default createGlobalStyle` - @font-face { - font-family: 'Nunito'; - src: url(${NunitosanslightWoff2}) format('woff2'), - url(${NunitosanslightWoff}) format('woff'); - font-weight: 400; - font-style: normal; - } - @font-face { - font-family: 'Nunito'; - src: url(${NunitosansregularWoff2}) format('woff2'), - url(${NunitosansregularWoff}) format('woff'); - font-weight: 600; - font-style: normal; - } - @font-face { - font-family: 'Nunito'; - src: url(${NunitosanssemiboldWoff2}) format('woff2'), - url(${NunitosanssemiboldWoff}) format('woff'); - font-weight: 800; - font-style: normal; - } -`; diff --git a/packages/extension-ui/src/components/Label.tsx b/packages/extension-ui/src/components/Label.tsx index 3d364422..37d9e0bd 100644 --- a/packages/extension-ui/src/components/Label.tsx +++ b/packages/extension-ui/src/components/Label.tsx @@ -28,7 +28,6 @@ export default styled(Label)(({ theme }: ThemeProps) => ` font-size: 10px; line-height: 14px; letter-spacing: 0.04em; - font-weight: 800; opacity: 0.65; margin-bottom: 12px; text-transform: uppercase; diff --git a/packages/extension-ui/src/components/MenuItem.tsx b/packages/extension-ui/src/components/MenuItem.tsx index a3c43f7c..bb2a4de1 100644 --- a/packages/extension-ui/src/components/MenuItem.tsx +++ b/packages/extension-ui/src/components/MenuItem.tsx @@ -32,7 +32,6 @@ export default styled(MenuItem)(({ theme }: ThemeProps) => ` > .itemTitle { margin: 0; width: 100%; - font-weight: 800; font-size: 10px; line-height: 14px; letter-spacing: 0.04em; diff --git a/packages/extension-ui/src/components/Switch.tsx b/packages/extension-ui/src/components/Switch.tsx index fae74dcf..543ad38c 100644 --- a/packages/extension-ui/src/components/Switch.tsx +++ b/packages/extension-ui/src/components/Switch.tsx @@ -46,10 +46,6 @@ export default styled(Switch)(({ theme }: ThemeProps) => ` margin: 8px; } - span { - font-weight: 600; - } - .checkbox { opacity: 0; width: 0; diff --git a/packages/extension-ui/src/components/TextInputs.ts b/packages/extension-ui/src/components/TextInputs.ts index 8f5f9a2f..70016004 100644 --- a/packages/extension-ui/src/components/TextInputs.ts +++ b/packages/extension-ui/src/components/TextInputs.ts @@ -19,7 +19,6 @@ const TextInput = css(({ theme, withError }: Props) => ` display: block; font-family: ${theme.fontFamily}; font-size: ${theme.fontSize}; - font-weight: 600; height: 40px; outline: none; padding: 0.5rem 0.75rem; diff --git a/packages/extension-ui/src/components/index.ts b/packages/extension-ui/src/components/index.ts index 16a0b73d..38367b24 100644 --- a/packages/extension-ui/src/components/index.ts +++ b/packages/extension-ui/src/components/index.ts @@ -12,7 +12,6 @@ export { default as ButtonWithSubtitle } from './ButtonWithSubtitle'; export { default as Checkbox } from './Checkbox'; export { default as Dropdown } from './Dropdown'; export { default as ErrorBoundary } from './ErrorBoundary'; -export { default as Fonts } from './Fonts'; export { default as Icon } from './Icon'; export { default as Identicon } from './Identicon'; export { default as InputWithLabel } from './InputWithLabel'; diff --git a/packages/extension-ui/src/createView.tsx b/packages/extension-ui/src/createView.tsx index 86ca8b10..0af8a40b 100644 --- a/packages/extension-ui/src/createView.tsx +++ b/packages/extension-ui/src/createView.tsx @@ -5,7 +5,7 @@ import React, { Suspense } from 'react'; import ReactDOM from 'react-dom'; import { HashRouter } from 'react-router-dom'; -import { Fonts, View } from './components'; +import { View } from './components'; import './i18n/i18n'; @@ -18,7 +18,6 @@ export default function createView (Entry: React.ComponentType, rootId = 'root') ReactDOM.render( - diff --git a/packages/extension-ui/src/partials/HeaderWithSteps.tsx b/packages/extension-ui/src/partials/HeaderWithSteps.tsx index fd27d822..f8de764e 100644 --- a/packages/extension-ui/src/partials/HeaderWithSteps.tsx +++ b/packages/extension-ui/src/partials/HeaderWithSteps.tsx @@ -46,7 +46,6 @@ export default React.memo(styled(HeaderWithSteps)(({ theme }: Props) => ` font-size: ${theme.labelFontSize}; line-height: ${theme.labelLineHeight}; color: ${theme.primaryColor}; - font-weight: 600; } .steps { @@ -63,6 +62,5 @@ export default React.memo(styled(HeaderWithSteps)(({ theme }: Props) => ` font-size: ${theme.labelFontSize}; line-height: ${theme.labelLineHeight}; color: ${theme.textColor}; - font-weight: 600; } `)); diff --git a/packages/extension-ui/src/partials/MenuSettings.tsx b/packages/extension-ui/src/partials/MenuSettings.tsx index db9d4083..6280e148 100644 --- a/packages/extension-ui/src/partials/MenuSettings.tsx +++ b/packages/extension-ui/src/partials/MenuSettings.tsx @@ -146,7 +146,6 @@ export default React.memo(styled(MenuSettings)(({ theme }: Props) => ` span { color: ${theme.textColor}; font-size: ${theme.fontSize}; - font-weight: 600; line-height: ${theme.lineHeight}; text-decoration: none; } @@ -164,7 +163,6 @@ export default React.memo(styled(MenuSettings)(({ theme }: Props) => ` color: ${theme.textColor}; line-height: 20px; font-size: 15px; - font-weight: 600; margin-bottom: 0; label { diff --git a/packages/extension/public/fonts/fonts.css b/packages/extension/public/fonts/fonts.css new file mode 100644 index 00000000..1e70af46 --- /dev/null +++ b/packages/extension/public/fonts/fonts.css @@ -0,0 +1,12 @@ +@font-face { + font-family: 'Nunito'; + src: url('./nunito-sans-v6-vietnamese_latin-ext_latin-regular.eot'); /* IE9 Compat Modes */ + src: local('Nunito Sans Regular'), local('NunitoSans-Regular'), + url('./nunito-sans-v6-vietnamese_latin-ext_latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('./nunito-sans-v6-vietnamese_latin-ext_latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ + url('./nunito-sans-v6-vietnamese_latin-ext_latin-regular.woff') format('woff'), /* Modern Browsers */ + url('./nunito-sans-v6-vietnamese_latin-ext_latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ + url('./nunito-sans-v6-vietnamese_latin-ext_latin-regular.svg#NunitoSans') format('svg'); /* Legacy iOS */ + font-weight: 400; + font-style: normal; +} diff --git a/packages/extension/public/fonts/nunito-sans-v6-vietnamese_latin-ext_latin-regular.eot b/packages/extension/public/fonts/nunito-sans-v6-vietnamese_latin-ext_latin-regular.eot new file mode 100644 index 00000000..659c850e Binary files /dev/null and b/packages/extension/public/fonts/nunito-sans-v6-vietnamese_latin-ext_latin-regular.eot differ diff --git a/packages/extension/public/fonts/nunito-sans-v6-vietnamese_latin-ext_latin-regular.svg b/packages/extension/public/fonts/nunito-sans-v6-vietnamese_latin-ext_latin-regular.svg new file mode 100644 index 00000000..37c64fd4 --- /dev/null +++ b/packages/extension/public/fonts/nunito-sans-v6-vietnamese_latin-ext_latin-regular.svg @@ -0,0 +1,308 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/extension/public/fonts/nunito-sans-v6-vietnamese_latin-ext_latin-regular.ttf b/packages/extension/public/fonts/nunito-sans-v6-vietnamese_latin-ext_latin-regular.ttf new file mode 100644 index 00000000..0c732209 Binary files /dev/null and b/packages/extension/public/fonts/nunito-sans-v6-vietnamese_latin-ext_latin-regular.ttf differ diff --git a/packages/extension/public/fonts/nunito-sans-v6-vietnamese_latin-ext_latin-regular.woff b/packages/extension/public/fonts/nunito-sans-v6-vietnamese_latin-ext_latin-regular.woff new file mode 100644 index 00000000..d4b9b5f3 Binary files /dev/null and b/packages/extension/public/fonts/nunito-sans-v6-vietnamese_latin-ext_latin-regular.woff differ diff --git a/packages/extension/public/fonts/nunito-sans-v6-vietnamese_latin-ext_latin-regular.woff2 b/packages/extension/public/fonts/nunito-sans-v6-vietnamese_latin-ext_latin-regular.woff2 new file mode 100644 index 00000000..9b8a8d68 Binary files /dev/null and b/packages/extension/public/fonts/nunito-sans-v6-vietnamese_latin-ext_latin-regular.woff2 differ diff --git a/packages/extension/public/index.html b/packages/extension/public/index.html index 8dc3fb4a..fa77749f 100644 --- a/packages/extension/public/index.html +++ b/packages/extension/public/index.html @@ -3,6 +3,7 @@ polkadot{.js} +