diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95eadd4b5..11fb8f50e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
## Current Master
+## 2.4.4 2016-06-23
+
+- Update web3-stream-provider for batch payload bug fix
+
+## 2.4.3 2016-06-23
+
+- Remove redundant network option buttons from settings page
+- Switch out font family Transat for Montserrat
+
## 2.4.2 2016-06-22
- Change out export icon for key.
diff --git a/app/fonts/Montserrat/Montserrat-Bold.ttf b/app/fonts/Montserrat/Montserrat-Bold.ttf
new file mode 100755
index 000000000..ae33a4538
Binary files /dev/null and b/app/fonts/Montserrat/Montserrat-Bold.ttf differ
diff --git a/app/fonts/Montserrat/Montserrat-Bold.woff b/app/fonts/Montserrat/Montserrat-Bold.woff
new file mode 100644
index 000000000..29644358c
Binary files /dev/null and b/app/fonts/Montserrat/Montserrat-Bold.woff differ
diff --git a/app/fonts/Montserrat/Montserrat-Regular.ttf b/app/fonts/Montserrat/Montserrat-Regular.ttf
new file mode 100755
index 000000000..5b4b5afe6
Binary files /dev/null and b/app/fonts/Montserrat/Montserrat-Regular.ttf differ
diff --git a/app/fonts/Montserrat/Montserrat-Regular.woff b/app/fonts/Montserrat/Montserrat-Regular.woff
new file mode 100644
index 000000000..fcbed1602
Binary files /dev/null and b/app/fonts/Montserrat/Montserrat-Regular.woff differ
diff --git a/app/fonts/Montserrat/OFL.txt b/app/fonts/Montserrat/OFL.txt
new file mode 100755
index 000000000..3968b2265
--- /dev/null
+++ b/app/fonts/Montserrat/OFL.txt
@@ -0,0 +1,92 @@
+Copyright (c) 2011-2012, Julieta Ulanovsky (julieta.ulanovsky@gmail.com), with Reserved Font Names 'Montserrat'
+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.
diff --git a/app/fonts/Transat Black/transat_black-webfont.eot b/app/fonts/Transat Black/transat_black-webfont.eot
deleted file mode 100755
index 268ba943d..000000000
Binary files a/app/fonts/Transat Black/transat_black-webfont.eot and /dev/null differ
diff --git a/app/fonts/Transat Black/transat_black-webfont.svg b/app/fonts/Transat Black/transat_black-webfont.svg
deleted file mode 100755
index b8762f7d6..000000000
--- a/app/fonts/Transat Black/transat_black-webfont.svg
+++ /dev/null
@@ -1,2592 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/fonts/Transat Black/transat_black-webfont.ttf b/app/fonts/Transat Black/transat_black-webfont.ttf
deleted file mode 100755
index d501f77da..000000000
Binary files a/app/fonts/Transat Black/transat_black-webfont.ttf and /dev/null differ
diff --git a/app/fonts/Transat Black/transat_black-webfont.woff b/app/fonts/Transat Black/transat_black-webfont.woff
deleted file mode 100755
index ea5d95b40..000000000
Binary files a/app/fonts/Transat Black/transat_black-webfont.woff and /dev/null differ
diff --git a/app/fonts/Transat Black/transat_black-webfont.woff2 b/app/fonts/Transat Black/transat_black-webfont.woff2
deleted file mode 100755
index 64113a718..000000000
Binary files a/app/fonts/Transat Black/transat_black-webfont.woff2 and /dev/null differ
diff --git a/app/fonts/Transat Light/transat_light-webfont.eot b/app/fonts/Transat Light/transat_light-webfont.eot
deleted file mode 100755
index 1660cdad9..000000000
Binary files a/app/fonts/Transat Light/transat_light-webfont.eot and /dev/null differ
diff --git a/app/fonts/Transat Light/transat_light-webfont.svg b/app/fonts/Transat Light/transat_light-webfont.svg
deleted file mode 100755
index 82327f942..000000000
--- a/app/fonts/Transat Light/transat_light-webfont.svg
+++ /dev/null
@@ -1,2399 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/fonts/Transat Light/transat_light-webfont.ttf b/app/fonts/Transat Light/transat_light-webfont.ttf
deleted file mode 100755
index dda8bb83f..000000000
Binary files a/app/fonts/Transat Light/transat_light-webfont.ttf and /dev/null differ
diff --git a/app/fonts/Transat Light/transat_light-webfont.woff b/app/fonts/Transat Light/transat_light-webfont.woff
deleted file mode 100755
index 2e898fefc..000000000
Binary files a/app/fonts/Transat Light/transat_light-webfont.woff and /dev/null differ
diff --git a/app/fonts/Transat Light/transat_light-webfont.woff2 b/app/fonts/Transat Light/transat_light-webfont.woff2
deleted file mode 100755
index b2dfed9ad..000000000
Binary files a/app/fonts/Transat Light/transat_light-webfont.woff2 and /dev/null differ
diff --git a/app/fonts/Transat Medium/transat_medium-webfont.eot b/app/fonts/Transat Medium/transat_medium-webfont.eot
deleted file mode 100755
index 03a1b8339..000000000
Binary files a/app/fonts/Transat Medium/transat_medium-webfont.eot and /dev/null differ
diff --git a/app/fonts/Transat Medium/transat_medium-webfont.svg b/app/fonts/Transat Medium/transat_medium-webfont.svg
deleted file mode 100755
index 073fe602f..000000000
--- a/app/fonts/Transat Medium/transat_medium-webfont.svg
+++ /dev/null
@@ -1,2813 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/fonts/Transat Medium/transat_medium-webfont.ttf b/app/fonts/Transat Medium/transat_medium-webfont.ttf
deleted file mode 100755
index 361df5c16..000000000
Binary files a/app/fonts/Transat Medium/transat_medium-webfont.ttf and /dev/null differ
diff --git a/app/fonts/Transat Medium/transat_medium-webfont.woff b/app/fonts/Transat Medium/transat_medium-webfont.woff
deleted file mode 100755
index fd3616d48..000000000
Binary files a/app/fonts/Transat Medium/transat_medium-webfont.woff and /dev/null differ
diff --git a/app/fonts/Transat Medium/transat_medium-webfont.woff2 b/app/fonts/Transat Medium/transat_medium-webfont.woff2
deleted file mode 100755
index d6c99d7fb..000000000
Binary files a/app/fonts/Transat Medium/transat_medium-webfont.woff2 and /dev/null differ
diff --git a/app/fonts/Transat Standard/transat_standard-webfont.eot b/app/fonts/Transat Standard/transat_standard-webfont.eot
deleted file mode 100755
index 8bbc5a3e1..000000000
Binary files a/app/fonts/Transat Standard/transat_standard-webfont.eot and /dev/null differ
diff --git a/app/fonts/Transat Standard/transat_standard-webfont.svg b/app/fonts/Transat Standard/transat_standard-webfont.svg
deleted file mode 100755
index 72d184d1a..000000000
--- a/app/fonts/Transat Standard/transat_standard-webfont.svg
+++ /dev/null
@@ -1,2827 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/fonts/Transat Standard/transat_standard-webfont.ttf b/app/fonts/Transat Standard/transat_standard-webfont.ttf
deleted file mode 100755
index ccea33a5f..000000000
Binary files a/app/fonts/Transat Standard/transat_standard-webfont.ttf and /dev/null differ
diff --git a/app/fonts/Transat Standard/transat_standard-webfont.woff b/app/fonts/Transat Standard/transat_standard-webfont.woff
deleted file mode 100755
index 8e3abeaa5..000000000
Binary files a/app/fonts/Transat Standard/transat_standard-webfont.woff and /dev/null differ
diff --git a/app/fonts/Transat Standard/transat_standard-webfont.woff2 b/app/fonts/Transat Standard/transat_standard-webfont.woff2
deleted file mode 100755
index 3d62b0ffd..000000000
Binary files a/app/fonts/Transat Standard/transat_standard-webfont.woff2 and /dev/null differ
diff --git a/app/manifest.json b/app/manifest.json
index a0c3a7e8f..d724c8001 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
{
"name": "__MSG_appName__",
"short_name": "Metamask",
- "version": "2.4.2",
+ "version": "2.4.4",
"manifest_version": 2,
"description": "__MSG_appDescription__",
"icons": {
diff --git a/package.json b/package.json
index c5661e063..3de5b191c 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
"vreme": "^3.0.2",
"web3": "ethereum/web3.js#0.16.0",
"web3-provider-engine": "^7.8.1",
- "web3-stream-provider": "^2.0.2",
+ "web3-stream-provider": "^2.0.5",
"xtend": "^4.0.1"
},
"devDependencies": {
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/config.js b/ui/app/config.js
index 4094180dd..c88e7ac6e 100644
--- a/ui/app/config.js
+++ b/ui/app/config.js
@@ -73,43 +73,6 @@ ConfigScreen.prototype.render = function () {
},
}, 'Save'),
]),
-
- h('div', [
- h('button.spaced', {
- style: {
- alignSelf: 'center',
- },
- onClick (event) {
- event.preventDefault()
- state.dispatch(actions.setProviderType('mainnet'))
- },
- }, 'Use Main Network'),
- ]),
-
- h('div', [
- h('button.spaced', {
- style: {
- alignSelf: 'center',
- },
- onClick (event) {
- event.preventDefault()
- state.dispatch(actions.setProviderType('testnet'))
- },
- }, 'Use Morden Test Network'),
- ]),
-
- h('div', [
- h('button.spaced', {
- style: {
- alignSelf: 'center',
- },
- onClick (event) {
- event.preventDefault()
- state.dispatch(actions.setRpcTarget('http://localhost:8545/'))
- },
- }, 'Use http://localhost:8545'),
- ]),
-
h('hr.horizontal-line'),
h('div', {
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!'),
]),