Skip to content

Commit

Permalink
Nav bar glitch and new art for Mist (ethereum#696)
Browse files Browse the repository at this point in the history
* Solves navbar glitch and adds new icon and splash screen art

* adds new splash screen art for Mist

* added a yellow tint to the image
  • Loading branch information
Alex Van de Sande committed May 25, 2016
1 parent 664bbd1 commit d3fd8d2
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 17 deletions.
Binary file modified icons/mist/icon.icns
Binary file not shown.
Binary file modified icons/mist/icon.ico
Binary file not shown.
Binary file modified icons/mist/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified icons/mist/icon2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 9 additions & 9 deletions interface/client/appStart.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion interface/client/lib/helpers/helperFunctions.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
11 changes: 8 additions & 3 deletions interface/client/styles/splashScreen.import.less
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down
2 changes: 1 addition & 1 deletion interface/client/templates/layout/browserBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
8 changes: 5 additions & 3 deletions interface/client/templates/webviews.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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();
Expand Down
Binary file removed interface/public/images/bg-grid.png
Binary file not shown.
Binary file added interface/public/images/bg-metropolis.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit d3fd8d2

Please sign in to comment.