Merge remote-tracking branch 'origin/master'

toast
Kit Kasune 3 years ago
commit 330b3d951f
  1. 4
      package.json
  2. 11
      scripts/startup/changelog.js
  3. 12
      styles/modal.css

@ -4,7 +4,7 @@
"description": "A file explorer (primarily a learning experience for me)", "description": "A file explorer (primarily a learning experience for me)",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {
"start": "electron-forge start", "start": "electron .",
"nv": "node newversion.js", "nv": "node newversion.js",
"package": "electron-forge package", "package": "electron-forge package",
"make": "electron-forge make" "make": "electron-forge make"
@ -31,7 +31,7 @@
{ {
"name": "@electron-forge/maker-squirrel", "name": "@electron-forge/maker-squirrel",
"config": { "config": {
"name": "filekade" "name": "FileKade"
} }
}, },
{ {

@ -20,9 +20,13 @@ module.exports = () => {
title.innerHTML = 'FileKade - Changelog'; title.innerHTML = 'FileKade - Changelog';
modal.appendChild(title); modal.appendChild(title);
let clww = document.createElement('div');
clww.className = 'changelog-anchor';
modal.appendChild(clww);
let clw = document.createElement('div'); let clw = document.createElement('div');
clw.className = 'changelog-wrapper'; clw.className = 'changelog-wrapper';
modal.appendChild(clw); clww.appendChild(clw);
changelogs.reverse().forEach(changelog => { changelogs.reverse().forEach(changelog => {
changelog = require(`../../json/changelogs/${changelog}`); changelog = require(`../../json/changelogs/${changelog}`);
@ -54,6 +58,11 @@ module.exports = () => {
}); });
}); });
clww.style = `height: ${modalOut.clientHeight - 6};`; // TODO cry enough tears that they magically make this line work
console.log(clww.style.height);
console.log(modalOut.clientHeight - 6);
console.log(typeof clww.style);
let msm = new Mousetrap(modal); let msm = new Mousetrap(modal);
msm.bind('esc', () => { msm.bind('esc', () => {
modalOut.remove(); modalOut.remove();

@ -74,6 +74,8 @@
margin: 0 0; margin: 0 0;
padding: 0 0; padding: 0 0;
position: relative; position: relative;
max-height: inherit;
height: inherit;
} }
.close-button-wrapper { .close-button-wrapper {
@ -118,11 +120,19 @@
align-items: stretch; align-items: stretch;
align-content: stretch; align-content: stretch;
justify-content: flex-start; justify-content: flex-start;
overflow: auto;
flex-direction: column; flex-direction: column;
row-gap: 8px; row-gap: 8px;
margin-top: 6px; margin-top: 6px;
margin-left: 6px; margin-left: 6px;
position: static;
max-height: inherit;
overflow-y: scroll;
}
.changelog-anchor {
position: static;
max-height: 62vh;
overflow: hidden;
} }
#changelog-modal {max-height: 70vh;} #changelog-modal {max-height: 70vh;}
Loading…
Cancel
Save