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

Update font Euclid #1694

Merged
merged 6 commits into from
Jul 22, 2020
Merged

Update font Euclid #1694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
27cff51
Update to new fonts and fix bold style on android
andrepimenta Jul 10, 2020
1bc36bc
Removed Circular font from project
andrepimenta Jul 14, 2020
e99915d
Merge branch 'develop' into feature/update-fonts-euclid
andrepimenta Jul 14, 2020
81a46f6
Update tests
andrepimenta Jul 14, 2020
08beed0
Merge branch 'develop' into feature/update-fonts-euclid
andrepimenta Jul 22, 2020
d8b857f
fix tests
andrepimenta Jul 22, 2020
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
Binary file removed android/app/src/main/assets/fonts/CircularStd-Black.otf
View file
Open in desktop
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/CircularStd-BlackItalic.otf
View file
Open in desktop
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/CircularStd-Bold.otf
View file
Open in desktop
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/CircularStd-BoldItalic.otf
View file
Open in desktop
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/CircularStd-Book.otf
View file
Open in desktop
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/CircularStd-BookItalic.otf
View file
Open in desktop
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/CircularStd-Medium.otf
View file
Open in desktop
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/CircularStd-MediumItalic.otf
View file
Open in desktop
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/EuclidCircularB-Bold.otf
View file
Open in desktop
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/EuclidCircularB-BoldItalic.otf
View file
Open in desktop
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/EuclidCircularB-Light.otf
View file
Open in desktop
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/EuclidCircularB-LightItalic.otf
View file
Open in desktop
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/EuclidCircularB-Medium.otf
View file
Open in desktop
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/EuclidCircularB-MediumItalic.otf
View file
Open in desktop
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/EuclidCircularB-Regular.otf
View file
Open in desktop
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/EuclidCircularB-RegularItalic.otf
View file
Open in desktop
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/EuclidCircularB-Semibold.otf
View file
Open in desktop
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/EuclidCircularB-SemiboldItalic.otf
View file
Open in desktop
Binary file not shown.
40 changes: 24 additions & 16 deletions android/link-assets-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,44 @@
"migIndex": 1,
"data": [
{
"path": "app/fonts/CircularStd-Black.otf",
"sha1": "c3151c999f79358f3a091222ebefcd4d436cbe8e"
"path": "app/fonts/EuclidCircularB-Bold.otf",
"sha1": "7c2a5137fdc62618d404ac0cb54f8e732cc43161"
},
{
"path": "app/fonts/CircularStd-BlackItalic.otf",
"sha1": "2e263d71f8fcbd12f3a02e7c01df6a865f68acce"
"path": "app/fonts/EuclidCircularB-BoldItalic.otf",
"sha1": "77ee92e4787cdf77c2226b9d68fe5374505bd1d0"
},
{
"path": "app/fonts/CircularStd-Bold.otf",
"sha1": "2a36de6df85e4da5c22d26a427fd7390ad32840f"
"path": "app/fonts/EuclidCircularB-Light.otf",
"sha1": "21fd3c7c27918511ef81a5e695ce93e6ff631c0b"
},
{
"path": "app/fonts/CircularStd-BoldItalic.otf",
"sha1": "1496c0d9ea9622abc43231fbc83bf08099053926"
"path": "app/fonts/EuclidCircularB-LightItalic.otf",
"sha1": "6f4e697f65c6d82caf50a31fed1539f3aef733b7"
},
{
"path": "app/fonts/CircularStd-Book.otf",
"sha1": "a67856765459bf64a0a1259b6621613edd717ff9"
"path": "app/fonts/EuclidCircularB-Medium.otf",
"sha1": "0a2cdb45ab1ce34570c534738f651ac7c57f6030"
},
{
"path": "app/fonts/CircularStd-BookItalic.otf",
"sha1": "6ba07b4856b40f621a080196730051ee4d921ae8"
"path": "app/fonts/EuclidCircularB-MediumItalic.otf",
"sha1": "fe33bcd91e81d7af20132b4ce1ac5918a11a6626"
},
{
"path": "app/fonts/CircularStd-Medium.otf",
"sha1": "29b0a9af2e480ffb9d45de38a44f1c21a002adc9"
"path": "app/fonts/EuclidCircularB-Regular.otf",
"sha1": "53316f985467975048f477e4afb784ef64b32e84"
},
{
"path": "app/fonts/CircularStd-MediumItalic.otf",
"sha1": "fdce946f1649c046388806513c4eed1c45852da2"
"path": "app/fonts/EuclidCircularB-RegularItalic.otf",
"sha1": "d9f41cb3b281386fc07d8210a8d32b6a8965b91c"
},
{
"path": "app/fonts/EuclidCircularB-Semibold.otf",
"sha1": "bc129f9126a356707aa8a50e585cb075fd1740e9"
},
{
"path": "app/fonts/EuclidCircularB-SemiboldItalic.otf",
"sha1": "77f2e0212711cc8e043acabdc4bd4a264dfeeeb7"
},
{
"path": "app/fonts/Metamask.ttf",
Expand Down
4 changes: 2 additions & 2 deletions app/components/UI/AccountApproval/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ exports[`AccountApproval should render correctly 1`] = `
style={
Object {
"color": "#000000",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Bold",
"fontSize": 20,
"fontWeight": "600",
"marginBottom": 8,
Expand All @@ -41,7 +41,7 @@ exports[`AccountApproval should render correctly 1`] = `
style={
Object {
"color": "#000000",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 14,
"fontWeight": "100",
"marginBottom": 16,
Expand Down
6 changes: 3 additions & 3 deletions app/components/UI/AccountInfoCard/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ exports[`AccountInfoCard should render correctly 1`] = `
style={
Object {
"color": "#000000",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Bold",
"fontSize": 16,
"fontWeight": "600",
"marginRight": 2,
Expand All @@ -62,7 +62,7 @@ exports[`AccountInfoCard should render correctly 1`] = `
Object {
"color": "#000000",
"flexGrow": 1,
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Bold",
"fontSize": 16,
"fontWeight": "600",
}
Expand All @@ -79,7 +79,7 @@ exports[`AccountInfoCard should render correctly 1`] = `
Object {
"alignSelf": "flex-start",
"color": "#000000",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 14,
"fontWeight": "100",
}
Expand Down
12 changes: 6 additions & 6 deletions app/components/UI/AddCustomCollectible/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ exports[`AddCustomCollectible should render correctly 1`] = `
<Text
style={
Object {
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontWeight": "400",
}
}
Expand All @@ -53,7 +53,7 @@ exports[`AddCustomCollectible should render correctly 1`] = `
"borderColor": "#d6d9dc",
"borderRadius": 4,
"borderWidth": 1,
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontWeight": "400",
"padding": 16,
},
Expand All @@ -67,7 +67,7 @@ exports[`AddCustomCollectible should render correctly 1`] = `
style={
Object {
"color": "#D73A49",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontWeight": "400",
"marginTop": 15,
}
Expand All @@ -85,7 +85,7 @@ exports[`AddCustomCollectible should render correctly 1`] = `
<Text
style={
Object {
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontWeight": "400",
}
}
Expand All @@ -106,7 +106,7 @@ exports[`AddCustomCollectible should render correctly 1`] = `
"borderColor": "#d6d9dc",
"borderRadius": 4,
"borderWidth": 1,
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontWeight": "400",
"padding": 16,
},
Expand All @@ -120,7 +120,7 @@ exports[`AddCustomCollectible should render correctly 1`] = `
style={
Object {
"color": "#D73A49",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontWeight": "400",
"marginTop": 15,
}
Expand Down
18 changes: 9 additions & 9 deletions app/components/UI/AddCustomToken/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ exports[`AddCustomToken should render correctly 1`] = `
<Text
style={
Object {
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontWeight": "400",
}
}
Expand All @@ -54,7 +54,7 @@ exports[`AddCustomToken should render correctly 1`] = `
"borderColor": "#d6d9dc",
"borderRadius": 4,
"borderWidth": 1,
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontWeight": "400",
"padding": 16,
}
Expand All @@ -66,7 +66,7 @@ exports[`AddCustomToken should render correctly 1`] = `
style={
Object {
"color": "#D73A49",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontWeight": "400",
"marginTop": 15,
}
Expand All @@ -84,7 +84,7 @@ exports[`AddCustomToken should render correctly 1`] = `
<Text
style={
Object {
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontWeight": "400",
}
}
Expand All @@ -103,7 +103,7 @@ exports[`AddCustomToken should render correctly 1`] = `
"borderColor": "#d6d9dc",
"borderRadius": 4,
"borderWidth": 1,
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontWeight": "400",
"padding": 16,
}
Expand All @@ -115,7 +115,7 @@ exports[`AddCustomToken should render correctly 1`] = `
style={
Object {
"color": "#D73A49",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontWeight": "400",
"marginTop": 15,
}
Expand All @@ -132,7 +132,7 @@ exports[`AddCustomToken should render correctly 1`] = `
<Text
style={
Object {
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontWeight": "400",
}
}
Expand All @@ -153,7 +153,7 @@ exports[`AddCustomToken should render correctly 1`] = `
"borderColor": "#d6d9dc",
"borderRadius": 4,
"borderWidth": 1,
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontWeight": "400",
"padding": 16,
}
Expand All @@ -165,7 +165,7 @@ exports[`AddCustomToken should render correctly 1`] = `
style={
Object {
"color": "#D73A49",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontWeight": "400",
"marginTop": 15,
}
Expand Down
6 changes: 3 additions & 3 deletions app/components/UI/AssetActionButtons/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ exports[`AssetActionButtons should render correctly 1`] = `
style={
Object {
"color": "#037dd6",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 11,
"fontWeight": "400",
"marginTop": 12,
Expand Down Expand Up @@ -129,7 +129,7 @@ exports[`AssetActionButtons should render correctly 1`] = `
style={
Object {
"color": "#037dd6",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 11,
"fontWeight": "400",
"marginTop": 12,
Expand Down Expand Up @@ -183,7 +183,7 @@ exports[`AssetActionButtons should render correctly 1`] = `
style={
Object {
"color": "#037dd6",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 11,
"fontWeight": "400",
"marginTop": 12,
Expand Down
2 changes: 1 addition & 1 deletion app/components/UI/AssetSearch/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ exports[`AssetSearch should render correctly 1`] = `
style={
Array [
Object {
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontWeight": "400",
},
Object {
Expand Down
18 changes: 9 additions & 9 deletions app/components/UI/CollectibleContractInformation/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ exports[`CollectibleContractInformation should render correctly 1`] = `
style={
Object {
"color": "#000000",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Bold",
"fontSize": 18,
"fontWeight": "600",
"marginHorizontal": 20,
Expand Down Expand Up @@ -54,7 +54,7 @@ exports[`CollectibleContractInformation should render correctly 1`] = `
style={
Object {
"borderColor": "#d6d9dc",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Bold",
"fontWeight": "600",
"marginTop": 0,
}
Expand All @@ -66,7 +66,7 @@ exports[`CollectibleContractInformation should render correctly 1`] = `
style={
Object {
"color": "#848c96",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 16,
"fontWeight": "400",
"paddingTop": 10,
Expand All @@ -87,7 +87,7 @@ exports[`CollectibleContractInformation should render correctly 1`] = `
style={
Object {
"borderColor": "#d6d9dc",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Bold",
"fontWeight": "600",
"marginTop": 0,
}
Expand All @@ -99,7 +99,7 @@ exports[`CollectibleContractInformation should render correctly 1`] = `
style={
Object {
"color": "#848c96",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 16,
"fontWeight": "400",
"paddingTop": 10,
Expand All @@ -120,7 +120,7 @@ exports[`CollectibleContractInformation should render correctly 1`] = `
style={
Object {
"borderColor": "#d6d9dc",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Bold",
"fontWeight": "600",
"marginTop": 0,
}
Expand All @@ -133,7 +133,7 @@ exports[`CollectibleContractInformation should render correctly 1`] = `
Array [
Object {
"color": "#848c96",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 16,
"fontWeight": "400",
"paddingTop": 10,
Expand Down Expand Up @@ -177,7 +177,7 @@ exports[`CollectibleContractInformation should render correctly 1`] = `
style={
Object {
"color": "#777777",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 8,
"fontWeight": "300",
"marginTop": 4,
Expand Down Expand Up @@ -234,7 +234,7 @@ exports[`CollectibleContractInformation should render correctly 1`] = `
style={
Object {
"color": "#037dd6",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 16,
"fontWeight": "400",
}
Expand Down
2 changes: 1 addition & 1 deletion app/components/UI/CollectibleContractOverview/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ exports[`CollectibleContractOverview should render correctly 1`] = `
style={
Object {
"color": "#000000",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 30,
"fontWeight": "400",
"textAlign": "center",
Expand Down
6 changes: 3 additions & 3 deletions app/components/UI/CollectibleContracts/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ exports[`CollectibleContracts should render correctly 1`] = `
style={
Object {
"color": "#000000",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 16,
"fontWeight": "400",
}
Expand All @@ -68,7 +68,7 @@ exports[`CollectibleContracts should render correctly 1`] = `
style={
Object {
"color": "#848c96",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 12,
"fontWeight": "400",
}
Expand Down Expand Up @@ -112,7 +112,7 @@ exports[`CollectibleContracts should render correctly 1`] = `
style={
Object {
"color": "#037dd6",
"fontFamily": "CircularStd-Medium",
"fontFamily": "EuclidCircularB-Regular",
"fontSize": 15,
"fontWeight": "400",
}
Expand Down
Loading