Skip to content

Commit

Permalink
Showing 9 changed files with 272 additions and 260 deletions.
1 change: 0 additions & 1 deletion dist/assets/index-3Mhk5upx.css

This file was deleted.

457 changes: 230 additions & 227 deletions dist/assets/index-ZTAWmi_Y.js → dist/assets/index-fF1kIuIy.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/assets/index-gIz_BSqQ.css

Large diffs are not rendered by default.

Binary file added dist/assets/logo-icon-color-DQ3f2Gvv.ico
Binary file not shown.
23 changes: 16 additions & 7 deletions dist/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
<!--
Copyright © 2010 - 2023 Matthew LaGrandeur
Copyright © 2010 - 2024 Matthew LaGrandeur
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -19,8 +19,17 @@
<head>
<meta charset="utf-8" />
<title>Glyphr Studio v2</title>
<meta name="viewport" content="width=device-width" />
<meta name="viewport" content="width=device-width" />
<link rel="shortcut icon" href="/v2/app/assets/logo-icon-color-DQ3f2Gvv.ico" />
<style>
:root {
--dark-gradient-background: linear-gradient(
135deg,
hsl(200, 100%, 12%),
hsl(285, 100%, 10%)
);
}

body,
#app__wrapper,
#app__landing-page {
@@ -35,7 +44,7 @@
}

body {
background: linear-gradient(135deg, var(--blue-l15), var(--purple-l05));
background: var(--dark-gradient-background);
}

#app__wrapper {
@@ -54,7 +63,7 @@
flex-direction: column;
justify-content: center;
padding-bottom: 189px;
background: linear-gradient(135deg, var(--blue-l15), var(--purple-l05));
background: var(--dark-gradient-background);
}

#app__landing-page svg,
@@ -112,13 +121,13 @@
user-select: text;
}
</style>
<script type="module" crossorigin src="/v2/app/assets/index-ZTAWmi_Y.js"></script>
<link rel="stylesheet" crossorigin href="/v2/app/assets/index-3Mhk5upx.css">
<script type="module" crossorigin src="/v2/app/assets/index-fF1kIuIy.js"></script>
<link rel="stylesheet" crossorigin href="/v2/app/assets/index-gIz_BSqQ.css">
</head>

<body
style="
background-color: hsl(200, 100%, 12%);
background-color: var(--dark-gradient-background);
width: 100%;
height: 100%;
min-width: 100%;
20 changes: 2 additions & 18 deletions src/app/app.js
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ export class GlyphrStudioApp {
// Version
this.versionName = 'Version 2';
this.version = '2.0.3';
this.versionDate = false;
this.versionDate = 1705348800000;

// Project Editors
this.projectEditors = [];
@@ -39,7 +39,7 @@ export class GlyphrStudioApp {
this.settings = {
dev: {
// Internal Dev Stuff
mode: true, // {bool} global switch for all the stuff below
mode: false, // {bool} global switch for all the stuff below
overwriteTitle: true, // {bool} Use a 'Dev Mode' window title
sampleProject: 'oblegg', // {bool or 'oblegg'} Load the sample project
twoSampleProjects: false, // {bool} Load two sample projects
@@ -166,22 +166,6 @@ export class GlyphrStudioApp {
}
}

/**
* An epoch date number that looks nice
* @param {Number} dayOffset - how many days to add to the result
* @returns - nice number for the day a version was shipped
*/
getShipDate(dayOffset = 0) {
const msOffset = dayOffset * 24 * 60 * 60 * 1000;
const shipDate = new Date();
shipDate.setHours(12, 0, 0, 0);
shipDate.setTime(shipDate.getTime() + msOffset);
let result = '' + shipDate.getTime();
result = result.substring(0, 5);
result = `${result}00000000`;
return result;
}

// --------------------------------------------------------------
// Local Storage and Auto-saves
// --------------------------------------------------------------
26 changes: 20 additions & 6 deletions src/app/main.js
Original file line number Diff line number Diff line change
@@ -33,12 +33,11 @@ export function glyphrStudioOnLoad() {
);
}
// log(`glyphrStudioOnLoad`, 'start');
let favIcon = makeElement({
tag: 'link',
attributes: { rel: 'shortcut icon', href: '../common/graphics/logo-icon-color.ico' },
});

document.head.appendChild(favIcon);
// let favIcon = makeElement({
// tag: 'link',
// attributes: { rel: 'shortcut icon', href: '../common/graphics/logo-icon-color.ico' },
// });
// document.head.appendChild(favIcon);

if (passPreChecks()) {
registerCustomComponents();
@@ -109,9 +108,24 @@ function addGlobalEventListeners() {
closeAllOptionChoosers();
closeAllInfoBubbles();
});
window.getShipDate = getShipDate;
// }
}

/**
* An epoch date number that looks nice
* @param {Number} dayOffset - how many days to add to the result
* @returns - nice number for the day a version was shipped
*/
function getShipDate(dayOffset = 0) {
const shipDate = new Date();
shipDate.setDate(shipDate.getDate() + dayOffset);
shipDate.setHours(12, 0, 0, 0);
const result = shipDate.getTime();
console.log(new Date(result).toString());
return result;
}

// --------------------------------------------------------------
// Getting root objects (App, Editor, Project / Current, Import Target)
// --------------------------------------------------------------
1 change: 1 addition & 0 deletions src/index.html
Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@
<meta charset="utf-8" />
<title>Glyphr Studio v2</title>
<meta name="viewport" content="width=device-width" />
<link rel="shortcut icon" href="./common/graphics/logo-icon-color.ico" />
<script src="app/main.js" type="module"></script>
<script type="module">
import { glyphrStudioOnLoad, GSApp, log } from './app/main.js';
3 changes: 2 additions & 1 deletion src/project_editor/pop_out_window.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { getCurrentProjectEditor } from '../app/main';
import colorStyle from '../common/colors.css?inline';
import { addAsChildren, makeElement } from '../common/dom';
import logo from '../common/graphics/logo-icon.svg?raw';
import resetStyle from '../common/resets.css?inline';
import { closeEveryTypeOfDialog, makeModalDialog, showToast } from '../controls/dialogs/dialogs';
import dialogStyle from '../controls/dialogs/dialogs.css?inline';
@@ -51,7 +52,7 @@ export function openPopOutWindow() {

let favIcon = makeElement({
tag: 'link',
attributes: { rel: 'shortcut icon', href: '../common/graphics/logo-icon-color.ico' },
attributes: { rel: 'shortcut icon', href: `data:image/svg+xml,${encodeURI(logo)}` },
});

popDoc.head.appendChild(favIcon);

0 comments on commit 4f19f24

Please sign in to comment.