Skip to content

Commit

Permalink
Merge pull request #18 from brandoshizzle/Dev
Browse files Browse the repository at this point in the history
Merge v0.5.0
  • Loading branch information
brandoshizzle authored Jan 5, 2019
2 parents d48c52a + 8964fa2 commit dccfcf3
Show file tree
Hide file tree
Showing 22 changed files with 1,463 additions and 2,235 deletions.
12 changes: 12 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "start",
"problemMatcher": []
}
]
}
15 changes: 9 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,31 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## Unreleased
### Changed
- Misc fonts/logos related to new name
- JEditable updated to v2.02

## [0.5.0] - 2018-05-09
## [0.5.0] - XXXX-XX-XX
### Added
- Panic switch (Global stop) by pressing ESCAPE
- Solo sound options - choose to auto-stop playing sounds when a new sound starts
- Volume control for individual sounds
- Double-click volume bar to reset to 100%
- Show changelog on first time after update

### Fixed
- Fixed issue with playlist not switching song after fade out
- Fixed issue with loaded bar not hiding when errors loading songs
- Removed missed restricted characters from song ids
- General refactoring and cleaning of code

### Changed
- Name (Wowee!)
- Misc fonts/logos related to new name
- JEditable updated to v2.02
- Removed dragging of keys
- Enlarged the playlist box vertically
- Upgraded to Interact.js v1.3.3
- Upgraded Howler.js to v2.0.10
- Updated npm package dependencies


## [0.4.1] - 2017-05-25
### Added
- Playlist: Dropdown on playlist header to access action items
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ app.on('ready', function() {
var win = new BrowserWindow();
win.maximize();
win.loadURL('file://' + __dirname + '/src/main.html');
//win.openDevTools();
win.openDevTools();
});

app.on('window-all-closed', function() {
Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,11 @@
},
"dependencies": {
"circular-json": "^0.3.1",
"compare-versions": "^3.2.1",
"fs-jetpack": "^0.10.5",
"gh-latest-release": "^1.0.0",
"marked": "^0.3.19",
"materialize-css": "^1.0.0-rc.1",
"npm": "^5.8.0"
}
}
12 changes: 12 additions & 0 deletions src/css/colors.css
Original file line number Diff line number Diff line change
Expand Up @@ -192,3 +192,15 @@ input[type=text]:focus {
background-color: var(--oc-gray-4);
color: var(--oc-gray-9);
}

.noUi-connect{
background: var(--pM);
}

.noUi-target.noUi-horizontal .noUi-tooltip{
background-color: var(--pM);
}

.noUi-horizontal .noUi-handle, .noUi-vertical .noUi-handle{
background-color: var(--pM);
}
3 changes: 2 additions & 1 deletion src/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ tr td {
border: 2px solid gray;
border-radius: 4px;
background-color: var(--oc-gray-2);
z-index: 1000;
}

.color-picker-color {
Expand Down Expand Up @@ -424,4 +425,4 @@ hr{
.alertify-logs .show,
.alertify-logs .hide {
display: inherit !important;
}
}
31 changes: 31 additions & 0 deletions src/css/vendor/materialize.new.min.css

Large diffs are not rendered by default.

Loading

0 comments on commit dccfcf3

Please sign in to comment.