m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 01:39:44 +01:00
Code

Merge pull request #3470 from danjm/newui-onboarding-fonts

Browse Source 
Change fonts in new-ui onboarding to Roboto, with weight 400.
This commit is contained in:
kumavis 2018-03-13 10:44:08 -07:00 committed by GitHub
commit 1fa5cec2ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
mascara/src/app/first-time/index.css
View File

@ -1,3 +1,10 @@
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: local('Roboto'), local('Roboto-Regular'), url('/fonts/Roboto/Roboto-Regular.ttf') format('truetype');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
}
.first-time-flow { .first-time-flow {
width: 100vw; width: 100vw;
@ -6,6 +13,8 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
flex: 1 0 auto; flex: 1 0 auto;
font-weight: 400;
font-family: Roboto;
} }
.alpha-warning { .alpha-warning {
@ -180,11 +189,11 @@
color: #1B344D; color: #1B344D;
font-size: 16px; font-size: 16px;
line-height: 23px; line-height: 23px;
font-family: Montserrat UltraLight; font-family: Roboto;
} }
.buy-ether__small-body-text { .buy-ether__small-body-text {
font-family: Montserrat UltraLight; font-family: Roboto;
height: 14px; height: 14px;
color: #757575; color: #757575;
font-size: 12px; font-size: 12px;
@ -212,7 +221,7 @@
height: 334px; height: 334px;
overflow-y: auto; overflow-y: auto;
color: #757575; color: #757575;
font-family: Montserrat UltraLight; font-family: Roboto;
font-size: 12px; font-size: 12px;
line-height: 15px; line-height: 15px;
text-align: justify; text-align: justify;
@ -237,7 +246,7 @@
color: #5B5D67; color: #5B5D67;
font-size: 16px; font-size: 16px;
line-height: 23px; line-height: 23px;
font-family: Montserrat UltraLight; font-family: Roboto;
} }
.backup-phrase__secret { .backup-phrase__secret {
@ -255,7 +264,7 @@
.backup-phrase__secret-words { .backup-phrase__secret-words {
width: 310px; width: 310px;
color: #5B5D67; color: #5B5D67;
font-family: Montserrat Light; font-family: Roboto;
font-size: 20px; font-size: 20px;
line-height: 26px; line-height: 26px;
text-align: center; text-align: center;
@ -284,7 +293,7 @@
background: none; background: none;
box-shadow: none; box-shadow: none;
color: #FFFFFF; color: #FFFFFF;
font-family: Montserrat Regular; font-family: Roboto;
font-size: 12px; font-size: 12px;
font-weight: bold; font-weight: bold;
line-height: 15px; line-height: 15px;
@ -338,7 +347,7 @@ button.backup-phrase__reveal-button:hover {
.backup-phrase__confirm-seed-option { .backup-phrase__confirm-seed-option {
color: #5B5D67; color: #5B5D67;
font-family: Montserrat Light; font-family: Roboto;
font-size: 16px; font-size: 16px;
line-height: 21px; line-height: 21px;
background-color: #E7E7E7; background-color: #E7E7E7;
@ -360,7 +369,7 @@ button.backup-phrase__confirm-seed-option:hover {
.import-account__faq-link { .import-account__faq-link {
font-size: 18px; font-size: 18px;
line-height: 23px; line-height: 23px;
font-family: Montserrat Light; font-family: Roboto;
} }
.import-account__selector-label { .import-account__selector-label {
@ -375,7 +384,7 @@ button.backup-phrase__confirm-seed-option:hover {
background-color: #FFFFFF; background-color: #FFFFFF;
margin-top: 14px; margin-top: 14px;
color: #5B5D67; color: #5B5D67;
font-family: Montserrat Light; font-family: Roboto;
font-size: 18px; font-size: 18px;
line-height: 23px; line-height: 23px;
padding: 14px 21px; padding: 14px 21px;
@ -390,7 +399,7 @@ button.backup-phrase__confirm-seed-option:hover {
font-size: 18px; font-size: 18px;
line-height: 23px; line-height: 23px;
margin-top: 21px; margin-top: 21px;
font-family: Montserrat UltraLight; font-family: Roboto;
} }
.import-account__input-wrapper { .import-account__input-wrapper {
@ -436,7 +445,7 @@ button.backup-phrase__confirm-seed-option:hover {
border: 1px solid #1B344D; border: 1px solid #1B344D;
border-radius: 4px; border-radius: 4px;
color: #1B344D; color: #1B344D;
font-family: Montserrat Light; font-family: Roboto;
font-size: 18px; font-size: 18px;
display: flex; display: flex;
flex-flow: column nowrap; flex-flow: column nowrap;
@ -453,7 +462,7 @@ button.backup-phrase__confirm-seed-option:hover {
.import-account__file-name { .import-account__file-name {
color: #000000; color: #000000;
font-family: Montserrat Light; font-family: Roboto;
font-size: 18px; font-size: 18px;
line-height: 23px; line-height: 23px;
margin-left: 22px; margin-left: 22px;
@ -474,7 +483,7 @@ button.backup-phrase__confirm-seed-option:hover {
.buy-ether__content-headline { .buy-ether__content-headline {
color: #1B344D; color: #1B344D;
font-family: Montserrat Light; font-family: Roboto;
font-size: 18px; font-size: 18px;
line-height: 23px; line-height: 23px;
} }
@ -503,7 +512,7 @@ button.backup-phrase__confirm-seed-option:hover {
align-items: center; align-items: center;
padding: 20px 0; padding: 20px 0;
color: #9B9B9B; color: #9B9B9B;
font-family: Montserrat Light; font-family: Roboto;
font-size: 14px; font-size: 14px;
line-height: 18px; line-height: 18px;
cursor: pointer; cursor: pointer;
@ -538,7 +547,7 @@ button.backup-phrase__confirm-seed-option:hover {
.buy-ether__button-separator-text { .buy-ether__button-separator-text {
font-size: 20px; font-size: 20px;
line-height: 26px; line-height: 26px;
font-family: Montserrat Light; font-family: Roboto;
margin: 35px 0 14px 30px; margin: 35px 0 14px 30px;
display: flex; display: flex;
flex-flow: column nowrap; flex-flow: column nowrap;
@ -550,7 +559,7 @@ button.backup-phrase__confirm-seed-option:hover {
color: #1B344D !important; color: #1B344D !important;
font-size: 14px !important; font-size: 14px !important;
line-height: 18px !important; line-height: 18px !important;
font-family: Montserrat UltraLight !important; font-family: Roboto;
} }
.buy-ether__action-content-wrapper { .buy-ether__action-content-wrapper {
@ -584,6 +593,7 @@ button.backup-phrase__confirm-seed-option:hover {
color: #FFFFFF; color: #FFFFFF;
font-size: 20px; font-size: 20px;
font-weight: 500; font-weight: 500;
font-family: Roboto;
line-height: 26px; line-height: 26px;
text-align: center; text-align: center;
text-transform: uppercase; text-transform: uppercase;
@ -608,7 +618,7 @@ button.first-time-flow__button:hover {
color: #1B344D; color: #1B344D;
font-size: 20px; font-size: 20px;
line-height: 26px; line-height: 26px;
font-family: Montserrat Light; font-family: Roboto;
text-align: center; text-align: center;
margin: 35px 0 14px; margin: 35px 0 14px;
background-color: transparent; background-color: transparent;
@ -660,7 +670,7 @@ button.first-time-flow__button--tertiary:hover {
font-size: 20px; font-size: 20px;
line-height: 26px; line-height: 26px;
text-align: center; text-align: center;
font-family: Montserrat UltraLight; font-family: Roboto;
} }
.icon { .icon {
@ -708,7 +718,7 @@ button.first-time-flow__button--tertiary:hover {
.shapeshift-form__deposit-instruction { .shapeshift-form__deposit-instruction {
color: #757575; color: #757575;
color: rgba(0, 0, 0, 0.45); color: rgba(0, 0, 0, 0.45);
font-family: Montserrat Light; font-family: Roboto;
font-weight: 300; font-weight: 300;
line-height: 19px; line-height: 19px;
padding-bottom: 6px; padding-bottom: 6px;
@ -725,7 +735,7 @@ button.first-time-flow__button--tertiary:hover {
width: 100%; width: 100%;
height: 45px; height: 45px;
line-height: 44px; line-height: 44px;
font-family: Montserrat Light; font-family: Roboto;
} }
.shapeshift-form__address-input-label { .shapeshift-form__address-input-label {
@ -734,7 +744,7 @@ button.first-time-flow__button--tertiary:hover {
font-weight: 500; font-weight: 500;
line-height: 18px; line-height: 18px;
padding-bottom: 6px; padding-bottom: 6px;
font-family: Montserrat Light; font-family: Roboto;
} }
.shapeshift-form__address-input { .shapeshift-form__address-input {
@ -753,7 +763,7 @@ button.first-time-flow__button--tertiary:hover {
.shapeshift-form__address-input-error-message { .shapeshift-form__address-input-error-message {
color: #FF001F; color: #FF001F;
font-family: Montserrat Light; font-family: Roboto;
font-size: 12px; font-size: 12px;
height: 24px; height: 24px;
line-height: 18px; line-height: 18px;
@ -763,7 +773,7 @@ button.first-time-flow__button--tertiary:hover {
display: flex; display: flex;
flex-flow: row wrap; flex-flow: row wrap;
color: #9B9B9B; color: #9B9B9B;
font-family: Montserrat Light; font-family: Roboto;
font-size: 10px; font-size: 10px;
line-height: 16px; line-height: 16px;
} }

2
ui/app/actions.js
View File

@ -788,7 +788,7 @@ function updateTransaction (txData) {
function updateAndApproveTx (txData) { function updateAndApproveTx (txData) {
log.info('actions: updateAndApproveTx: ' + JSON.stringify(txData)) log.info('actions: updateAndApproveTx: ' + JSON.stringify(txData))
return (dispatch) => { return (dispatch) => {
log.debug(`actions calling background.updateAndApproveTx`) log.debug(`actions calling background.updateAndApproveTx.`)
background.updateAndApproveTransaction(txData, (err) => { background.updateAndApproveTransaction(txData, (err) => {
dispatch(actions.hideLoadingIndication()) dispatch(actions.hideLoadingIndication())
dispatch(actions.updateTransactionParams(txData.id, txData.txParams)) dispatch(actions.updateTransactionParams(txData.id, txData.txParams))