aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app
diff options
context:
space:
mode:
Diffstat (limited to 'ui/app')
-rw-r--r--ui/app/components/drop-menu-item.js2
-rw-r--r--ui/app/components/transaction-list-item.js4
-rw-r--r--ui/app/css/fonts.css40
-rw-r--r--ui/app/css/index.css16
-rw-r--r--ui/app/info.js12
5 files changed, 20 insertions, 54 deletions
diff --git a/ui/app/components/drop-menu-item.js b/ui/app/components/drop-menu-item.js
index d9fde72ac..5531ebf9f 100644
--- a/ui/app/components/drop-menu-item.js
+++ b/ui/app/components/drop-menu-item.js
@@ -18,7 +18,7 @@ DropMenuItem.prototype.render = function () {
style: {
listStyle: 'none',
padding: '6px 16px 6px 5px',
- fontFamily: 'Transat Medium',
+ fontFamily: 'Montserrat Regular',
color: 'rgb(125, 128, 130)',
cursor: 'pointer',
},
diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js
index 56f2103f3..94fde697e 100644
--- a/ui/app/components/transaction-list-item.js
+++ b/ui/app/components/transaction-list-item.js
@@ -77,7 +77,7 @@ TransactionListItem.prototype.render = function () {
function domainField (txParams) {
return h('div', {
style: {
- fontSize: 'small',
+ fontSize: 'x-small',
color: '#ABA9AA',
},
}, [
@@ -98,7 +98,7 @@ function recipientField (txParams, transaction, isTx, isMsg) {
return h('div', {
style: {
- fontSize: 'small',
+ fontSize: 'x-small',
color: '#ABA9AA',
},
}, [
diff --git a/ui/app/css/fonts.css b/ui/app/css/fonts.css
index b528cb9ab..e9473af55 100644
--- a/ui/app/css/fonts.css
+++ b/ui/app/css/fonts.css
@@ -2,45 +2,19 @@
@import url(https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css);
@font-face {
- font-family: 'Transat Standard';
- src: url('/fonts/Transat Standard/transat_standard-webfont.eot');
- src: url('/fonts/Transat Standard/transat_standard-webfont.eot?#iefix') format('embedded-opentype'),
- url('/fonts/Transat Standard/transat_standard-webfont.woff') format('woff'),
- url('/fonts/Transat Standard/transat_standard-webfont.ttf') format('truetype'),
- url('/fonts/Transat Standard/transat_standard-webfont.svg#ywftsvg') format('svg');
+ font-family: 'Montserrat Regular';
+ src: url('/fonts/Montserrat/Montserrat-Regular.woff') format('woff');
+ src: url('/fonts/Montserrat/Montserrat-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
-}
+ font-size: 'small',
-@font-face {
- font-family: 'Transat Black';
- src: url('/fonts/Transat Black/transat_black-webfont.eot');
- src: url('/fonts/Transat Black/transat_black-webfont.eot?#iefix') format('embedded-opentype'),
- url('/fonts/Transat Black/transat_black-webfont.woff') format('woff'),
- url('/fonts/Transat Black/transat_black-webfont.ttf') format('truetype'),
- url('/fonts/Transat Black/transat_black-webfont.svg#ywftsvg') format('svg');
- font-weight: normal;
- font-style: normal;
-}
-
-@font-face {
- font-family: 'Transat Medium';
- src: url('/fonts/Transat Medium/transat_medium-webfont.eot');
- src: url('/fonts/Transat Medium/transat_medium-webfont.eot?#iefix') format('embedded-opentype'),
- url('/fonts/Transat Medium/transat_medium-webfont.woff') format('woff'),
- url('/fonts/Transat Medium/transat_medium-webfont.ttf') format('truetype'),
- url('/fonts/Transat Medium/transat_medium-webfont.svg#ywftsvg') format('svg');
- font-weight: normal;
- font-style: normal;
}
@font-face {
- font-family: 'Transat Light';
- src: url('/fonts/Transat Light/transat_light-webfont.eot');
- src: url('/fonts/Transat Light/transat_light-webfont.eot?#iefix') format('embedded-opentype'),
- url('/fonts/Transat Light/transat_light-webfont.woff') format('woff'),
- url('/fonts/Transat Light/transat_light-webfont.ttf') format('truetype'),
- url('/fonts/Transat Light/transat_light-webfont.svg#ywftsvg') format('svg');
+ font-family: 'Montserrat Bold';
+ src: url('/fonts/Montserrat/Montserrat-Bold.woff') format('woff');
+ src: url('/fonts/Montserrat/Montserrat-Bold.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
diff --git a/ui/app/css/index.css b/ui/app/css/index.css
index 65ff1705f..f0e7dc794 100644
--- a/ui/app/css/index.css
+++ b/ui/app/css/index.css
@@ -14,7 +14,7 @@ application specific styles
}
html, body {
- font-family: 'Transat Standard', Arial;
+ font-family: 'Montserrat Regular', Arial;
color: #4D4D4D;
font-weight: 300;
line-height: 1.4em;
@@ -33,7 +33,7 @@ input:focus, textarea:focus {
}
button {
- font-family: 'Transat Black';
+ font-family: 'Montserrat Bold';
outline: none;
cursor: pointer;
box-shadow: 0px 3px 6px rgba(247, 134, 28, 0.36);
@@ -80,7 +80,7 @@ button.primary {
box-shadow: 0px 3px 6px rgba(247, 134, 28, 0.36);
color: white;
font-size: 1.1em;
- font-family: 'Transat Standard';
+ font-family: 'Montserrat Regular';
text-transform: uppercase;
}
@@ -101,13 +101,13 @@ button.btn-thin {
}
.app-header h1 {
- font-family: 'Transat Medium';
+ font-family: 'Montserrat Regular';
text-transform: uppercase;
color: #AEAEAE;
}
h2.page-subtitle {
- font-family: 'Transat Light';
+ font-family: 'Montserrat Regular';
text-transform: uppercase;
color: #AEAEAE;
font-size: 1em;
@@ -428,7 +428,7 @@ input.large-input {
/* Info screen */
.info-gray{
- font-family: 'Transat Medium';
+ font-family: 'Montserrat Regular';
text-transform: uppercase;
color: #AEAEAE;
}
@@ -438,10 +438,8 @@ input.large-input {
}
.info{
- font-family: 'Transat Standard', Arial;
- font-weight: bolder;
+ font-family: 'Montserrat Regular', Arial;
padding-bottom: 10px;
display: inline-block;
padding-left: 5px;
}
-
diff --git a/ui/app/info.js b/ui/app/info.js
index e3b68fed5..32b5a22e8 100644
--- a/ui/app/info.js
+++ b/ui/app/info.js
@@ -56,10 +56,7 @@ InfoScreen.prototype.render = function () {
},
}),
- h('.info', {
- style: {
- marginBottom: '20px',
- }},
+ h('.info',
`For more information on MetaMask
you can visit our web site. If you want to
contact us with questions or just
@@ -79,11 +76,7 @@ InfoScreen.prototype.render = function () {
h('img.icon-size', {
src: manifest.icons[128],
}),
- h('div.info', {
- style: {
- fontWeight: 800,
- },
- }, 'Visit our web site'),
+ h('div.info', 'Visit our web site'),
]),
]),
h('div.fa.fa-slack', [
@@ -106,6 +99,7 @@ InfoScreen.prototype.render = function () {
h('a.info', {
href: 'mailto:hello@metamask.io?subject=Feedback',
target: '_blank',
+ style: { width: '85vw' },
}, 'Email us any questions or comments!'),
]),