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

Add monospace font #432

Merged
merged 4 commits into from
May 3, 2019
Merged

Add monospace font #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
02f08ed
add monospace font
SebastienGllmt May 2, 2019
28a3fa8
fix up letter spacing
SebastienGllmt May 2, 2019
132a95c
change remaining to monospace
SebastienGllmt May 2, 2019
8b3ef6b
fix missing monospace on modern theme
SebastienGllmt May 2, 2019
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 added app/assets/fonts/RobotoMono-Bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added app/assets/fonts/RobotoMono-Light.ttf
View file
Open in desktop
Binary file not shown.
Binary file added app/assets/fonts/RobotoMono-Medium.ttf
View file
Open in desktop
Binary file not shown.
Binary file added app/assets/fonts/RobotoMono-Regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file added app/assets/fonts/RobotoMono-Thin.ttf
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion app/components/transfer/TransferSummaryPage.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@
}

.address {
font-family: var(--font-light);
font-family: var(--font-mono-light);
letter-spacing: 0;
line-height: 1.38;
margin-top: 6px;
opacity: 0.5;
Expand Down
11 changes: 8 additions & 3 deletions app/components/wallet/WalletReceive.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,11 @@
font-size: 14px;
justify-content: space-between;
line-height: 19px;
letter-spacing: 0;

.hash {
font-size: 17px;
font-family: var(--font-medium);
font-size: 14px;
font-family: var(--font-mono-medium);
line-height: 23px;
margin-bottom: 6px;
word-break: break-all;
Expand Down Expand Up @@ -163,7 +164,7 @@
display: flex;
align-items: center;
font-size: 14px;
font-family: var(--font-medium);
font-family: var(--font-mono-medium);
line-height: 1.57;
margin-bottom: 6px;
word-break: break-all;
Expand Down Expand Up @@ -275,8 +276,10 @@
}

.addressId {
font-family: var(--font-mono-regular);
flex-grow: 1;
margin-right: 32.5px;
letter-spacing: 0;
}

.addressActions {
Expand Down Expand Up @@ -355,8 +358,10 @@
}

.addressId {
font-family: var(--font-mono-regular);
flex-grow: 1;
margin-right: 32.5px;
letter-spacing: 0;
color: var(--theme-transactions-received-address-color);
}

Expand Down
3 changes: 2 additions & 1 deletion app/components/wallet/receive/AddressDetailsDialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
}

.infoBlock {
font-family: var(--font-regular);
font-family: var(--font-mono-regular);
letter-spacing: 0;
font-size: 15px;
opacity: 0.7;
text-align: center;
Expand Down
3 changes: 2 additions & 1 deletion app/components/wallet/send/HWSendConfirmationDialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@
}

.addressTo {
font-family: var(--font-light);
font-family: var(--font-mono-light);
letter-spacing: 0;
font-size: 15px;
line-height: 1.38;
margin-top: 6px;
Expand Down
5 changes: 4 additions & 1 deletion app/components/wallet/send/WalletSendConfirmationDialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
}

.addressTo {
font-family: var(--font-light);
font-family: var(--font-mono-light);
letter-spacing: 0;
font-size: 15px;
line-height: 1.38;
margin-top: 6px;
Expand Down Expand Up @@ -130,6 +131,8 @@
}

.addressTo {
font-family: var(--font-mono-regular);
letter-spacing: 0;
font-size: 14px;
line-height: 1.57;
margin-top: 2px;
Expand Down
23 changes: 21 additions & 2 deletions app/components/wallet/send/WalletSendForm.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,34 @@
padding: 30px;
}

.amountInputClassic,
.amountInputClassic {
position: relative;
margin-bottom: 10px;
}
.receiverInputClassic {
position: relative;
margin-bottom: 10px;
:global {
.SimpleInput_input {
font-family: var(--font-mono-light);
letter-spacing: 0;
}
}
}

.amountInput,
.amountInput {
position: relative;
margin-bottom: 10px;
}
.receiverInput {
letter-spacing: 0;
position: relative;
:global {
.SimpleInput_input {
font-family: var(--font-mono-regular);
letter-spacing: 0;
}
}
}

.adaLabel {
Expand Down
2 changes: 1 addition & 1 deletion app/components/wallet/transactions/Transaction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ export default class Transaction extends Component<Props, State> {
) : null}

<h2>{intl.formatMessage(messages.transactionId)}</h2>
<span>{data.id}</span>
<span className={styles.address}>{data.id}</span>
</div>
</div>
</div>
Expand Down
4 changes: 4 additions & 0 deletions app/components/wallet/transactions/Transaction.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,8 @@
&.address {
display: block;
line-height: 19px;
font-family: var(--font-mono-light);
letter-spacing: 0;
}
}
}
Expand All @@ -324,6 +326,8 @@
&.address {
display: block;
line-height: 19px;
font-family: var(--font-mono-regular);
letter-spacing: 0;
}
}
}
Expand Down
9 changes: 6 additions & 3 deletions app/stores/toplevel/ProfileStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import globalMessages from '../../i18n/global-messages';

export default class SettingsStore extends Store {


LANGUAGE_OPTIONS = [
{ value: 'en-US', label: globalMessages.languageEnglish, svg: require('../../assets/images/flags/english.inline.svg') },
{ value: 'ja-JP', label: globalMessages.languageJapanese, svg: require('../../assets/images/flags/japanese.inline.svg') },
Expand All @@ -21,8 +20,12 @@ export default class SettingsStore extends Store {
{ value: 'ru-RU', label: globalMessages.languageRussian, svg: require('../../assets/images/flags/russian.inline.svg') },
{ value: 'de-DE', label: globalMessages.languageGerman, svg: require('../../assets/images/flags/german.inline.svg') },
{ value: 'fr-FR', label: globalMessages.languageFrench, svg: require('../../assets/images/flags/french.inline.svg') },
!environment.isMainnet() && { value: 'id-ID', label: globalMessages.languageIndonesian, svg: require('../../assets/images/flags/indonesian.inline.svg') },
!environment.isMainnet() && { value: 'es-ES', label: globalMessages.languageSpanish, svg: require('../../assets/images/flags/spanish.inline.svg') },
...(!environment.isMainnet()
? [
{ value: 'id-ID', label: globalMessages.languageIndonesian, svg: require('../../assets/images/flags/indonesian.inline.svg') },
{ value: 'es-ES', label: globalMessages.languageSpanish, svg: require('../../assets/images/flags/spanish.inline.svg') },
]
: [])
];

@observable bigNumberDecimalFormat = {
Expand Down
37 changes: 37 additions & 0 deletions app/themes/index.global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ button {

// ============ FONTS ===========

// SFUIDisplay

@font-face {
font-family: 'SFUIDisplay-Ultralight';
src: url("../assets/fonts/SFUIDisplay-Ultralight.otf") format("opentype");
Expand Down Expand Up @@ -111,16 +113,22 @@ button {
src: url("../assets/fonts/SFUIDisplay-Black.otf") format("opentype");
}

// Electrolize

@font-face {
font-family: Electrolize, 'Electrolize-Regular';
src: url("../assets/fonts/Electrolize-Regular.ttf") format("truetype");
}

// Montserrat

@font-face {
font-family: 'Montserrat-Medium';
src: url("../assets/fonts/Montserrat-Medium.ttf") format("truetype");
}

// Rubik

@font-face {
font-family: 'Rubik-Light';
src: url("../assets/fonts/Rubik-Light.ttf") format("opentype");
Expand All @@ -146,11 +154,40 @@ button {
src: url("../assets/fonts/Rubik-Black.ttf") format("opentype");
}

// Helvetica

@font-face {
font-family: 'Helvetica-Regular';
src: url("../assets/fonts/Helvetica-Regular.otf") format("opentype");
}

// RobotoMono

@font-face {
font-family: 'RobotoMono-Thin';
src: url("../assets/fonts/RobotoMono-Thin.ttf") format("opentype");
}

@font-face {
font-family: 'RobotoMono-Light';
src: url("../assets/fonts/RobotoMono-Light.ttf") format("opentype");
}

@font-face {
font-family: 'RobotoMono-Regular';
src: url("../assets/fonts/RobotoMono-Regular.ttf") format("opentype");
}

@font-face {
font-family: 'RobotoMono-Medium';
src: url("../assets/fonts/RobotoMono-Medium.ttf") format("opentype");
}

@font-face {
font-family: 'RobotoMono-Bold';
src: url("../assets/fonts/RobotoMono-Bold.ttf") format("opentype");
}

// ============ BASE ===========

html, body, #root, #root > [data-reactroot] {
Expand Down
6 changes: 6 additions & 0 deletions app/themes/prebuilt/YoroiClassic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,12 @@ export default {
'--font-heavy': 'SFUIDisplay-Heavy',
'--font-black': 'SFUIDisplay-Black',

'--font-mono-thin': 'RobotoMono-Thin',
'--font-mono-light': 'RobotoMono-Light',
'--font-mono-regular': 'RobotoMono-Regular',
'--font-mono-medium': 'RobotoMono-Medium',
'--font-mono-bold': 'RobotoMono-Bold',

'--theme-input-hint-font': 'SFUIDisplay-Regular',

'--theme-scrollbar-thumb-background': '#c8ccce',
Expand Down
6 changes: 6 additions & 0 deletions app/themes/prebuilt/YoroiModern.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,12 @@ export default {
'--font-heavy': 'Rubik-Bold',
'--font-black': 'Rubik-Black',

'--font-mono-thin': 'RobotoMono-Thin',
'--font-mono-light': 'RobotoMono-Light',
'--font-mono-regular': 'RobotoMono-Regular',
'--font-mono-medium': 'RobotoMono-Medium',
'--font-mono-bold': 'RobotoMono-Bold',

'--theme-input-hint-font': 'Rubik-Regular',
'--theme-footer-text-font': 'Helvetica-Regular',

Expand Down