status-im/safe-react
2
0
Fork 0
mirror of https://github.com/status-im/safe-react.git synced 2025-02-20 13:38:25 +00:00
Code Issues Projects Releases Wiki Activity

add averta font

Browse Source
This commit is contained in:
Mikhail Mikheev 2019-08-29 12:35:52 +04:00
parent b08e0215dc
commit 7b921e84de
16 changed files with 51 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.storybook/preview-head.html
View File

@ -1,3 +1 @@
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,500" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Roboto+Mono:400,500,700" rel="stylesheet">
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons"> <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">

1
config/webpack.config.dev.js
View File

@ -116,6 +116,7 @@ module.exports = {
}, },
], ],
}, },
{ test: /\.(woff|woff2)$/, loader: 'url-loader?limit=100000' },
{ {
test: /\.html$/, test: /\.html$/,
use: [ use: [

1
config/webpack.config.prod.js
View File

@ -148,6 +148,7 @@ module.exports = {
}, },
], ],
}, },
{ test: /\.(woff|woff2)$/, loader: 'url-loader?limit=100000' },
{ {
test: /\.(jpe?g|png|svg)$/i, test: /\.(jpe?g|png|svg)$/i,
exclude: /node_modules/, exclude: /node_modules/,

1
package.json
View File

@ -136,6 +136,7 @@
"truffle-contract": "4.0.30", "truffle-contract": "4.0.30",
"truffle-solidity-loader": "0.1.32", "truffle-solidity-loader": "0.1.32",
"uglifyjs-webpack-plugin": "2.2.0", "uglifyjs-webpack-plugin": "2.2.0",
"url-loader": "^2.1.0",
"webpack": "4.39.3", "webpack": "4.39.3",
"webpack-bundle-analyzer": "3.4.1", "webpack-bundle-analyzer": "3.4.1",
"webpack-cli": "3.3.7", "webpack-cli": "3.3.7",

12
public/index.html
View File

@ -4,22 +4,10 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="favicon.ico"> <link rel="shortcut icon" href="favicon.ico">
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,500" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Roboto+Mono:400,500,700" rel="stylesheet">
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons"> <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<title>Multisig Safe</title> <title>Multisig Safe</title>
</head> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.
To begin the development, run `npm start`.
To create a production bundle, use `npm run build`.
-->
</body> </body>
</html> </html>

BIN
src/assets/fonts/Averta-ExtraBold.woff2 Normal file
View File

Binary file not shown.

BIN
src/assets/fonts/Averta-normal.woff2 Normal file
View File

Binary file not shown.

2
src/components/Header/component/ProviderInfo/ProviderAccesible.jsx
View File

@ -19,7 +19,7 @@ type Props = {
const styles = () => ({ const styles = () => ({
network: { network: {
fontFamily: 'Montserrat, sans-serif', fontFamily: 'Averta, sans-serif',
}, },
logo: { logo: {
height: '15px', height: '15px',

6
src/components/Header/component/ProviderInfo/ProviderDisconnected.jsx
View File

@ -14,7 +14,7 @@ type Props = Open & {
const styles = () => ({ const styles = () => ({
network: { network: {
fontFamily: 'Montserrat, sans-serif', fontFamily: 'Averta, sans-serif',
}, },
account: { account: {
paddingRight: sm, paddingRight: sm,
@ -30,7 +30,7 @@ const styles = () => ({
}) })
const ProviderDesconnected = ({ classes }: Props) => ( const ProviderDesconnected = ({ classes }: Props) => (
<React.Fragment> <>
<CircleDot keySize={17} circleSize={35} dotSize={16} dotTop={24} dotRight={11} mode="error" /> <CircleDot keySize={17} circleSize={35} dotSize={16} dotTop={24} dotRight={11} mode="error" />
<Col end="sm" middle="xs" layout="column" className={classes.account}> <Col end="sm" middle="xs" layout="column" className={classes.account}>
<Paragraph size="sm" transform="capitalize" className={classes.network} noMargin weight="bold"> <Paragraph size="sm" transform="capitalize" className={classes.network} noMargin weight="bold">
@ -40,7 +40,7 @@ const ProviderDesconnected = ({ classes }: Props) => (
Connect Wallet Connect Wallet
</Paragraph> </Paragraph>
</Col> </Col>
</React.Fragment> </>
) )
export default withStyles(styles)(ProviderDesconnected) export default withStyles(styles)(ProviderDesconnected)

27
src/components/Root/index.scss
View File

@ -1,8 +1,25 @@
html, body { html,
body {
height: 100%; height: 100%;
width: 100%; width: 100%;
} }
@font-face {
font-family: "Averta";
font-style: normal;
font-weight: 400;
font-display: swap;
src: local("Averta-Regular"), url(../../assets/fonts/Averta-normal.woff2) format('woff2');
}
@font-face {
font-family: 'Averta';
font-style: normal;
font-weight: 800;
font-display: swap;
src: local("Averta-Extrabold"), url(../../assets/fonts/Averta-ExtraBold.woff2) format('woff2');
}
body { body {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
@ -11,7 +28,7 @@ body {
right: 0; right: 0;
overflow-x: hidden; overflow-x: hidden;
color: $fontColor; color: $fontColor;
font-family: 'Roboto Mono', monospace; font-family: 'Averta', monospace;
font-size: $mediumFontSize; font-size: $mediumFontSize;
margin: 0; margin: 0;
background-color: $background; background-color: $background;
@ -20,11 +37,7 @@ body {
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
body>div:first-child { body > div:first-child {
display: flex; display: flex;
min-height: 100%; min-height: 100%;
} }
h1, h2, h3 {
font-family: 'Montserrat', sans-serif;
}

1
src/components/layout/ButtonLink/index.scss
View File

@ -2,7 +2,6 @@
background: transparent; background: transparent;
border: none; border: none;
text-decoration: underline; text-decoration: underline;
font-family: 'Roboto Mono', monospace;
cursor: pointer; cursor: pointer;
} }

3
src/components/layout/Heading/index.scss
View File

@ -15,7 +15,6 @@
line-height: 28px; line-height: 28px;
font-weight: $bolderFont; font-weight: $bolderFont;
letter-spacing: -0.5px; letter-spacing: -0.5px;
font-family: 'Roboto Mono', monospace;
font-size: $(fontSizeHeadingMd)px; font-size: $(fontSizeHeadingMd)px;
} }
@ -23,13 +22,11 @@
line-height: 21px; line-height: 21px;
font-weight: $bolderFont; font-weight: $bolderFont;
letter-spacing: -0.5px; letter-spacing: -0.5px;
font-family: 'Roboto Mono', monospace;
font-size: $(fontSizeHeadingSm)px; font-size: $(fontSizeHeadingSm)px;
} }
.h4 { .h4 {
line-height: 21px; line-height: 21px;
font-family: 'Roboto Mono', monospace;
font-size: $(fontSizeHeadingXs)px; font-size: $(fontSizeHeadingXs)px;
} }

1
src/routes/safe/components/Balances/Tokens/screens/TokenList/style.js
View File

@ -62,7 +62,6 @@ export const styles = () => ({
}, },
searchRoot: { searchRoot: {
letterSpacing: '-0.5px', letterSpacing: '-0.5px',
fontFamily: 'Roboto Mono, monospace',
fontSize: '13px', fontSize: '13px',
border: 'none', border: 'none',
boxShadow: 'none', boxShadow: 'none',

1
src/routes/safe/components/Layout.jsx
View File

@ -71,7 +71,6 @@ const styles = () => ({
letterSpacing: '0.5px', letterSpacing: '0.5px',
color: '#ffffff', color: '#ffffff',
backgroundColor: '#B2B5B2', backgroundColor: '#B2B5B2',
fontFamily: 'Roboto Mono, monospace',
textTransform: 'uppercase', textTransform: 'uppercase',
padding: `0 ${sm}`, padding: `0 ${sm}`,
marginLeft: sm, marginLeft: sm,

26
src/theme/mui.js
View File

@ -39,7 +39,7 @@ const palette = {
// see https://github.com/mui-org/material-ui/blob/v1-beta/src/styles/createMuiTheme.js // see https://github.com/mui-org/material-ui/blob/v1-beta/src/styles/createMuiTheme.js
export default createMuiTheme({ export default createMuiTheme({
typography: { typography: {
fontFamily: 'Montserrat,sans-serif', fontFamily: 'Averta,sans-serif',
useNextVariants: true, useNextVariants: true,
}, },
overrides: { overrides: {
@ -48,7 +48,7 @@ export default createMuiTheme({
lineHeight: 1, lineHeight: 1,
}, },
root: { root: {
fontFamily: 'Roboto Mono, monospace', fontFamily: 'Averta, monospace',
letterSpacing: '0.9px', letterSpacing: '0.9px',
'&$disabled': { '&$disabled': {
color: disabled, color: disabled,
@ -96,7 +96,7 @@ export default createMuiTheme({
}, },
MuiChip: { MuiChip: {
root: { root: {
fontFamily: 'Roboto Mono, monospace', fontFamily: 'Averta, monospace',
}, },
}, },
MuiStepIcon: { MuiStepIcon: {
@ -119,17 +119,17 @@ export default createMuiTheme({
}, },
MuiTypography: { MuiTypography: {
body1: { body1: {
fontFamily: 'Roboto Mono, monospace', fontFamily: 'Averta, monospace',
letterSpacing: '-0.5px', letterSpacing: '-0.5px',
fontSize: mediumFontSize, fontSize: mediumFontSize,
}, },
body2: { body2: {
fontFamily: 'Roboto Mono, monospace', fontFamily: 'Averta, monospace',
}, },
}, },
MuiFormHelperText: { MuiFormHelperText: {
root: { root: {
fontFamily: 'Roboto Mono, monospace', fontFamily: 'Averta, monospace',
fontSize: '12px', fontSize: '12px',
padding: `0 0 0 ${md}`, padding: `0 0 0 ${md}`,
position: 'absolute', position: 'absolute',
@ -143,7 +143,7 @@ export default createMuiTheme({
}, },
MuiInput: { MuiInput: {
root: { root: {
fontFamily: 'Roboto Mono, monospace', fontFamily: 'Averta, monospace',
color: primary, color: primary,
fontSize: largeFontSize, fontSize: largeFontSize,
lineHeight: '56px', lineHeight: '56px',
@ -196,7 +196,7 @@ export default createMuiTheme({
}, },
MuiTab: { MuiTab: {
root: { root: {
fontFamily: 'Roboto Mono, monospace', fontFamily: 'Averta, monospace',
fontWeight: 'normal', fontWeight: 'normal',
'&$selected': { '&$selected': {
fontWeight: bolderFont, fontWeight: bolderFont,
@ -214,7 +214,7 @@ export default createMuiTheme({
top: '0px', top: '0px',
}, },
caption: { caption: {
fontFamily: 'Roboto Mono, monospace', fontFamily: 'Averta, monospace',
letterSpacing: '-0.5px', letterSpacing: '-0.5px',
order: 3, order: 3,
color: disabled, color: disabled,
@ -231,7 +231,7 @@ export default createMuiTheme({
}, },
MuiTableCell: { MuiTableCell: {
root: { root: {
fontFamily: 'Roboto Mono, monospace', fontFamily: 'Averta, monospace',
}, },
head: { head: {
letterSpacing: '1px', letterSpacing: '1px',
@ -254,7 +254,7 @@ export default createMuiTheme({
}, },
MuiMenuItem: { MuiMenuItem: {
root: { root: {
fontFamily: 'Roboto Mono, monospace', fontFamily: 'Averta, monospace',
}, },
}, },
MuiListItemIcon: { MuiListItemIcon: {
@ -264,13 +264,13 @@ export default createMuiTheme({
}, },
MuiListItemText: { MuiListItemText: {
primary: { primary: {
fontFamily: 'Roboto Mono, monospace', fontFamily: 'Averta, monospace',
fontSize: mediumFontSize, fontSize: mediumFontSize,
fontWeight: bolderFont, fontWeight: bolderFont,
color: primary, color: primary,
}, },
secondary: { secondary: {
fontFamily: 'Roboto Mono, monospace', fontFamily: 'Averta, monospace',
fontSize: smallFontSize, fontSize: smallFontSize,
color: disabled, color: disabled,
}, },

11
yarn.lock
View File

@ -11968,7 +11968,7 @@ mime@1.6.0:
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
mime@^2.0.3, mime@^2.4.2: mime@^2.0.3, mime@^2.4.2, mime@^2.4.4:
version "2.4.4" version "2.4.4"
resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5" resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA== integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
@ -17878,6 +17878,15 @@ url-loader@^1.1.2:
mime "^2.0.3" mime "^2.0.3"
schema-utils "^1.0.0" schema-utils "^1.0.0"
url-loader@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.1.0.tgz#bcc1ecabbd197e913eca23f5e0378e24b4412961"
integrity sha512-kVrp/8VfEm5fUt+fl2E0FQyrpmOYgMEkBsv8+UDP1wFhszECq5JyGF33I7cajlVY90zRZ6MyfgKXngLvHYZX8A==
dependencies:
loader-utils "^1.2.3"
mime "^2.4.4"
schema-utils "^2.0.0"
url-parse-lax@^1.0.0: url-parse-lax@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73" resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"