From 94e4ad21b81e6ec21e086b0d2e78bf113ecdaf84 Mon Sep 17 00:00:00 2001 From: "Florine W. Dekker" Date: Mon, 21 Nov 2022 18:24:49 +0100 Subject: [PATCH] Upgrade to template v3 --- Gruntfile.js | 13 ++- package-lock.json | Bin 112722 -> 113393 bytes package.json | 6 +- src/main/css/main.css | 7 ++ src/main/index.html | 199 +++++++++++++++++++++--------------------- 5 files changed, 119 insertions(+), 106 deletions(-) create mode 100644 src/main/css/main.css diff --git a/Gruntfile.js b/Gruntfile.js index bc44872..d2f1b22 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/"}] + files: [{expand: true, cwd: "src/main/", src: "**/*.html", dest: "dist/", flatten: true}] }, }, focus: { dev: { - include: ["html"], + include: ["css", "html"], }, }, 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", "replace:dev"], @@ -56,6 +63,7 @@ module.exports = grunt => { // Pre "clean", // Copy files + "copy:css", "copy:html", // Insert version number "replace:dev", @@ -65,6 +73,7 @@ module.exports = grunt => { // Pre "clean", // Copy files + "copy:css", "copy:html", // Insert version number "replace:deploy", diff --git a/package-lock.json b/package-lock.json index fe397aa330bc03936d599d169a1653ba09d6a6a7..3d0079643b5810bbbc0f16b23678343144984faa 100644 GIT binary patch delta 1686 zcmd7RJ8TMk!8nch24UPLviux-uxHkJP3Ig&RUAsMp7|^QEfvvdV56J_k5epAb`0y%&CPo&T^y2Mn zh=UJyjzH+=^NKOFn97n+=!eVzFIDRTIqdZni=>AQE)f+PWYXl6Xs}~iL5B+1?Mlhi zI--!!n?|5aE!Nt4OCY;dt*UVxOIm|ELm3z~(FGVc&yF@G%*bvYIeQ6`=?TQ(H69%Y z+j~4`h<(GN^MMLS&}AZQl+!UKQEjq8W;yNj$;@(y7_Lx(hSsrFr>EGozgU&yl{rBFKj?a%gg|5BygWdGPfp za&O*Z&^ZJf+cUfK1F)sJ;Eh}g?$>?m`pjr9`>P8?>k`;k58~b{=mq%f?z#18S8h4e zGxJM&z1ZcnW{D_fq6xv4uF96gY)5aHnt+TQh9R_HVB<)}$k=ha$$ zz9YsBhUtW|m4$FBEr+={!&i7m4pyp8I}zggKs|LC?&UmiPdz-6iocxL-@R^}&!EG2 zM@GNF+Z;c-+Fhl0ANGe&IsCV>91uNK=Z`Oo*fcLUA9 zR)&VVF&~VDv!jnb|33A&geS{JgpCPybnDM8ZlBrUH=jkP|C5`W2lm&70GA7g{_WzW zM_fGkeF;tDPfnqeFur{df1N-t!iPIgKk{*G{f-xZ#iL{D6LBKHim6j*3VehYe8s^b9@o~e)NBkXmdBwx3l}^29MuDQ=98I&=&VMne0X> delta 1396 zcmciCPly|J6bEpAu)B3#=*G6Ll(O4(>!C5xWHK}PQ|zB46V1QLWF|A2*;#s+&FoD6 zOfr-InVf392#R!h$nUx$2%?o@g!Lj6Q9&)D_Ta53=w+eM9;5}KnCx9Vb+7OA-ur&u zd-(UluMZY(_zpO51A zE}`S_^Rshs;xn%_HmrfwB?u6}qWbfdOSvO!Ixg9ek5jhtFn@QW7m!|!ixO!k&qNkn1dJh}j$?Kxn% zrD==ti!V#6lG#+mZoJ%yN4l)9u8!)w-brwAGs3v61kyiwj=>AH#|_h>YW5i_vYZrA5pv)N6YxT*U(w`tKyYRT4hL1XoO8x zqx+_6ck>Kyk-Ex7Dj8BBC@Df$Mb@X6^W~Aw7P84=xj8gqoYbQR)Q)UAxtuK9g}I#i2?UAutSFQI4f8iN+_*RP@#{3L=F!P?Bh?hj|-x6QXFH@EJ*fS12OhoPN- zleSk9g-|o4zFy|)AtztzZI1HQUPN?_zA)BY-Ec-7vJn%UbY{$&!$>?#>Eo{6PL9%q zoOOBK-ieAtu*E2PY}iWG%x0~h&ZyI7R>2e4m|W|9MdO|yd0_ohFV4M*PU8<7$Sb+o zbeT_8-F7iAiDoaBh>}I6AC}3^h++qW^q?dSMB6r>JcJv6H z;t#e^_Wz*1KYxT4{or}L_8%T!nw|2#a~b`4a)!}^Z>&z8uK#olip2Wtoy=sOI;`Sb m1Ue-@6{Ew8_}VHuH)XoGuZrkP|B*Sx+D(+(f8{#*Ci*X_%H$&e diff --git a/package.json b/package.json index 4e70a59..688165a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "about", - "version": "1.3.6", + "version": "1.3.7", "description": "All about Florine", "author": "Florine W. Dekker", "browser": "dist/bundle.js", @@ -16,9 +16,9 @@ "deploy": "grunt deploy" }, "devDependencies": { - "grunt": "^1.4.1", + "grunt": "^1.5.3", "grunt-cli": "^1.4.3", - "grunt-contrib-clean": "^2.0.0", + "grunt-contrib-clean": "^2.0.1", "grunt-contrib-copy": "^1.0.0", "grunt-contrib-watch": "^1.1.0", "grunt-focus": "^1.0.0", diff --git a/src/main/css/main.css b/src/main/css/main.css new file mode 100644 index 0000000..0ed44c8 --- /dev/null +++ b/src/main/css/main.css @@ -0,0 +1,7 @@ +:root { + --aside-width: 215px !important; +} + +#socials-span a { + text-decoration: none !important; +} diff --git a/src/main/index.html b/src/main/index.html index 6b32840..58a47da 100644 --- a/src/main/index.html +++ b/src/main/index.html @@ -16,14 +16,15 @@ About | FWDekker - + + - + -