diff --git a/icons/mist/icon.icns b/icons/mist/icon.icns index 3b8629d45..38f7f4918 100644 Binary files a/icons/mist/icon.icns and b/icons/mist/icon.icns differ diff --git a/icons/mist/icon.ico b/icons/mist/icon.ico index 4f3ed6640..fd94d7650 100644 Binary files a/icons/mist/icon.ico and b/icons/mist/icon.ico differ diff --git a/icons/mist/icon.png b/icons/mist/icon.png index 1e65cab1d..6b59c9b39 100644 Binary files a/icons/mist/icon.png and b/icons/mist/icon.png differ diff --git a/icons/mist/icon2x.png b/icons/mist/icon2x.png index 6de0c0ee1..2b6247d32 100644 Binary files a/icons/mist/icon2x.png and b/icons/mist/icon2x.png differ diff --git a/interface/client/appStart.js b/interface/client/appStart.js index cb344f31f..489714525 100644 --- a/interface/client/appStart.js +++ b/interface/client/appStart.js @@ -33,15 +33,15 @@ mistInit = function(){ }); // wait for accounts and blocks to be initialized below - Meteor.setTimeout(function() { - Tabs.insert({ - url: 'http://ethereum-dapp-wallet.meteor.com', - position: 0, - permissions: { - accounts: web3.eth.accounts - } - }); - }, 1500); + // Meteor.setTimeout(function() { + // Tabs.insert({ + // url: 'http://ethereum-dapp-wallet.meteor.com', + // position: 0, + // permissions: { + // accounts: web3.eth.accounts + // } + // }); + // }, 1500); } EthAccounts.init(); diff --git a/interface/client/lib/helpers/helperFunctions.js b/interface/client/lib/helpers/helperFunctions.js index c213f992f..858551889 100644 --- a/interface/client/lib/helpers/helperFunctions.js +++ b/interface/client/lib/helpers/helperFunctions.js @@ -41,7 +41,7 @@ Format Urls, e.g add a default protocol if on is missing. @method formatUrl @param {String} url **/ -Helpers.formatUrl = function(url){ +Helpers.formatUrl = function(url){ // add http:// if no protocol is present if(url && url.indexOf('://') === -1) url = 'http://'+ url; diff --git a/interface/client/styles/splashScreen.import.less b/interface/client/styles/splashScreen.import.less index cefae52de..33569dc77 100644 --- a/interface/client/styles/splashScreen.import.less +++ b/interface/client/styles/splashScreen.import.less @@ -41,11 +41,16 @@ } } &.mist { - background-image: url('/images/bg-grid.png'); + background-image: url('/images/bg-metropolis.jpg'); h1 { - color: #fff; - text-shadow: 0 1px 5px rgba(0,0,0,0.5); + color: #152f58; + text-shadow: 0 1px 5px rgba(255,255,255,0.75); + } + + .network-indicator { + color: #FFF; + opacity: 0.9; } } diff --git a/interface/client/templates/layout/browserBar.js b/interface/client/templates/layout/browserBar.js index e757980f7..8e1b876cb 100644 --- a/interface/client/templates/layout/browserBar.js +++ b/interface/client/templates/layout/browserBar.js @@ -200,7 +200,7 @@ Template['layout_browserBar'].events({ */ 'submit': function(e, template){ var tabs = Tabs.find().fetch(), - url = Helpers.formatUrl(template.$('.url-input').value); + url = Helpers.formatUrl(template.$('.url-input')[0].value); // remove focus from url input template.$('.url-input').blur(); diff --git a/interface/client/templates/webviews.js b/interface/client/templates/webviews.js index aad5614f8..c98eb9799 100644 --- a/interface/client/templates/webviews.js +++ b/interface/client/templates/webviews.js @@ -55,12 +55,14 @@ webviewLoadStop = function(e){ // TODO does this makes sense? use another // fired by "did-get-redirect-request" webviewLoadStart = function(e){ + console.log('webviewLoadStart', e, e.isMainFrame); + if(!e.isMainFrame) - return; + return; var tabs = Tabs.find().fetch(), tabId = $(this).data('id'), - url = e.newUrl, + url = e.newURL, foundTab = _.find(tabs, function(tab){ var tabOrigin = new URL(tab.url).origin; return (url && url.indexOf(tabOrigin) !== -1); @@ -73,7 +75,7 @@ webviewLoadStart = function(e){ else foundTab = 'browser'; - console.log('Intercept request, switching to correct tab: '+ foundTab.name + ' -> '+ url); + console.log('Intercept request, switching to correct tab: '+ (foundTab.name || 'Browser') + ' -> '+ url); // stop this action this.stop(); diff --git a/interface/public/images/bg-grid.png b/interface/public/images/bg-grid.png deleted file mode 100644 index 689bb1b08..000000000 Binary files a/interface/public/images/bg-grid.png and /dev/null differ diff --git a/interface/public/images/bg-metropolis.jpg b/interface/public/images/bg-metropolis.jpg new file mode 100644 index 000000000..3037dfbb8 Binary files /dev/null and b/interface/public/images/bg-metropolis.jpg differ