Skip to content
This repository has been archived by the owner on Dec 14, 2024. It is now read-only.

Commit

Permalink
Merge pull request #2 from OmegaRogue/main
Browse files Browse the repository at this point in the history
Add intuitive reload hotkeys, cleanup
  • Loading branch information
theripper93 authored Jul 17, 2023
2 parents 7b1147f + ae9b8d2 commit 7fafd83
Show file tree
Hide file tree
Showing 4 changed files with 3,593 additions and 4,621 deletions.
6 changes: 6 additions & 0 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ app.whenReady().then(() => {
if (input.key === 'F12') {
win.webContents.toggleDevTools();
event.preventDefault();
} else if (input.key === 'F5') {
win.webContents.reload()
event.preventDefault();
} else if (input.key === 'F5' && input.control) {
win.webContents.reloadIgnoringCache()
event.preventDefault();
}
});
win.webContents.on("did-finish-load", () => {
Expand Down
28 changes: 21 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,35 @@
"description": "VTT Desktop Client",
"main": "main.js",
"author": "theripper93",
"contributors": [
{
"name": "theripper93",
"email": "[email protected]",
"url": "https://theripper93.com"
},
{
"name": "OmegaRogue",
"email": "[email protected]",
"url": "https://omegavoid.codes"
}
],
"devDependencies": {
"@electron-forge/cli": "^6.1.1",
"@electron-forge/maker-deb": "^6.1.1",
"@electron-forge/maker-rpm": "^6.1.1",
"@electron-forge/maker-squirrel": "^6.1.1",
"@electron-forge/maker-zip": "^6.1.1",
"electron": "^25.0.1",
"@electron-forge/cli": "latest",
"@electron-forge/maker-deb": "^6.2.1",
"@electron-forge/maker-rpm": "^6.2.1",
"@electron-forge/maker-squirrel": "^6.2.1",
"@electron-forge/maker-zip": "^6.2.1",
"@electron-forge/maker-flatpak": "^6.2.1",
"electron": "^25.3.0",
"electron-builder": "^23.6.0"
},
"scripts": {
"start": "electron-forge start",
"package": "electron-forge package",
"make": "electron-forge make",
"build": "electron-forge make",
"make:linux": "electron-builder --linux"
"make:linux": "electron-builder --linux",
"make:windows": "electron-forge make --platform win32"
},
"dependencies": {
"electron-squirrel-startup": "^1.0.0"
Expand Down
5 changes: 2 additions & 3 deletions style.css
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ button:hover {
}

.hidden {
height: 0px !important;
height: 0 !important;
}

.user-configuration {
Expand Down Expand Up @@ -140,8 +140,7 @@ button:hover {
font-size: 1rem;
font-weight: 700;
padding: 0.2rem;
margin: 0;
margin-left: auto;
margin: 0 0 0 auto;
transition: all 0.3s ease-in-out;
cursor: pointer;
}
Expand Down
Loading

0 comments on commit 7fafd83

Please sign in to comment.