New uttons styles and fonts

This commit is contained in:
viktor 2018-07-26 14:42:04 +03:00
parent 0faa31764d
commit 2fa60b64ae
33 changed files with 182 additions and 64 deletions

BIN
app/fonts/Nunito/Nunito-Black.ttf Executable file

Binary file not shown.

Binary file not shown.

BIN
app/fonts/Nunito/Nunito-Bold.ttf Executable file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
app/fonts/Nunito/Nunito-Light.ttf Executable file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

93
app/fonts/Nunito/OFL.txt Executable file
View File

@ -0,0 +1,93 @@
Copyright 2014 The Nunito Project Authors (contact@sansoxygen.com)
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL
-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.
DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.
"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).
"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).
"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.
"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.
PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:
1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.
2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.
3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.
5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.
TERMINATION
This license becomes null and void if any of the above conditions are
not met.
DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.

View File

@ -163,7 +163,7 @@ AccountDetailScreen.prototype.render = function () {
width: '5em',
height: '15px',
fontSize: '13px',
fontFamily: 'Montserrat Light',
fontFamily: 'Nunito Light',
textRendering: 'geometricPrecision',
marginBottom: '15px',
color: '#AEAEAE',
@ -198,7 +198,7 @@ AccountDetailScreen.prototype.render = function () {
h('button', {
onClick: () => props.dispatch(actions.buyEthView(selected)),
style: { marginRight: '10px' },
}, 'BUY'),
}, 'Buy'),
h('button', {
onClick: () => props.dispatch(actions.showSendPage()),
@ -206,7 +206,7 @@ AccountDetailScreen.prototype.render = function () {
marginBottom: '20px',
marginRight: '8px',
},
}, 'SEND'),
}, 'Send'),
]),
]),

View File

@ -69,15 +69,15 @@ ExportAccountView.prototype.render = function () {
},
},
[
h('button', {
onClick: () => this.onExportKeyPress({ key: 'Enter', preventDefault: () => {} }),
h('button.btn-violet', {
onClick: () => this.props.dispatch(actions.backToAccountDetail(this.props.address)),
style: {
marginRight: '10px',
},
}, 'Submit'),
h('button', {
onClick: () => this.props.dispatch(actions.backToAccountDetail(this.props.address)),
}, 'Cancel'),
h('button', {
onClick: () => this.onExportKeyPress({ key: 'Enter', preventDefault: () => {} }),
}, 'Submit'),
]),
(this.props.warning) && (
h('span.error', {
@ -110,15 +110,15 @@ ExportAccountView.prototype.render = function () {
copyToClipboard(ethUtil.stripHexPrefix(accountDetail.privateKey))
},
}, plainKey),
h('button', {
onClick: () => this.props.dispatch(actions.backToAccountDetail(this.props.address)),
}, 'Done'),
h('button.btn-violet', {
onClick: () => exportAsFile(`Nifty Wallet ${nickname} Private Key`, plainKey),
}, 'Save as File'),
h('button', {
style: {
marginLeft: '10px',
},
onClick: () => exportAsFile(`Nifty Wallet ${nickname} Private Key`, plainKey),
}, 'Save as File'),
onClick: () => this.props.dispatch(actions.backToAccountDetail(this.props.address)),
}, 'Done'),
])
}
}

View File

@ -63,7 +63,7 @@ EthBalanceComponent.prototype.renderBalance = function (value) {
style: {
alignItems: 'flex-end',
lineHeight: '13px',
fontFamily: 'Montserrat Light',
fontFamily: 'Nunito Light',
textRendering: 'geometricPrecision',
},
}, [

View File

@ -41,7 +41,7 @@ BnAsDecimalInput.prototype.render = function () {
style: {
alignItems: 'flex-end',
lineHeight: '13px',
fontFamily: 'Montserrat Light',
fontFamily: 'Nunito Light',
textRendering: 'geometricPrecision',
},
}, [

View File

@ -158,25 +158,25 @@ BuyButtonSubview.prototype.primarySubview = function () {
margin: '20px 50px',
},
}, [
network !== '99' ? h('button.text-transform-uppercase', {
network !== '99' ? h('button', {
onClick: () => this.props.dispatch(actions.buyEth({ network })),
style: {
marginTop: '15px',
},
}, label) : null,
network === '99' ? h('button.text-transform-uppercase', {
network === '99' ? h('button', {
onClick: () => this.props.dispatch(actions.buyEth({ network, exchange: 'binance' })),
style: {
marginTop: '15px',
},
}, 'Binance') : null,
network === '99' ? h('button.text-transform-uppercase', {
network === '99' ? h('button', {
onClick: () => this.props.dispatch(actions.buyEth({ network, exchange: 'bibox' })),
style: {
marginTop: '15px',
},
}, 'BiBox') : null,
network === '99' ? h('button.text-transform-uppercase', {
network === '99' ? h('button', {
onClick: () => this.props.dispatch(actions.buyEth({ network, exchange: 'cex.plus' })),
style: {
marginTop: '15px',
@ -184,7 +184,7 @@ BuyButtonSubview.prototype.primarySubview = function () {
}, 'CEX Plus') : null,
// Kovan only: Dharma loans beta
network === '42' ? (
h('button.text-transform-uppercase', {
h('button', {
onClick: () => this.navigateTo('https://borrow.dharma.io/'),
style: {
marginTop: '15px',
@ -238,7 +238,7 @@ BuyButtonSubview.prototype.mainnetSubview = function () {
h('h3.text-transform-uppercase', {
style: {
paddingLeft: '15px',
fontFamily: 'Montserrat Light',
fontFamily: 'Nunito Light',
width: '100vw',
background: 'rgb(235, 235, 235)',
color: 'rgb(174, 174, 174)',

View File

@ -73,7 +73,7 @@ class DropdownMenuItem extends Component {
padding: '8px 0px 8px 0px',
fontSize: '18px',
fontStyle: 'normal',
fontFamily: 'Montserrat Regular',
fontFamily: 'Nunito Regular',
cursor: 'pointer',
display: 'flex',
justifyContent: 'flex-start',

View File

@ -64,7 +64,7 @@ EthBalanceComponent.prototype.renderBalance = function (value) {
style: {
alignItems: 'flex-end',
lineHeight: '13px',
fontFamily: 'Montserrat Light',
fontFamily: 'Nunito Light',
textRendering: 'geometricPrecision',
},
}, [

View File

@ -38,7 +38,7 @@ function fiatDisplay (fiatDisplayNumber, fiatSuffix) {
style: {
alignItems: 'flex-end',
lineHeight: '13px',
fontFamily: 'Montserrat Light',
fontFamily: 'Nunito Light',
textRendering: 'geometricPrecision',
},
}, [

View File

@ -39,7 +39,7 @@ HexAsDecimalInput.prototype.render = function () {
style: {
alignItems: 'flex-end',
lineHeight: '13px',
fontFamily: 'Montserrat Light',
fontFamily: 'Nunito Light',
textRendering: 'geometricPrecision',
},
}, [

View File

@ -111,7 +111,7 @@ PendingTx.prototype.render = function () {
}, [
h('span.font-small', {
style: {
fontFamily: 'Montserrat Bold, Montserrat, sans-serif',
fontFamily: 'Nunito Bold, Nunito, sans-serif',
},
}, identity.name),
@ -120,14 +120,14 @@ PendingTx.prototype.render = function () {
}, [
h('span.font-small', {
style: {
fontFamily: 'Montserrat Light, Montserrat, sans-serif',
fontFamily: 'Nunito Light, Nunito, sans-serif',
},
}, addressSummary(address, 6, 4, false)),
]),
h('span.font-small', {
style: {
fontFamily: 'Montserrat Light, Montserrat, sans-serif',
fontFamily: 'Nunito Light, Nunito, sans-serif',
},
}, [
h(EthBalance, {
@ -156,12 +156,12 @@ PendingTx.prototype.render = function () {
background: rgb(236,236,236);
display: flex;
justify-content: space-between;
font-family: Montserrat Light, sans-serif;
font-family: Nunito Light, sans-serif;
font-size: 13px;
padding: 5px 25px;
}
.table-box .row .value {
font-family: Montserrat Regular;
font-family: Nunito Regular;
}
`),
@ -230,7 +230,7 @@ PendingTx.prototype.render = function () {
h('.cell.row', {
style: {
fontFamily: 'Montserrat Regular',
fontFamily: 'Nunito Regular',
background: 'white',
padding: '10px 25px',
},
@ -264,7 +264,7 @@ PendingTx.prototype.render = function () {
h('.cell.label'),
h('.cell.value', {
style: {
fontFamily: 'Montserrat Light',
fontFamily: 'Nunito Light',
fontSize: '11px',
},
}, `Data included: ${dataLength} bytes`),
@ -276,7 +276,6 @@ PendingTx.prototype.render = function () {
h('style', `
.conf-buttons button {
margin-left: 10px;
text-transform: uppercase;
}
`),
h('.cell.row', {
@ -326,7 +325,7 @@ PendingTx.prototype.render = function () {
margin: '14px 25px',
},
}, [
h('button', {
h('button.btn-violet', {
onClick: (event) => {
this.resetGasFields()
event.preventDefault()
@ -335,9 +334,9 @@ PendingTx.prototype.render = function () {
// Accept Button or Buy Button
insufficientBalance ? h('button.btn-green', { onClick: props.buyEth }, 'Buy Ether') :
h('input.confirm.btn-green', {
h('input.confirm', {
type: 'submit',
value: 'SUBMIT',
value: 'Submit',
style: { marginLeft: '10px' },
disabled: buyDisabled,
}),
@ -377,7 +376,7 @@ PendingTx.prototype.miniAccountPanelForRecipient = function () {
h('span.font-small', {
style: {
fontFamily: 'Montserrat Bold, Montserrat, sans-serif',
fontFamily: 'Nunito Bold, Nunito, sans-serif',
},
}, nameForAddress(txParams.to, props.identities)),
@ -386,7 +385,7 @@ PendingTx.prototype.miniAccountPanelForRecipient = function () {
}, [
h('span.font-small', {
style: {
fontFamily: 'Montserrat Light, Montserrat, sans-serif',
fontFamily: 'Nunito Light, Nunito, sans-serif',
},
}, addressSummary(txParams.to, 6, 4, false)),
]),
@ -399,7 +398,7 @@ PendingTx.prototype.miniAccountPanelForRecipient = function () {
h('span.font-small', {
style: {
fontFamily: 'Montserrat Bold, Montserrat, sans-serif',
fontFamily: 'Nunito Bold, Nunito, sans-serif',
},
}, 'New Contract'),

View File

@ -129,7 +129,7 @@ TokenList.prototype.renderTokenStatusBar = function () {
alignItems: 'center',
},
}, [
'ADD TOKEN',
'Add Token',
]),
])
}

View File

@ -111,7 +111,7 @@ ConfigScreen.prototype.render = function () {
}, [
h('p', {
style: {
fontFamily: 'Montserrat Light',
fontFamily: 'Nunito Light',
fontSize: '13px',
},
}, `State logs contain your public account addresses and sent transactions.`),
@ -160,7 +160,7 @@ ConfigScreen.prototype.render = function () {
h('p', {
style: {
fontFamily: 'Montserrat Light',
fontFamily: 'Nunito Light',
fontSize: '13px',
},
}, [

View File

@ -370,3 +370,27 @@
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Nunito Regular';
src: url('/fonts/Nunito/Nunito-Regular.woff') format('woff');
src: url('/fonts/Nunito/Nunito-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Nunito Bold';
src: url('/fonts/Nunito/Nunito-Bold.woff') format('woff');
src: url('/fonts/Nunito/Nunito-Bold.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Nunito Light';
src: url('/fonts/Montserrat/Nunito-Light.woff') format('woff');
src: url('/fonts/Montserrat/Nunito-Light.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}

View File

@ -14,7 +14,7 @@ application specific styles
}
html, body {
font-family: 'Montserrat Regular', Arial;
font-family: 'Nunito Regular';
color: #4D4D4D;
font-weight: 300;
line-height: 1.4em;
@ -68,17 +68,19 @@ input:focus, textarea:focus {
}
button, input[type="submit"] {
font-family: 'Montserrat Bold';
font-family: 'Nunito Bold';
outline: none;
cursor: pointer;
padding: 8px 12px;
padding: 8px 15px;
border: none;
color: white;
transform-origin: center center;
transition: transform 50ms ease-in;
/* default orange */
background: rgba(247, 134, 28, 1);
box-shadow: 0px 3px 6px rgba(247, 134, 28, 0.36);
border-radius: 3px;
font-size: 14px;
/* default green */
background: #8fdc97;
box-shadow: 0px 5px 10px 0px rgba(92, 52, 162, 0.3);
}
.btn-green, input[type="submit"].btn-green {
@ -87,8 +89,11 @@ button, input[type="submit"] {
}
.btn-red {
background: rgba(254, 35, 17, 1);
box-shadow: 0px 3px 6px rgba(254, 35, 17, 0.36);
background: #df2265;
}
.btn-violet {
background: #6729a8;
}
button[disabled], input[type="submit"][disabled] {
@ -136,7 +141,7 @@ button.primary {
color: white;
font-size: 1.1em;
font-family: 'Montserrat Regular';
text-transform: uppercase;
text-transform: none;
}
button.btn-thin {

View File

@ -70,15 +70,15 @@ RevealSeedConfirmation.prototype.render = function () {
},
}, [
// cancel
h('button.primary', {
h('button.btn-violet', {
onClick: this.goHome.bind(this),
}, 'CANCEL'),
}, 'Cancel'),
// submit
h('button.primary', {
h('button', {
style: { marginLeft: '10px' },
onClick: this.revealSeedWords.bind(this),
}, 'OK'),
}, 'Ok'),
]),

View File

@ -88,14 +88,14 @@ RestoreVaultScreen.prototype.render = function () {
}, [
// cancel
h('button.primary', {
h('button.btn-violet', {
onClick: this.showInitializeMenu.bind(this),
}, 'CANCEL'),
}, 'Cancel'),
// submit
h('button.primary', {
h('button', {
onClick: this.createNewVaultAndRestore.bind(this),
}, 'OK'),
}, 'Ok'),
]),
])

View File

@ -185,11 +185,8 @@ SendTransactionScreen.prototype.render = function () {
},
}),
h('button.primary', {
h('button', {
onClick: this.onSubmit.bind(this),
style: {
textTransform: 'uppercase',
},
}, 'Next'),
]),

View File

@ -66,7 +66,7 @@ UnlockScreen.prototype.render = function () {
},
}, warning),
h('button.primary.cursor-pointer', {
h('button.cursor-pointer', {
onClick: this.onSubmit.bind(this),
style: {
margin: 10,