diff --git a/settings.html b/settings.html index 74baf44..9804117 100644 --- a/settings.html +++ b/settings.html @@ -45,32 +45,24 @@
- -
- +
+ Where to get RGB matrix:
-
- +
+
+ + +
-
- -
-
- -
- -
- -
-
- -
-
- +
+
+ + +
diff --git a/src/assets/index.css b/src/assets/index.css index 907ccc5..a973817 100755 --- a/src/assets/index.css +++ b/src/assets/index.css @@ -11,12 +11,11 @@ :root { --background: black; --main: #F5A804; - --accent-dark: #0026FF; - --accent-light: #17EFF9; + --accent-dark: #000e5f; + --accent-light: #17cbd4; --secondary-light: #EAA529; --secondary-dark: #370C03; - /* --secondary-bg: color-mix(in srbg, black, var(--main)); */ --grey-text: #9f9f9f; --grey-bg: #333333; @@ -51,8 +50,8 @@ body { background: var(--grey-bg); } .uncharted { - color: var(--secondary-light); - background: var(--secondary-dark); + color: var(--accent-light); + background: var(--accent-dark); } .hyperspace { diff --git a/src/models/Settings.ts b/src/models/Settings.ts index 48ad4d6..8ebfeb0 100644 --- a/src/models/Settings.ts +++ b/src/models/Settings.ts @@ -19,9 +19,6 @@ export class Settings { minValue: number; maxDistance: number; - color1?: {red: number, green: number, blue: number}; - color2?: {red: number, green: number, blue: number}; - private constructor(isPackaged: boolean) { if (!isPackaged && os.platform() === 'linux') { this.#file = '/mnt/c/Users/marle/ed-safari-settings.json'; diff --git a/src/models/UI.js b/src/models/UI.js index 65045d8..3c41d47 100755 --- a/src/models/UI.js +++ b/src/models/UI.js @@ -159,7 +159,7 @@ export class UI { const row = $('
').addClass('row ms-1 me-1'); row.attr('id', system.SystemAddress); // This is probably still the default 'true' value, but check in case the fetch() was quick. - const chartedStyle = system.charted ? 'uncharted' : 'uncharted'; + const chartedStyle = system.charted ? 'charted' : 'uncharted'; // name const name = $('
').addClass(`col system ${chartedStyle}`); diff --git a/src/renderer.js b/src/renderer.js index d84f20f..270c906 100755 --- a/src/renderer.js +++ b/src/renderer.js @@ -11,6 +11,7 @@ import { Settings } from './models/Settings'; import { UI } from './models/UI'; import { Body } from './models/Body'; import { EDSM } from './models/EDSM'; +import { blend } from './assets/blend'; // Grab app.isPackaged from main process let isPackaged = false; @@ -128,4 +129,8 @@ edsm.on('SYSTEM_APPRAISED', (system) => { if (systemRow.length > 0) { UI.setValue(systemRow, system.estimatedValueMapped); } -}); \ No newline at end of file +}); + +// const color = blend([245, 168, 4], [0, 0, 0], [0.4, 0.6]); +// const rgb = `rgb(${color[0]}, ${color[1]}, ${color[2]})`; +// $('body').css('--secondary-dark', rgb); \ No newline at end of file