diff --git a/Gruntfile.js b/Gruntfile.js index f506339..6d2be3e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -7,13 +7,16 @@ module.exports = grunt => { default: ["dist/"], }, copy: { + css: { + files: [{expand: true, cwd: "src/main/", src: "**/*.css", dest: "dist/", flatten: true}] + }, html: { files: [{expand: true, cwd: "src/main/", src: "**/*.html", dest: "dist/", flatten: true}] }, }, focus: { dev: { - include: ["html", "js"], + include: ["css", "html", "js"], }, }, replace: { @@ -39,6 +42,10 @@ module.exports = grunt => { }, }, watch: { + css: { + files: ["src/main/**/*.css"], + tasks: ["copy:css"], + }, html: { files: ["src/main/**/*.html"], tasks: ["copy:html"], @@ -88,6 +95,7 @@ module.exports = grunt => { // Pre "clean", // Copy files + "copy:css", "copy:html", // Compile JS "webpack:dev", @@ -98,6 +106,7 @@ module.exports = grunt => { // Pre "clean", // Copy files + "copy:css", "copy:html", // Compile JS "webpack:deploy", diff --git a/package-lock.json b/package-lock.json index 5cb7bec..d718b9c 100644 Binary files a/package-lock.json and b/package-lock.json differ diff --git a/package.json b/package.json index 7f171c7..633efc1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "codsworth-namegen", - "version": "1.1.4", + "version": "1.1.5", "description": "Choose a fitting name for your Fallout 4 character that Codsworth can pronounce", "author": "Felix W. Dekker", "browser": "dist/bundle.js", @@ -16,7 +16,7 @@ "deploy": "grunt deploy" }, "devDependencies": { - "grunt": "^1.3.0", + "grunt": "^1.4.0", "grunt-cli": "^1.4.2", "grunt-contrib-clean": "^2.0.0", "grunt-contrib-copy": "^1.0.0", @@ -24,7 +24,7 @@ "grunt-focus": "^1.0.0", "grunt-text-replace": "^0.4.0", "grunt-webpack": "^4.0.3", - "webpack": "^5.33.2", + "webpack": "^5.36.0", "webpack-cli": "^4.6.0" } } diff --git a/src/main/css/main.css b/src/main/css/main.css new file mode 100644 index 0000000..762363a --- /dev/null +++ b/src/main/css/main.css @@ -0,0 +1,3 @@ +textarea.nameArea { + height: 10em; +} diff --git a/src/main/index.html b/src/main/index.html index 2b77dac..44db280 100644 --- a/src/main/index.html +++ b/src/main/index.html @@ -13,6 +13,8 @@ + + @@ -20,13 +22,13 @@ -
+
@@ -58,13 +60,13 @@ - +
- +
diff --git a/src/main/js/main.js b/src/main/js/main.js index 5fb1141..8152bca 100644 --- a/src/main/js/main.js +++ b/src/main/js/main.js @@ -1,4 +1,4 @@ -const {$, doAfterLoad, footer, header, nav, showPage} = window.fwdekker; +const {$, doAfterLoad, footer, header, nav} = window.fwdekker; import {jaroWinkler} from "./jaroWinkler"; @@ -98,7 +98,7 @@ doAfterLoad(() => { vcsURL: "https://git.fwdekker.com/FWDekker/codsworth-namegen/", version: "v%%VERSION_NUMBER%%" })); - showPage(); + $("main").classList.remove("hidden"); }); // Event handlers