From 4f6a9b7e73a8ca3336fec5210760d37bda45caaa Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Wed, 23 Dec 2020 17:09:02 +0100 Subject: [PATCH] format files --- gulpfile.js | 627 ++++++++++------------- package.json | 56 +- src/module/actor/actor-sheet.ts | 1 - src/module/item/item-sheet.ts | 2 +- src/scss/components/_apps.scss | 17 +- src/scss/components/_basic_property.scss | 18 +- src/scss/components/_description.scss | 54 +- src/scss/components/_forms.scss | 92 ++-- src/scss/components/_items.scss | 56 +- src/scss/components/_tabs.scss | 20 +- src/scss/global/_flex.scss | 82 +-- src/scss/global/_grid.scss | 72 +-- src/scss/global/_window.scss | 16 +- src/scss/utils/_colors.scss | 4 +- src/scss/utils/_mixins.scss | 20 +- src/scss/utils/_typography.scss | 8 +- src/scss/utils/_variables.scss | 2 +- tsconfig.json | 16 +- 18 files changed, 541 insertions(+), 622 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 5caa1cb2..83aa3820 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,55 +1,55 @@ -const gulp = require('gulp'); -const fs = require('fs-extra'); -const path = require('path'); -const chalk = require('chalk'); -const archiver = require('archiver'); -const stringify = require('json-stringify-pretty-compact'); -const typescript = require('typescript'); +const gulp = require("gulp"); +const fs = require("fs-extra"); +const path = require("path"); +const chalk = require("chalk"); +const archiver = require("archiver"); +const stringify = require("json-stringify-pretty-compact"); +const typescript = require("typescript"); -const ts = require('gulp-typescript'); -const less = require('gulp-less'); -const sass = require('gulp-sass'); -const git = require('gulp-git'); +const ts = require("gulp-typescript"); +const less = require("gulp-less"); +const sass = require("gulp-sass"); +const git = require("gulp-git"); -const argv = require('yargs').argv; +const argv = require("yargs").argv; -sass.compiler = require('sass'); +sass.compiler = require("sass"); function getConfig() { - const configPath = path.resolve(process.cwd(), 'foundryconfig.json'); - let config; + const configPath = path.resolve(process.cwd(), "foundryconfig.json"); + let config; - if (fs.existsSync(configPath)) { - config = fs.readJSONSync(configPath); - return config; - } else { - return; - } + if (fs.existsSync(configPath)) { + config = fs.readJSONSync(configPath); + return config; + } else { + return; + } } function getManifest() { - const json = {}; + const json = {}; - if (fs.existsSync('src')) { - json.root = 'src'; - } else { - json.root = 'dist'; - } + if (fs.existsSync("src")) { + json.root = "src"; + } else { + json.root = "dist"; + } - const modulePath = path.join(json.root, 'module.json'); - const systemPath = path.join(json.root, 'system.json'); + const modulePath = path.join(json.root, "module.json"); + const systemPath = path.join(json.root, "system.json"); - if (fs.existsSync(modulePath)) { - json.file = fs.readJSONSync(modulePath); - json.name = 'module.json'; - } else if (fs.existsSync(systemPath)) { - json.file = fs.readJSONSync(systemPath); - json.name = 'system.json'; - } else { - return; - } + if (fs.existsSync(modulePath)) { + json.file = fs.readJSONSync(modulePath); + json.name = "module.json"; + } else if (fs.existsSync(systemPath)) { + json.file = fs.readJSONSync(systemPath); + json.name = "system.json"; + } else { + return; + } - return json; + return json; } /** @@ -57,75 +57,63 @@ function getManifest() { * @returns {typescript.TransformerFactory} */ function createTransformer() { - /** - * @param {typescript.Node} node - */ - function shouldMutateModuleSpecifier(node) { - if ( - !typescript.isImportDeclaration(node) && - !typescript.isExportDeclaration(node) - ) - return false; - if (node.moduleSpecifier === undefined) return false; - if (!typescript.isStringLiteral(node.moduleSpecifier)) return false; - if ( - !node.moduleSpecifier.text.startsWith('./') && - !node.moduleSpecifier.text.startsWith('../') - ) - return false; - if (path.extname(node.moduleSpecifier.text) !== '') return false; - return true; - } + /** + * @param {typescript.Node} node + */ + function shouldMutateModuleSpecifier(node) { + if (!typescript.isImportDeclaration(node) && !typescript.isExportDeclaration(node)) return false; + if (node.moduleSpecifier === undefined) return false; + if (!typescript.isStringLiteral(node.moduleSpecifier)) return false; + if (!node.moduleSpecifier.text.startsWith("./") && !node.moduleSpecifier.text.startsWith("../")) return false; + if (path.extname(node.moduleSpecifier.text) !== "") return false; + return true; + } - /** - * Transforms import/export declarations to append `.js` extension - * @param {typescript.TransformationContext} context - */ - function importTransformer(context) { - return (node) => { - /** - * @param {typescript.Node} node - */ - function visitor(node) { - if (shouldMutateModuleSpecifier(node)) { - if (typescript.isImportDeclaration(node)) { - const newModuleSpecifier = typescript.createLiteral( - `${node.moduleSpecifier.text}.js` - ); - return typescript.updateImportDeclaration( - node, - node.decorators, - node.modifiers, - node.importClause, - newModuleSpecifier - ); - } else if (typescript.isExportDeclaration(node)) { - const newModuleSpecifier = typescript.createLiteral( - `${node.moduleSpecifier.text}.js` - ); - return typescript.updateExportDeclaration( - node, - node.decorators, - node.modifiers, - node.exportClause, - newModuleSpecifier - ); - } - } - return typescript.visitEachChild(node, visitor, context); - } + /** + * Transforms import/export declarations to append `.js` extension + * @param {typescript.TransformationContext} context + */ + function importTransformer(context) { + return (node) => { + /** + * @param {typescript.Node} node + */ + function visitor(node) { + if (shouldMutateModuleSpecifier(node)) { + if (typescript.isImportDeclaration(node)) { + const newModuleSpecifier = typescript.createLiteral(`${node.moduleSpecifier.text}.js`); + return typescript.updateImportDeclaration( + node, + node.decorators, + node.modifiers, + node.importClause, + newModuleSpecifier + ); + } else if (typescript.isExportDeclaration(node)) { + const newModuleSpecifier = typescript.createLiteral(`${node.moduleSpecifier.text}.js`); + return typescript.updateExportDeclaration( + node, + node.decorators, + node.modifiers, + node.exportClause, + newModuleSpecifier + ); + } + } + return typescript.visitEachChild(node, visitor, context); + } - return typescript.visitNode(node, visitor); - }; - } + return typescript.visitNode(node, visitor); + }; + } - return importTransformer; + return importTransformer; } -const tsConfig = ts.createProject('tsconfig.json', { - getCustomTransformers: (_program) => ({ - after: [createTransformer()], - }), +const tsConfig = ts.createProject("tsconfig.json", { + getCustomTransformers: (_program) => ({ + after: [createTransformer()], + }), }); /********************/ @@ -136,63 +124,48 @@ const tsConfig = ts.createProject('tsconfig.json', { * Build TypeScript */ function buildTS() { - return gulp.src('src/**/*.ts').pipe(tsConfig()).pipe(gulp.dest('dist')); + return gulp.src("src/**/*.ts").pipe(tsConfig()).pipe(gulp.dest("dist")); } /** * Build Less */ function buildLess() { - return gulp.src('src/*.less').pipe(less()).pipe(gulp.dest('dist')); + return gulp.src("src/*.less").pipe(less()).pipe(gulp.dest("dist")); } /** * Build SASS */ function buildSASS() { - return gulp - .src('src/*.scss') - .pipe(sass().on('error', sass.logError)) - .pipe(gulp.dest('dist')); + return gulp.src("src/*.scss").pipe(sass().on("error", sass.logError)).pipe(gulp.dest("dist")); } /** * Copy static files */ async function copyFiles() { - const statics = [ - 'lang', - 'fonts', - 'assets', - 'templates', - 'module.json', - 'system.json', - 'template.json', - ]; - try { - for (const file of statics) { - if (fs.existsSync(path.join('src', file))) { - await fs.copy(path.join('src', file), path.join('dist', file)); - } - } - return Promise.resolve(); - } catch (err) { - Promise.reject(err); - } + const statics = ["lang", "fonts", "assets", "templates", "module.json", "system.json", "template.json"]; + try { + for (const file of statics) { + if (fs.existsSync(path.join("src", file))) { + await fs.copy(path.join("src", file), path.join("dist", file)); + } + } + return Promise.resolve(); + } catch (err) { + Promise.reject(err); + } } /** * Watch for changes for each build step */ function buildWatch() { - gulp.watch('src/**/*.ts', { ignoreInitial: false }, buildTS); - gulp.watch('src/**/*.less', { ignoreInitial: false }, buildLess); - gulp.watch('src/**/*.scss', { ignoreInitial: false }, buildSASS); - gulp.watch( - ['src/fonts', 'src/lang', 'src/templates', 'src/*.json'], - { ignoreInitial: false }, - copyFiles - ); + gulp.watch("src/**/*.ts", { ignoreInitial: false }, buildTS); + gulp.watch("src/**/*.less", { ignoreInitial: false }, buildLess); + gulp.watch("src/**/*.scss", { ignoreInitial: false }, buildSASS); + gulp.watch(["src/fonts", "src/lang", "src/templates", "src/*.json"], { ignoreInitial: false }, copyFiles); } /********************/ @@ -204,43 +177,40 @@ function buildWatch() { * while ignoring source files */ async function clean() { - const name = path.basename(path.resolve('.')); - const files = []; + const name = path.basename(path.resolve(".")); + const files = []; - // If the project uses TypeScript - if (fs.existsSync(path.join('src', `${name}.ts`))) { - files.push( - 'lang', - 'templates', - 'assets', - 'module', - `${name}.js`, - 'module.json', - 'system.json', - 'template.json' - ); - } + // If the project uses TypeScript + if (fs.existsSync(path.join("src", `${name}.ts`))) { + files.push( + "lang", + "templates", + "assets", + "module", + `${name}.js`, + "module.json", + "system.json", + "template.json" + ); + } - // If the project uses Less or SASS - if ( - fs.existsSync(path.join('src', `${name}.less`)) || - fs.existsSync(path.join('src', `${name}.scss`)) - ) { - files.push('fonts', `${name}.css`); - } + // If the project uses Less or SASS + if (fs.existsSync(path.join("src", `${name}.less`)) || fs.existsSync(path.join("src", `${name}.scss`))) { + files.push("fonts", `${name}.css`); + } - console.log(' ', chalk.yellow('Files to clean:')); - console.log(' ', chalk.blueBright(files.join('\n '))); + console.log(" ", chalk.yellow("Files to clean:")); + console.log(" ", chalk.blueBright(files.join("\n "))); - // Attempt to remove the files - try { - for (const filePath of files) { - await fs.remove(path.join('dist', filePath)); - } - return Promise.resolve(); - } catch (err) { - Promise.reject(err); - } + // Attempt to remove the files + try { + for (const filePath of files) { + await fs.remove(path.join("dist", filePath)); + } + return Promise.resolve(); + } catch (err) { + Promise.reject(err); + } } /********************/ @@ -251,55 +221,47 @@ async function clean() { * Link build to User Data folder */ async function linkUserData() { - const name = path.basename(path.resolve('.')); - const config = fs.readJSONSync('foundryconfig.json'); + const name = path.basename(path.resolve(".")); + const config = fs.readJSONSync("foundryconfig.json"); - let destDir; - try { - if ( - fs.existsSync(path.resolve('.', 'dist', 'module.json')) || - fs.existsSync(path.resolve('.', 'src', 'module.json')) - ) { - destDir = 'modules'; - } else if ( - fs.existsSync(path.resolve('.', 'dist', 'system.json')) || - fs.existsSync(path.resolve('.', 'src', 'system.json')) - ) { - destDir = 'systems'; - } else { - throw Error( - `Could not find ${chalk.blueBright( - 'module.json' - )} or ${chalk.blueBright('system.json')}` - ); - } + let destDir; + try { + if ( + fs.existsSync(path.resolve(".", "dist", "module.json")) || + fs.existsSync(path.resolve(".", "src", "module.json")) + ) { + destDir = "modules"; + } else if ( + fs.existsSync(path.resolve(".", "dist", "system.json")) || + fs.existsSync(path.resolve(".", "src", "system.json")) + ) { + destDir = "systems"; + } else { + throw Error(`Could not find ${chalk.blueBright("module.json")} or ${chalk.blueBright("system.json")}`); + } - let linkDir; - if (config.dataPath) { - if (!fs.existsSync(path.join(config.dataPath, 'Data'))) - throw Error('User Data path invalid, no Data directory found'); + let linkDir; + if (config.dataPath) { + if (!fs.existsSync(path.join(config.dataPath, "Data"))) + throw Error("User Data path invalid, no Data directory found"); - linkDir = path.join(config.dataPath, 'Data', destDir, name); - } else { - throw Error('No User Data path defined in foundryconfig.json'); - } + linkDir = path.join(config.dataPath, "Data", destDir, name); + } else { + throw Error("No User Data path defined in foundryconfig.json"); + } - if (argv.clean || argv.c) { - console.log( - chalk.yellow(`Removing build in ${chalk.blueBright(linkDir)}`) - ); + if (argv.clean || argv.c) { + console.log(chalk.yellow(`Removing build in ${chalk.blueBright(linkDir)}`)); - await fs.remove(linkDir); - } else if (!fs.existsSync(linkDir)) { - console.log( - chalk.green(`Copying build to ${chalk.blueBright(linkDir)}`) - ); - await fs.symlink(path.resolve('./dist'), linkDir); - } - return Promise.resolve(); - } catch (err) { - Promise.reject(err); - } + await fs.remove(linkDir); + } else if (!fs.existsSync(linkDir)) { + console.log(chalk.green(`Copying build to ${chalk.blueBright(linkDir)}`)); + await fs.symlink(path.resolve("./dist"), linkDir); + } + return Promise.resolve(); + } catch (err) { + Promise.reject(err); + } } /*********************/ @@ -310,47 +272,45 @@ async function linkUserData() { * Package build */ async function packageBuild() { - const manifest = getManifest(); + const manifest = getManifest(); - return new Promise((resolve, reject) => { - try { - // Remove the package dir without doing anything else - if (argv.clean || argv.c) { - console.log(chalk.yellow('Removing all packaged files')); - fs.removeSync('package'); - return; - } + return new Promise((resolve, reject) => { + try { + // Remove the package dir without doing anything else + if (argv.clean || argv.c) { + console.log(chalk.yellow("Removing all packaged files")); + fs.removeSync("package"); + return; + } - // Ensure there is a directory to hold all the packaged versions - fs.ensureDirSync('package'); + // Ensure there is a directory to hold all the packaged versions + fs.ensureDirSync("package"); - // Initialize the zip file - const zipName = `${manifest.file.name}-v${manifest.file.version}.zip`; - const zipFile = fs.createWriteStream(path.join('package', zipName)); - const zip = archiver('zip', { zlib: { level: 9 } }); + // Initialize the zip file + const zipName = `${manifest.file.name}-v${manifest.file.version}.zip`; + const zipFile = fs.createWriteStream(path.join("package", zipName)); + const zip = archiver("zip", { zlib: { level: 9 } }); - zipFile.on('close', () => { - console.log(chalk.green(zip.pointer() + ' total bytes')); - console.log( - chalk.green(`Zip file ${zipName} has been written`) - ); - return resolve(); - }); + zipFile.on("close", () => { + console.log(chalk.green(zip.pointer() + " total bytes")); + console.log(chalk.green(`Zip file ${zipName} has been written`)); + return resolve(); + }); - zip.on('error', (err) => { - throw err; - }); + zip.on("error", (err) => { + throw err; + }); - zip.pipe(zipFile); + zip.pipe(zipFile); - // Add the directory with the final code - zip.directory('dist/', manifest.file.name); + // Add the directory with the final code + zip.directory("dist/", manifest.file.name); - zip.finalize(); - } catch (err) { - return reject(err); - } - }); + zip.finalize(); + } catch (err) { + return reject(err); + } + }); } /*********************/ @@ -361,128 +321,99 @@ async function packageBuild() { * Update version and URLs in the manifest JSON */ function updateManifest(cb) { - const packageJson = fs.readJSONSync('package.json'); - const config = getConfig(), - manifest = getManifest(), - rawURL = config.rawURL, - repoURL = config.repository, - manifestRoot = manifest.root; + const packageJson = fs.readJSONSync("package.json"); + const config = getConfig(), + manifest = getManifest(), + rawURL = config.rawURL, + repoURL = config.repository, + manifestRoot = manifest.root; - if (!config) cb(Error(chalk.red('foundryconfig.json not found'))); - if (!manifest) cb(Error(chalk.red('Manifest JSON not found'))); - if (!rawURL || !repoURL) - cb( - Error( - chalk.red( - 'Repository URLs not configured in foundryconfig.json' - ) - ) - ); + if (!config) cb(Error(chalk.red("foundryconfig.json not found"))); + if (!manifest) cb(Error(chalk.red("Manifest JSON not found"))); + if (!rawURL || !repoURL) cb(Error(chalk.red("Repository URLs not configured in foundryconfig.json"))); - try { - const version = argv.update || argv.u; + try { + const version = argv.update || argv.u; - /* Update version */ + /* Update version */ - const versionMatch = /^(\d{1,}).(\d{1,}).(\d{1,})$/; - const currentVersion = manifest.file.version; - let targetVersion = ''; + const versionMatch = /^(\d{1,}).(\d{1,}).(\d{1,})$/; + const currentVersion = manifest.file.version; + let targetVersion = ""; - if (!version) { - cb(Error('Missing version number')); - } + if (!version) { + cb(Error("Missing version number")); + } - if (versionMatch.test(version)) { - targetVersion = version; - } else { - targetVersion = currentVersion.replace( - versionMatch, - (substring, major, minor, patch) => { - console.log( - substring, - Number(major) + 1, - Number(minor) + 1, - Number(patch) + 1 - ); - if (version === 'major') { - return `${Number(major) + 1}.0.0`; - } else if (version === 'minor') { - return `${major}.${Number(minor) + 1}.0`; - } else if (version === 'patch') { - return `${major}.${minor}.${Number(patch) + 1}`; - } else { - return ''; - } - } - ); - } + if (versionMatch.test(version)) { + targetVersion = version; + } else { + targetVersion = currentVersion.replace(versionMatch, (substring, major, minor, patch) => { + console.log(substring, Number(major) + 1, Number(minor) + 1, Number(patch) + 1); + if (version === "major") { + return `${Number(major) + 1}.0.0`; + } else if (version === "minor") { + return `${major}.${Number(minor) + 1}.0`; + } else if (version === "patch") { + return `${major}.${minor}.${Number(patch) + 1}`; + } else { + return ""; + } + }); + } - if (targetVersion === '') { - return cb(Error(chalk.red('Error: Incorrect version arguments.'))); - } + if (targetVersion === "") { + return cb(Error(chalk.red("Error: Incorrect version arguments."))); + } - if (targetVersion === currentVersion) { - return cb( - Error( - chalk.red( - 'Error: Target version is identical to current version.' - ) - ) - ); - } - console.log(`Updating version number to '${targetVersion}'`); + if (targetVersion === currentVersion) { + return cb(Error(chalk.red("Error: Target version is identical to current version."))); + } + console.log(`Updating version number to '${targetVersion}'`); - packageJson.version = targetVersion; - manifest.file.version = targetVersion; + packageJson.version = targetVersion; + manifest.file.version = targetVersion; - /* Update URLs */ + /* Update URLs */ - const result = `${rawURL}/v${manifest.file.version}/package/${manifest.file.name}-v${manifest.file.version}.zip`; + const result = `${rawURL}/v${manifest.file.version}/package/${manifest.file.name}-v${manifest.file.version}.zip`; - manifest.file.url = repoURL; - manifest.file.manifest = `${rawURL}/master/${manifestRoot}/${manifest.name}`; - manifest.file.download = result; + manifest.file.url = repoURL; + manifest.file.manifest = `${rawURL}/master/${manifestRoot}/${manifest.name}`; + manifest.file.download = result; - const prettyProjectJson = stringify(manifest.file, { - maxLength: 35, - indent: '\t', - }); + const prettyProjectJson = stringify(manifest.file, { + maxLength: 35, + indent: "\t", + }); - fs.writeJSONSync('package.json', packageJson, { spaces: '\t' }); - fs.writeFileSync( - path.join(manifest.root, manifest.name), - prettyProjectJson, - 'utf8' - ); + fs.writeJSONSync("package.json", packageJson, { spaces: "\t" }); + fs.writeFileSync(path.join(manifest.root, manifest.name), prettyProjectJson, "utf8"); - return cb(); - } catch (err) { - cb(err); - } + return cb(); + } catch (err) { + cb(err); + } } function gitAdd() { - return gulp.src('package').pipe(git.add({ args: '--no-all' })); + return gulp.src("package").pipe(git.add({ args: "--no-all" })); } function gitCommit() { - return gulp.src('./*').pipe( - git.commit(`v${getManifest().file.version}`, { - args: '-a', - disableAppendPaths: true, - }) - ); + return gulp.src("./*").pipe( + git.commit(`v${getManifest().file.version}`, { + args: "-a", + disableAppendPaths: true, + }) + ); } function gitTag() { - const manifest = getManifest(); - return git.tag( - `v${manifest.file.version}`, - `Updated to ${manifest.file.version}`, - (err) => { - if (err) throw err; - } - ); + const manifest = getManifest(); + return git.tag(`v${manifest.file.version}`, `Updated to ${manifest.file.version}`, (err) => { + if (err) throw err; + }); } const execGit = gulp.series(gitAdd, gitCommit, gitTag); @@ -495,10 +426,4 @@ exports.clean = clean; exports.link = linkUserData; exports.package = packageBuild; exports.update = updateManifest; -exports.publish = gulp.series( - clean, - updateManifest, - execBuild, - packageBuild, - execGit -); +exports.publish = gulp.series(clean, updateManifest, execBuild, packageBuild, execGit); diff --git a/package.json b/package.json index 639aa33e..a02f90cc 100644 --- a/package.json +++ b/package.json @@ -1,30 +1,30 @@ { - "private": true, - "name": "test", - "version": "0.1.0", - "description": "", - "scripts": { - "package": "gulp package", - "build": "gulp build && gulp link", - "build:watch": "gulp watch", - "clean": "gulp clean && gulp link --clean", - "update": "npm install --save-dev gitlab:foundry-projects/foundry-pc/foundry-pc-types" - }, - "author": "", - "license": "", - "devDependencies": { - "archiver": "^5.1.0", - "chalk": "^4.1.0", - "foundry-pc-types": "gitlab:foundry-projects/foundry-pc/foundry-pc-types", - "fs-extra": "^9.0.1", - "gulp": "^4.0.2", - "gulp-git": "^2.10.1", - "gulp-less": "^4.0.1", - "gulp-sass": "^4.1.0", - "gulp-typescript": "^6.0.0-alpha.1", - "json-stringify-pretty-compact": "^2.0.0", - "sass": "^1.30.0", - "typescript": "^4.1.3", - "yargs": "^16.2.0" - } + "private": true, + "name": "test", + "version": "0.1.0", + "description": "", + "scripts": { + "package": "gulp package", + "build": "gulp build && gulp link", + "build:watch": "gulp watch", + "clean": "gulp clean && gulp link --clean", + "update": "npm install --save-dev gitlab:foundry-projects/foundry-pc/foundry-pc-types" + }, + "author": "", + "license": "", + "devDependencies": { + "archiver": "^5.1.0", + "chalk": "^4.1.0", + "foundry-pc-types": "gitlab:foundry-projects/foundry-pc/foundry-pc-types", + "fs-extra": "^9.0.1", + "gulp": "^4.0.2", + "gulp-git": "^2.10.1", + "gulp-less": "^4.0.1", + "gulp-sass": "^4.1.0", + "gulp-typescript": "^6.0.0-alpha.1", + "json-stringify-pretty-compact": "^2.0.0", + "sass": "^1.30.0", + "typescript": "^4.1.3", + "yargs": "^16.2.0" + } } diff --git a/src/module/actor/actor-sheet.ts b/src/module/actor/actor-sheet.ts index 7e45518a..0cf39b63 100644 --- a/src/module/actor/actor-sheet.ts +++ b/src/module/actor/actor-sheet.ts @@ -23,7 +23,6 @@ export class DS4ActorSheet extends ActorSheet<{ // TODO: replace ["..."] access with . const data = super.getData(); data["dtypes"] = ["String", "Number", "Boolean"]; - const innerData = data.data; for (let attr of Object.values(data.data["attributes"])) { attr["isCheckbox"] = attr["dtype"] === "Boolean"; } diff --git a/src/module/item/item-sheet.ts b/src/module/item/item-sheet.ts index 159ace55..5c3de1e4 100644 --- a/src/module/item/item-sheet.ts +++ b/src/module/item/item-sheet.ts @@ -35,7 +35,7 @@ export class DS4ItemSheet extends ItemSheet { const position = super.setPosition(options); const sheetBody = (this.element as JQuery).find(".sheet-body"); // TODO: Why is the cast necessary? const bodyHeight = position.height - 192; - //sheetBody.css("height", bodyHeight); + sheetBody.css("height", bodyHeight); return position; } diff --git a/src/scss/components/_apps.scss b/src/scss/components/_apps.scss index 1a199111..3f8ba623 100644 --- a/src/scss/components/_apps.scss +++ b/src/scss/components/_apps.scss @@ -1,16 +1,15 @@ .window-content { overflow-y: hidden; padding: 5px; - + form { - height: 100%; - overflow: hidden; + height: 100%; + overflow: hidden; } - + .tab { - height: 100%; - overflow-y: auto; - align-content: flex-start; + height: 100%; + overflow-y: auto; + align-content: flex-start; } - } - \ No newline at end of file +} diff --git a/src/scss/components/_basic_property.scss b/src/scss/components/_basic_property.scss index b64aae11..6f725dad 100644 --- a/src/scss/components/_basic_property.scss +++ b/src/scss/components/_basic_property.scss @@ -1,13 +1,13 @@ .basic-properties { - flex: 0 0 100%; - .basic-property { - .basic-property-label { - font-weight: bold; - } + flex: 0 0 100%; + .basic-property { + .basic-property-label { + font-weight: bold; + } - .basic-property-select { - display: block; - width: 100%; + .basic-property-select { + display: block; + width: 100%; + } } - } } diff --git a/src/scss/components/_description.scss b/src/scss/components/_description.scss index 789f3e23..61ce282f 100644 --- a/src/scss/components/_description.scss +++ b/src/scss/components/_description.scss @@ -1,39 +1,39 @@ .side-properties { - flex: 0 0 150px; - margin: 5px 5px 5px 0; - padding-right: 5px; - border-right: 2px groove $c-border-groove; + flex: 0 0 150px; + margin: 5px 5px 5px 0; + padding-right: 5px; + border-right: 2px groove $c-border-groove; - .side-property { - margin: 2px 0; - display: flex; - flex-direction: row; + .side-property { + margin: 2px 0; + display: flex; + flex-direction: row; - label { - flex: 2; - line-height: 26px; - font-weight: bold; + label { + flex: 2; + line-height: 26px; + font-weight: bold; + } + + input, + select { + text-align: right; + flex: 1; + width: calc(100% - 2px); + } } - - input, - select { - text-align: right; - flex: 1; - width: calc(100% - 2px); - } - } } .sheet-body .tab .editor { - height: 100%; + height: 100%; } .tox { - .tox-editor-container { - background: $c-white; - } + .tox-editor-container { + background: $c-white; + } - .tox-edit-area { - padding: 0 8px; - } + .tox-edit-area { + padding: 0 8px; + } } diff --git a/src/scss/components/_forms.scss b/src/scss/components/_forms.scss index 8f4747f5..acd5f812 100644 --- a/src/scss/components/_forms.scss +++ b/src/scss/components/_forms.scss @@ -1,62 +1,62 @@ .item-form { - font-family: $font-primary; + font-family: $font-primary; } $header-top-margin: 5px; header.sheet-header { - flex: 0 0 210px; - overflow: hidden; - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: flex-start; - align-items: flex-start; + flex: 0 0 210px; + overflow: hidden; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: flex-start; + align-items: flex-start; - .profile-img { - flex: 0 0 100px; - height: 100px; - margin: $header-top-margin 10px $header-top-margin 0; - } - - .header-fields { - flex: 1; - } - - h1.charname { - height: 50px; - padding: 0px; - margin: $header-top-margin 10px $header-top-margin 0; - border-bottom: 0; - input { - width: 100%; - height: 100%; - margin: 0; - border: none; - background-color: transparent; + .profile-img { + flex: 0 0 100px; + height: 100px; + margin: $header-top-margin 10px $header-top-margin 0; + } + + .header-fields { + flex: 1; + } + + h1.charname { + height: 50px; + padding: 0px; + margin: $header-top-margin 10px $header-top-margin 0; + border-bottom: 0; + input { + width: 100%; + height: 100%; + margin: 0; + border: none; + background-color: transparent; + } + font-family: $font-heading; + display: block; + } + h2.item-type { + font-family: $font-heading; + display: block; + height: 50px; + padding: 0px; + flex: 0 0 0; + color: $c-light-grey; + border: none; + line-height: 50px; + margin: $header-top-margin 0; + text-align: right; } - font-family: $font-heading; - display: block; - } - h2.item-type { - font-family: $font-heading; - display: block; - height: 50px; - padding: 0px; - flex: 0 0 0; - color: $c-light-grey; - border: none; - line-height: 50px; - margin: $header-top-margin 0; - text-align: right; - } } .sheet-tabs { - flex: 0; + flex: 0; } .sheet-body, .sheet-body .tab { - height: 100%; + height: 100%; } diff --git a/src/scss/components/_items.scss b/src/scss/components/_items.scss index 8202bcd9..7a2d860b 100644 --- a/src/scss/components/_items.scss +++ b/src/scss/components/_items.scss @@ -1,35 +1,35 @@ .items-list { - list-style: none; - margin: 7px 0; - padding: 0; - overflow-y: auto; + list-style: none; + margin: 7px 0; + padding: 0; + overflow-y: auto; - .item-header { - font-weight: bold; - } - - .item { - height: 30px; - line-height: 24px; - padding: 3px 0; - border-bottom: 1px solid #BBB; - - .item-image { - flex: 0 0 24px; - margin-right: 5px; + .item-header { + font-weight: bold; } - img { - display: block; + .item { + height: 30px; + line-height: 24px; + padding: 3px 0; + border-bottom: 1px solid #bbb; + + .item-image { + flex: 0 0 24px; + margin-right: 5px; + } + + img { + display: block; + } } - } - .item-name { - margin: 0; - } + .item-name { + margin: 0; + } - .item-controls { - flex: 0 0 86px; - text-align: right; - } -} \ No newline at end of file + .item-controls { + flex: 0 0 86px; + text-align: right; + } +} diff --git a/src/scss/components/_tabs.scss b/src/scss/components/_tabs.scss index aa6aa48c..fbeb2350 100644 --- a/src/scss/components/_tabs.scss +++ b/src/scss/components/_tabs.scss @@ -1,14 +1,14 @@ nav.tabs { - height: 40px; - border-top: 2px groove $c-border-groove; - border-bottom: 2px groove $c-border-groove; + height: 40px; + border-top: 2px groove $c-border-groove; + border-bottom: 2px groove $c-border-groove; - .item { - line-height: 40px; - font-weight: bold; - } + .item { + line-height: 40px; + font-weight: bold; + } - .item.active { - text-decoration: none; - } + .item.active { + text-decoration: none; + } } diff --git a/src/scss/global/_flex.scss b/src/scss/global/_flex.scss index 995d7993..af5108e5 100644 --- a/src/scss/global/_flex.scss +++ b/src/scss/global/_flex.scss @@ -3,58 +3,58 @@ /* ----------------------------------------- */ .flexrow { - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: flex-start; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: flex-start; - > * { - flex: 1; - } + > * { + flex: 1; + } - .flex1 { - flex: 1; - } - .flex2 { - flex: 2; - } - .flex3 { - flex: 3; - } - .flex4 { - flex: 4; - } + .flex1 { + flex: 1; + } + .flex2 { + flex: 2; + } + .flex3 { + flex: 3; + } + .flex4 { + flex: 4; + } } .flexcol { - display: flex; - flex-direction: column; - flex-wrap: nowrap; + display: flex; + flex-direction: column; + flex-wrap: nowrap; - > * { - flex: 1; - } + > * { + flex: 1; + } - .flex1 { - flex: 1; - } - .flex2 { - flex: 2; - } - .flex3 { - flex: 3; - } - .flex4 { - flex: 4; - } + .flex1 { + flex: 1; + } + .flex2 { + flex: 2; + } + .flex3 { + flex: 3; + } + .flex4 { + flex: 4; + } } .flex-center { - align-items: center; - justify-content: center; - text-align: center; + align-items: center; + justify-content: center; + text-align: center; } .flex-between { - justify-content: space-between; + justify-content: space-between; } diff --git a/src/scss/global/_grid.scss b/src/scss/global/_grid.scss index 21b14001..8498a314 100644 --- a/src/scss/global/_grid.scss +++ b/src/scss/global/_grid.scss @@ -1,83 +1,83 @@ .grid, .grid-2col { - display: grid; - grid-column: span 2 / span 2; - grid-template-columns: repeat(2, minmax(0, 1fr)); - gap: 10px; - padding: 0; + display: grid; + grid-column: span 2 / span 2; + grid-template-columns: repeat(2, minmax(0, 1fr)); + gap: 10px; + padding: 0; } .grid-1col { - grid-column: span 1 / span 1; - grid-template-columns: repeat(1, minmax(0, 1fr)); + grid-column: span 1 / span 1; + grid-template-columns: repeat(1, minmax(0, 1fr)); } .grid-3col { - grid-column: span 3 / span 3; - grid-template-columns: repeat(3, minmax(0, 1fr)); + grid-column: span 3 / span 3; + grid-template-columns: repeat(3, minmax(0, 1fr)); } .grid-4col { - grid-column: span 4 / span 4; - grid-template-columns: repeat(4, minmax(0, 1fr)); + grid-column: span 4 / span 4; + grid-template-columns: repeat(4, minmax(0, 1fr)); } .grid-5col { - grid-column: span 5 / span 5; - grid-template-columns: repeat(5, minmax(0, 1fr)); + grid-column: span 5 / span 5; + grid-template-columns: repeat(5, minmax(0, 1fr)); } .grid-6col { - grid-column: span 5 / span 5; - grid-template-columns: repeat(5, minmax(0, 1fr)); + grid-column: span 5 / span 5; + grid-template-columns: repeat(5, minmax(0, 1fr)); } .grid-7col { - grid-column: span 7 / span 7; - grid-template-columns: repeat(7, minmax(0, 1fr)); + grid-column: span 7 / span 7; + grid-template-columns: repeat(7, minmax(0, 1fr)); } .grid-8col { - grid-column: span 8 / span 8; - grid-template-columns: repeat(8, minmax(0, 1fr)); + grid-column: span 8 / span 8; + grid-template-columns: repeat(8, minmax(0, 1fr)); } .grid-9col { - grid-column: span 9 / span 9; - grid-template-columns: repeat(9, minmax(0, 1fr)); + grid-column: span 9 / span 9; + grid-template-columns: repeat(9, minmax(0, 1fr)); } .grid-10col { - grid-column: span 10 / span 10; - grid-template-columns: repeat(10, minmax(0, 1fr)); + grid-column: span 10 / span 10; + grid-template-columns: repeat(10, minmax(0, 1fr)); } .grid-11col { - grid-column: span 11 / span 11; - grid-template-columns: repeat(11, minmax(0, 1fr)); + grid-column: span 11 / span 11; + grid-template-columns: repeat(11, minmax(0, 1fr)); } .grid-12col { - grid-column: span 12 / span 12; - grid-template-columns: repeat(12, minmax(0, 1fr)); + grid-column: span 12 / span 12; + grid-template-columns: repeat(12, minmax(0, 1fr)); } .flex-group-center, .flex-group-left, .flex-group-right { - justify-content: center; - align-items: center; - text-align: center; - padding: 5px; - border: 1px solid #999; + justify-content: center; + align-items: center; + text-align: center; + padding: 5px; + border: 1px solid #999; } .flex-group-left { - justify-content: flex-start; - text-align: left; + justify-content: flex-start; + text-align: left; } .flex-group-right { - justify-content: flex-end; - text-align: right; + justify-content: flex-end; + text-align: right; } diff --git a/src/scss/global/_window.scss b/src/scss/global/_window.scss index 97581e5b..bbe12083 100644 --- a/src/scss/global/_window.scss +++ b/src/scss/global/_window.scss @@ -1,12 +1,12 @@ .window-app { - font-family: $font-primary; + font-family: $font-primary; } .rollable { - &:hover, - &:focus { - color: #000; - text-shadow: 0 0 10px red; - cursor: pointer; - } -} \ No newline at end of file + &:hover, + &:focus { + color: #000; + text-shadow: 0 0 10px red; + cursor: pointer; + } +} diff --git a/src/scss/utils/_colors.scss b/src/scss/utils/_colors.scss index ce8c1bb1..7a2200d1 100644 --- a/src/scss/utils/_colors.scss +++ b/src/scss/utils/_colors.scss @@ -1,4 +1,4 @@ $c-white: #fff; $c-black: #000; -$c-light-grey: #777; -$c-border-groove: #eeede0; \ No newline at end of file +$c-light-grey: #777; +$c-border-groove: #eeede0; diff --git a/src/scss/utils/_mixins.scss b/src/scss/utils/_mixins.scss index 69dd2ad1..46d30323 100644 --- a/src/scss/utils/_mixins.scss +++ b/src/scss/utils/_mixins.scss @@ -1,16 +1,16 @@ @mixin element-invisible { - position: absolute; + position: absolute; - width: 1px; - height: 1px; - margin: -1px; - border: 0; - padding: 0; + width: 1px; + height: 1px; + margin: -1px; + border: 0; + padding: 0; - clip: rect(0 0 0 0); - overflow: hidden; + clip: rect(0 0 0 0); + overflow: hidden; } @mixin hide { - display: none; -} \ No newline at end of file + display: none; +} diff --git a/src/scss/utils/_typography.scss b/src/scss/utils/_typography.scss index 4c0d0563..a5838b07 100644 --- a/src/scss/utils/_typography.scss +++ b/src/scss/utils/_typography.scss @@ -1,10 +1,10 @@ @import url("https://fonts.googleapis.com/css2?family=Lora:wght@400;700&display=swap"); @font-face { - font-family: "Wood Stamp"; - font-style: normal; - font-weight: normal; - src: local("Wood Stamp"), url("fonts/Woodstamp.woff") format("woff"); + font-family: "Wood Stamp"; + font-style: normal; + font-weight: normal; + src: local("Wood Stamp"), url("fonts/Woodstamp.woff") format("woff"); } $font-primary: "Lora", sans-serif; diff --git a/src/scss/utils/_variables.scss b/src/scss/utils/_variables.scss index 64be658c..deee5de0 100644 --- a/src/scss/utils/_variables.scss +++ b/src/scss/utils/_variables.scss @@ -1,3 +1,3 @@ $padding-sm: 5px; $padding-md: 10px; -$padding-lg: 20px; \ No newline at end of file +$padding-lg: 20px; diff --git a/tsconfig.json b/tsconfig.json index 05d5a13a..9293923b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,11 +1,7 @@ { - "compilerOptions": { - "target": "ES2017", - "lib": [ - "DOM", - "ES6", - "ES2017" - ], - "types": ["foundry-pc-types"] - } -} \ No newline at end of file + "compilerOptions": { + "target": "ES2017", + "lib": ["DOM", "ES6", "ES2017"], + "types": ["foundry-pc-types"] + } +}