Skip to content

Commit

Permalink
Merge pull request #33 from stefanjudis/feature/10-prettify-dmg
Browse files Browse the repository at this point in the history
Feature/10 prettify dmg
  • Loading branch information
stefanjudis authored Jul 25, 2016
2 parents 76686bc + 45a5656 commit c3a406f
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ node_modules
npm-debug.log
npm-debug.log.*
thumbs.db
!.gitkeep
!.gitkeep
drafts.sketch
2 changes: 1 addition & 1 deletion app/electron.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ ipcMain.on( 'openNewWindow', createWindow );
function openAboutWindow() {
if ( ! aboutWindow ) {
aboutWindow = new BrowserWindow( {
height : 600,
height : 625,
width : 475,
titleBarStyle : 'hidden',
resizable : false
Expand Down
2 changes: 0 additions & 2 deletions app/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,6 @@
width: .75rem;
}
::-webkit-scrollbar-thumb {
// background-clip : padding-box;
// background-color : var(--npm-red-dark);
box-shadow : inset 0 0 0 .5rem var(--npm-red);
border : .25rem solid transparent;
}
Expand Down
7 changes: 5 additions & 2 deletions app/src/components/AboutView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,15 @@
</button>
</h3>
<p>for giving Forrest its name</p>
<li class="c-about--heartList--item">
<li class="c-about--heartList--item u-fontSizeSmall u-marginTopSmall">
<h3 class="o-headline-4">Calvin Goodman</h3>
<p>for creation of the "Home" icon from the Noun Project
<li class="c-about--heartList--item">
<li class="c-about--heartList--item u-fontSizeSmall">
<h3 class="o-headline-4">Michal Beno</h3>
<p>for creation of the "Settings" icon from the Noun Project
<li class="c-about--heartList--item u-fontSizeSmall">
<h3 class="o-headline-4">Danin Polshin</h3>
<p>for creation of the "Running man" icon from the Noun Project
</ul>
</div>
</template>
Expand Down
8 changes: 8 additions & 0 deletions app/src/styles/_utils.scss
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@
margin-top : .5em;
}

.u-marginTop {
margin-top : 1em;
}

.u-marginLeftAuto {
margin-left : auto;
}
Expand Down Expand Up @@ -102,4 +106,8 @@

.u-noBorderTop {
border-top : none !important;
}

.u-fontSizeSmall {
font-size : .9em;
}
Binary file added build/background.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 added build/background@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 22 additions & 1 deletion config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,28 @@ const config = {
'app-version' : pkg.version,
packagesToBeIncluded : [ 'fix-path', 'electron-window-state' ],
overwrite : true,
asar : true
asar : true,
dmg : {
'background-color' : '#E1E1E1',
contents : [
{
x : 485,
y : 240,
type : 'link',
path : '/Applications'
},
{
x : 120,
y : 240,
type : 'file'
}
],
'icon-size' : 100,
window : {
width : 600,
height : 500
}
},
}
};

Expand Down

0 comments on commit c3a406f

Please sign in to comment.