Skip to content

Commit 0d18304

Browse files
RafaelVidaurreRafaelVidaurre
authored
Merge pull request #554 from PolymathNetwork/fix/overpass-font
fix(new-ui): adjust fontweight to Stan style + remove useless fontweight
2 parents 896f40f + fd989ac commit 0d18304

10 files changed

Lines changed: 69 additions & 69 deletions

File tree

‎packages/new-polymath-ui/src/components/ProgressIndicator/__tests__/__snapshots__/ProgressIndicator.tsx.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ exports[`ProgressIndicator renders without crashing 1`] = `
4747
margin-bottom: 0;
4848
margin-left: calc(1.6em / 2);
4949
margin-top: 0;
50-
font-weight: 500;
50+
font-weight: 400;
5151
line-height: 1.5;
5252
font-size: inherit;
5353
overflow-wrap: break-word;

‎packages/new-polymath-ui/src/components/Table/__tests__/__snapshots__/Table.tsx.snap‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ exports[`Table renders without crashing 1`] = `
105105
transition-property: background,color,border-color,opacity;
106106
font-family: 'Overpass',sans-serif;
107107
font-size: 0.875rem;
108-
font-weight: 500;
108+
font-weight: 400;
109109
background-color: transparent;
110110
border-color: transparent;
111111
color: currentColor;
@@ -211,7 +211,7 @@ exports[`Table renders without crashing 1`] = `
211211
align-items: center;
212212
padding: 0.6em;
213213
height: 48px;
214-
font-weight: 500;
214+
font-weight: 400;
215215
}
216216
217217
.c4:first-child {
@@ -257,7 +257,7 @@ exports[`Table renders without crashing 1`] = `
257257
transition-property: background,color,border-color,opacity;
258258
font-family: 'Overpass',sans-serif;
259259
font-size: 0.875rem;
260-
font-weight: 500;
260+
font-weight: 400;
261261
padding: 0;
262262
background: none;
263263
text-transform: none;
@@ -346,7 +346,7 @@ exports[`Table renders without crashing 1`] = `
346346
transition-property: background,color,border-color,opacity;
347347
font-family: 'Overpass',sans-serif;
348348
font-size: 0.875rem;
349-
font-weight: 500;
349+
font-weight: 400;
350350
background-color: transparent;
351351
border-color: transparent;
352352
color: currentColor;
@@ -422,7 +422,7 @@ exports[`Table renders without crashing 1`] = `
422422
transition-property: background,color,border-color,opacity;
423423
font-family: 'Overpass',sans-serif;
424424
font-size: 0.875rem;
425-
font-weight: 500;
425+
font-weight: 400;
426426
background-color: transparent;
427427
border-color: transparent;
428428
color: currentColor;
@@ -1871,7 +1871,7 @@ exports[`Table renders without crashing 1`] = `
18711871
class="css-6o5gw2"
18721872
>
18731873
<div
1874-
class="css-1crx08z"
1874+
class="css-1fdx8t6"
18751875
>
18761876
10
18771877
</div>
@@ -1956,7 +1956,7 @@ exports[`Table renders without crashing 1`] = `
19561956
class="css-6o5gw2"
19571957
>
19581958
<div
1959-
class="css-1crx08z"
1959+
class="css-1fdx8t6"
19601960
>
19611961
1
19621962
</div>

‎packages/new-polymath-ui/src/styles/GlobalStyles.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export const GlobalStyles = createGlobalStyle`
3535
}
3636
3737
strong {
38-
font-weight: ${({ theme }) => theme.fontWeights.strong};
38+
font-weight: ${({ theme }) => theme.fontWeights.bolder};
3939
}
4040
4141
button,

‎packages/new-polymath-ui/src/styles/theme.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,9 @@ const lineHeights = {
3737
};
3838

3939
const fontWeights = {
40-
light: 200,
4140
normal: 300,
42-
bold: 500,
43-
strong: 600,
41+
bold: 400,
42+
bolder: 600,
4443
};
4544

4645
const space: Scale<string> = {

‎packages/polymath-issuer/src/pages/ticker/components/ReserveTickerForm.js‎

Lines changed: 44 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import React from 'react';
44

55
import { Form, Button } from 'carbon-components-react';
6-
import { FormItem, TextInput, Tooltip } from '@polymathnetwork/ui';
6+
import { FormItem, TextInput, Tooltip, Grid } from '@polymathnetwork/ui';
77
import { reserve } from '../../../actions/ticker';
88

99
import { connect } from 'react-redux';
@@ -60,50 +60,52 @@ const formSchema = validator.object().shape({
6060

6161
export const ReserveTickerFormComponent = ({ handleSubmit }) => (
6262
<Form onSubmit={handleSubmit}>
63-
<div className="ticker-field">
64-
<FormItem name="ticker">
65-
<FormItem.Label>Enter Token Symbol</FormItem.Label>
66-
<FormItem.Input
67-
component={TextInput}
68-
placeholder="Up to 10 characters (example: TORO-A)"
69-
/>
63+
<Grid>
64+
<div className="ticker-field">
65+
<FormItem name="ticker">
66+
<FormItem.Label>Enter Token Symbol</FormItem.Label>
67+
<FormItem.Input
68+
component={TextInput}
69+
placeholder="Up to 10 characters (example: TORO-A)"
70+
/>
71+
<FormItem.Error />
72+
</FormItem>
73+
</div>
74+
75+
<FormItem name="name">
76+
<FormItem.Label>
77+
<Tooltip triggerText="Token Name">
78+
<p>
79+
<strong>Token Name</strong>
80+
</p>
81+
<p>
82+
This is the name of your token for display purposes.
83+
<br />
84+
For example: Toro Token
85+
</p>
86+
</Tooltip>
87+
</FormItem.Label>
88+
<FormItem.Input component={TextInput} placeholder="Enter Token Name" />
7089
<FormItem.Error />
7190
</FormItem>
72-
</div>
73-
74-
<FormItem name="name">
75-
<FormItem.Label>
76-
<Tooltip triggerText="Token Name">
77-
<p>
78-
<strong>Token Name</strong>
79-
</p>
80-
<p>
81-
This is the name of your token for display purposes.
82-
<br />
83-
For example: Toro Token
84-
</p>
85-
</Tooltip>
86-
</FormItem.Label>
87-
<FormItem.Input component={TextInput} placeholder="Enter Token Name" />
88-
<FormItem.Error />
89-
</FormItem>
90-
91-
<FormItem name="owner">
92-
<FormItem.Label>
93-
<Tooltip triggerText="Issuer's ETH Address">
94-
<p>
95-
<strong>Issuer&apos;s ETH Address</strong>
96-
</p>
97-
<p>
98-
This ETH address was read from your MetaMask. Only this account will
99-
be able to access dashboard and complete token issuance and STO.
100-
</p>
101-
</Tooltip>
102-
</FormItem.Label>
103-
<FormItem.Input component={TextInput} disabled />
104-
<FormItem.Error />
105-
</FormItem>
10691

92+
<FormItem name="owner">
93+
<FormItem.Label>
94+
<Tooltip triggerText="Issuer's ETH Address">
95+
<p>
96+
<strong>Issuer&apos;s ETH Address</strong>
97+
</p>
98+
<p>
99+
This ETH address was read from your MetaMask. Only this account
100+
will be able to access dashboard and complete token issuance and
101+
STO.
102+
</p>
103+
</Tooltip>
104+
</FormItem.Label>
105+
<FormItem.Input component={TextInput} disabled />
106+
<FormItem.Error />
107+
</FormItem>
108+
</Grid>
107109
<Button type="submit">Reserve token symbol</Button>
108110
<p className="pui-input-hint">
109111
By registering your token symbol with Polymath you agree to our&nbsp;

‎packages/polymath-issuer/src/style.scss‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
// TODO @bshevchenko: extract into the @polymathnetwork/ui
2323
.ticker-field {
2424
background: #ebf0f7;
25-
padding: 12px 48px;
26-
margin-bottom: 1.5rem;
25+
padding: 12px 48px 40px 48px;
2726
margin-top: 24px;
2827
text-align: center;
2928
border-radius: 4px;

‎packages/polymath-ui/src/components/Heading/__tests__/__snapshots__/Heading.js.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ exports[`renders without crashing 1`] = `
66
line-height: 1.5;
77
color: #152935;
88
font-size: 1.25rem;
9-
font-weight: 600;
9+
font-weight: 400;
1010
}
1111
1212
<h2

‎packages/polymath-ui/src/deprecated/styles/globals.scss‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,23 @@ $css--body: false;
3030
.pui-h0 {
3131
color: $poly-blue;
3232
font-size: 52px;
33-
font-weight: 600;
33+
font-weight: 400;
3434
line-height: 68px;
3535
margin-bottom: 10px;
3636
}
3737

3838
.pui-h1 {
3939
color: $poly-blue;
4040
font-size: 36px;
41-
font-weight: 600;
41+
font-weight: 400;
4242
line-height: 55px;
4343
margin-bottom: 6px;
4444
}
4545

4646
.pui-h2 {
4747
color: $poly-blue;
4848
font-size: 26px;
49-
font-weight: 600;
49+
font-weight: 400;
5050
line-height: 42px;
5151
margin-bottom: 6px;
5252

@@ -58,23 +58,23 @@ $css--body: false;
5858
.pui-h3 {
5959
color: $poly-gray-dark;
6060
font-size: 20px;
61-
font-weight: 400;
61+
font-weight: 300;
6262
line-height: 30px;
6363
margin-bottom: 6px;
6464
}
6565

6666
.pui-h4 {
6767
color: $poly-gray-dark;
6868
font-size: 16px;
69-
font-weight: 400;
69+
font-weight: 300;
7070
line-height: 24px;
7171
margin-bottom: 6px;
7272
}
7373

7474
.pui-h5 {
7575
color: $poly-gray-dark;
7676
font-size: 14px;
77-
font-weight: 400;
77+
font-weight: 300;
7878
line-height: 22px;
7979
margin-bottom: 6px;
8080
}
@@ -331,7 +331,7 @@ $css--body: false;
331331
margin-bottom: 8px;
332332

333333
color: $poly-blue-dark;
334-
font-weight: 600;
334+
font-weight: 400;
335335
}
336336

337337
span {
@@ -371,7 +371,7 @@ $css--body: false;
371371
margin-top: 12px;
372372

373373
a {
374-
font-weight: 600;
374+
font-weight: 400;
375375
}
376376
}
377377

‎packages/polymath-ui/src/styles/GlobalStyles.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const GlobalStyles = createGlobalStyle`
2525
}
2626
2727
strong {
28-
font-weight: ${({ theme }) => theme.fontWeights.bold};
28+
font-weight: ${({ theme }) => theme.fontWeights.bolder};
2929
}
3030
3131
img {

‎packages/polymath-ui/src/styles/theme.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ const lineHeights = {
2828
};
2929

3030
const fontWeights = {
31-
light: 300,
32-
normal: 400,
33-
bold: 600,
31+
normal: 300,
32+
bold: 400,
33+
bolder: 600,
3434
};
3535

3636
const space = [

0 commit comments

Comments
 (0)