Merge branch 'master' of github.com:MetaMask/metamask-plugin into svg-notif

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.

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.

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": {

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": {

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',
     },

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',
     },
   }, [

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', {

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';
+  font-family: 'Montserrat Regular';
-  src: url('/fonts/Transat Standard/transat_standard-webfont.eot');
+    src: url('/fonts/Montserrat/Montserrat-Regular.woff') format('woff');
-  src: url('/fonts/Transat Standard/transat_standard-webfont.eot?#iefix') format('embedded-opentype'),
+    src: url('/fonts/Montserrat/Montserrat-Regular.ttf') format('truetype');
-       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-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';
+  font-family: 'Montserrat Bold';
-  src: url('/fonts/Transat Light/transat_light-webfont.eot');
+    src: url('/fonts/Montserrat/Montserrat-Bold.woff') format('woff');
-  src: url('/fonts/Transat Light/transat_light-webfont.eot?#iefix') format('embedded-opentype'),
+    src: url('/fonts/Montserrat/Montserrat-Bold.ttf') format('truetype');
-       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-weight: normal;
   font-style: normal;
 }

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-family: 'Montserrat Regular', Arial;
-  font-weight: bolder;
   padding-bottom: 10px;
   display: inline-block;
   padding-left: 5px;
 }
-

ui/app/info.js

@@ -56,10 +56,7 @@ InfoScreen.prototype.render = function () {
             },
           }),
 
-          h('.info', {
+          h('.info',
-            style: {
-              marginBottom: '20px',
-            }},
             `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', {
+                  h('div.info', 'Visit our web site'),
-                    style: {
-                      fontWeight: 800,
-                    },
-                  }, '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!'),
               ]),