Skip to content

Commit

Permalink
update main helper for new site
Browse files Browse the repository at this point in the history
  • Loading branch information
mmckegg committed Jun 15, 2015
1 parent 8500283 commit bfdf359
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 6 deletions.
Binary file added logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,11 @@ function loadProject(path) {
e.preventDefault()
})

mainWindow.webContents.on('will-navigate', function(e, url) {
e.preventDefault()
Shell.openExternal(url)
})

mainWindow.loadUrl('file://' + __dirname + '/window.html')
mainWindow.on('closed', function() {
mainWindow = null
Expand Down
15 changes: 15 additions & 0 deletions styles/helper.mcss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Helper {
padding: 5px
color: #777
text-align: center
font-size: 120%

-webkit-user-select: text
cursor: text
Expand All @@ -19,5 +20,19 @@ Helper {

a {
color: #5A91D8


img {
transition: -webkit-filter, opacity, 1s ease
-webkit-filter: saturate(5%)
opacity: 0.3
}

:hover {
img {
-webkit-filter: saturate(100%)
opacity: 1
}
}
}
}
11 changes: 6 additions & 5 deletions views/tabbed-editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ var mercury = require("mercury")
var h = require('micro-css/h')(mercury.h)
var getBaseName = require('path').basename
var getDirectory = require('path').dirname
var join = require('path').join

var ValueEvent = require('lib/value-event')
var Select = require('lib/params/select')
Expand Down Expand Up @@ -93,12 +94,12 @@ function renderHelper(){
noMidi ? renderNoMidi() : null,

h('div Helper', [
'For help, view the ',
h('a', {href: 'https://github.com/mmckegg/loop-drop-app#getting-started', target: '_blank'}, 'getting started guide'),
' or ',
h('a', {href: 'http://loopjs.com/'}, [
h('img', {src: 'file://' + join(__dirname, '..', 'logo.png'), width: 128})
]),
h('br'),
h('a', {href: 'https://github.com/mmckegg/loop-drop-app/issues', target: '_blank'}, 'ask a question'),
' on github.'
'For help visit ',
h('a', {href: 'http://loopjs.com/'}, 'loopjs.com')
])

])
Expand Down
2 changes: 1 addition & 1 deletion welcome.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<div class='ChooseProject'>

<header>
<img src='icon128.png' width='128' />
<img src='logo.png' width='128' />
<h1>Loop Drop</h1>
<h2 id='version-container'>version <script>document.write(version)</script></h2>
</header>
Expand Down

0 comments on commit bfdf359

Please sign in to comment.