diff --git a/config.js b/config.js index f2da4a3b..a8e79256 100644 --- a/config.js +++ b/config.js @@ -4,7 +4,7 @@ const Store = require("electron-store"); module.exports = new Store({ defaults: { crosshair: 'leupold-dot', - color: '#FFFFFF', + color: '#00BCD4', crosshair_index: 0, opacity: 80, position_x: -1, diff --git a/index.js b/index.js index c1b5fc7a..6d0f0fbd 100644 --- a/index.js +++ b/index.js @@ -15,7 +15,7 @@ const unhandled = require("electron-unhandled"); const debug = require("electron-debug"); const contextMenu = require("electron-context-menu"); const config = require("./config"); -const menu = require("./menu"); +const menu = require("./src/menu"); unhandled(); debug(); @@ -299,7 +299,7 @@ const createMainWindow = async () => { mainWindow = undefined; }); - await win.loadFile(path.join(__dirname, "index.html")); + await win.loadFile(path.join(__dirname, "src/index.html")); return win; }; diff --git a/package.json b/package.json index 0842657a..244baa4f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "crossover", "productName": "CrossOver", - "version": "0.1.3", + "version": "0.1.5", "description": "A Crosshair Overlay for any platform.", "license": "MIT", "repository": "lacymorrow/crossover", @@ -14,7 +14,7 @@ "postinstall": "electron-builder install-app-deps", "lint": "xo", "test": "npm run lint", - "start": "sass index.scss:index.css -s compressed && electron .", + "start": "sass src/index.scss:src/index.css -s compressed && electron .", "pack": "electron-builder --dir", "dist": "rm -rf dist && electron-builder --macos --linux --windows", "release": "np" diff --git a/index.css b/src/index.css similarity index 100% rename from index.css rename to src/index.css diff --git a/index.css.map b/src/index.css.map similarity index 100% rename from index.css.map rename to src/index.css.map diff --git a/index.html b/src/index.html similarity index 91% rename from index.html rename to src/index.html index c7999a82..035b29fd 100644 --- a/index.html +++ b/src/index.html @@ -3,7 +3,7 @@ CrossOver - + @@ -12,7 +12,7 @@
- +
 
diff --git a/index.scss b/src/index.scss similarity index 100% rename from index.scss rename to src/index.scss diff --git a/menu.js b/src/menu.js similarity index 100% rename from menu.js rename to src/menu.js diff --git a/renderer.js b/src/renderer.js similarity index 100% rename from renderer.js rename to src/renderer.js diff --git a/static/css/pickr.nano.min.css b/src/vendor/pickr.nano.min.css similarity index 100% rename from static/css/pickr.nano.min.css rename to src/vendor/pickr.nano.min.css diff --git a/static/crosshairs/ballistic-firedot.png b/static/crosshairs/ballistic-firedot.png index 0ec52aff..45d19f00 100644 Binary files a/static/crosshairs/ballistic-firedot.png and b/static/crosshairs/ballistic-firedot.png differ diff --git a/static/crosshairs/bullseye.png b/static/crosshairs/bullseye.png index 5bc6da09..5efb1e4d 100644 Binary files a/static/crosshairs/bullseye.png and b/static/crosshairs/bullseye.png differ diff --git a/static/crosshairs/leica-magnus.png b/static/crosshairs/leica-magnus.png index e92fdd75..0340cd32 100644 Binary files a/static/crosshairs/leica-magnus.png and b/static/crosshairs/leica-magnus.png differ diff --git a/static/crosshairs/leupold-dot.png b/static/crosshairs/leupold-dot.png index d887d86d..1731e939 100644 Binary files a/static/crosshairs/leupold-dot.png and b/static/crosshairs/leupold-dot.png differ diff --git a/static/crosshairs/starburst.png b/static/crosshairs/starburst.png index 65377168..4e65282b 100644 Binary files a/static/crosshairs/starburst.png and b/static/crosshairs/starburst.png differ diff --git a/static/crosshairs/target-dot.png b/static/crosshairs/target-dot.png index 2aab9f6d..4fc981ed 100644 Binary files a/static/crosshairs/target-dot.png and b/static/crosshairs/target-dot.png differ