diff --git a/Makefile b/Makefile index cea3b83..bd24fb8 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -.PHONY: build clean deps serve +.PHONY: build clean setup serve -build: clean deps - mkdir -p ./public/css ./public/js ./public/img ./public/fonts +build: clean setup + mkdir -p ./public/{css,js,img,fonts} cp ./node_modules/bulma/css/bulma.min.css ./public/css/ cp ./node_modules/fork-awesome/css/fork-awesome.min.css ./public/css/ cp ./node_modules/fork-awesome/css/fork-awesome.min.css.map ./public/css/ @@ -9,13 +9,15 @@ build: clean deps cp ./mkbd65-ansi.png ./mkbd65-ansi-fn.png ./mkbd65-iso.png ./mkbd65-iso-fn.png ./img/ cp -r ./css ./public/ cp -r ./js ./public/ - cp -r ./img ./public/ - cp ./guide.html ./index.html ./public/ + cp mkbd65-iso.png mkbd65-ansi.png ./public/img/ + cp mkbd65-iso-fn.png mkbd65-ansi-fn.png ./public/img/ + cat header.html index.html footer.html > public/index.html + cat header.html build.html footer.html > public/build.html clean: rm -rf ./public -deps: +setup: yarn serve: diff --git a/guide.html b/build.html similarity index 67% rename from guide.html rename to build.html index 95242bc..23a014a 100644 --- a/guide.html +++ b/build.html @@ -1,85 +1,3 @@ - - - - - - - - mkbd65 - by XenGi - - - - - - - - - - - -
@@ -301,30 +219,3 @@
- - - - - - diff --git a/footer.html b/footer.html new file mode 100644 index 0000000..e8c61d1 --- /dev/null +++ b/footer.html @@ -0,0 +1,27 @@ + + + + + + diff --git a/header.html b/header.html new file mode 100644 index 0000000..729b393 --- /dev/null +++ b/header.html @@ -0,0 +1,82 @@ + + + + + + + + mkbd65 - by XenGi + + + + + + + + + + + + diff --git a/img/mkbd65-iso-fn.png b/img/mkbd65-iso-fn.png index b167b19..5a09c13 100644 Binary files a/img/mkbd65-iso-fn.png and b/img/mkbd65-iso-fn.png differ diff --git a/img/mkbd65-iso.png b/img/mkbd65-iso.png index 44f3041..14ac23d 100644 Binary files a/img/mkbd65-iso.png and b/img/mkbd65-iso.png differ diff --git a/index.html b/index.html index 74191dc..6ff7128 100644 --- a/index.html +++ b/index.html @@ -1,82 +1,3 @@ - - - - - - - - mkbd65 - by XenGi - - - - - - - - - - - -
@@ -265,30 +186,3 @@
- - - - - - diff --git a/img/logo.png b/logo.png similarity index 100% rename from img/logo.png rename to logo.png diff --git a/mkbd65-iso-fn.jpg b/mkbd65-iso-fn.jpg index e3e63ae..bba84fc 100644 Binary files a/mkbd65-iso-fn.jpg and b/mkbd65-iso-fn.jpg differ diff --git a/mkbd65-iso-fn.json b/mkbd65-iso-fn.json index 634510b..b4e0c52 100644 --- a/mkbd65-iso-fn.json +++ b/mkbd65-iso-fn.json @@ -50,13 +50,15 @@ "", { "a": 5, - "f": 5 + "f": 4 }, "Alt\nTab\n\n\n\n\nShift", + { + "f": 6 + }, "Alt\nTab", { - "a": 7, - "f": 6 + "a": 7 }, "F11", "F12", @@ -81,9 +83,9 @@ "", "", { - "a": 4 + "a": 5 }, - "~\n`", + "°\n^", { "a": 7 }, @@ -101,12 +103,15 @@ "", "", { - "f": 5 + "f": 4 }, "PgUp", { - "f": 7, - "w": 2 + "f": 6 + }, + "", + { + "f": 7 }, "" ], @@ -133,11 +138,11 @@ { "w": 3 }, - "", + "", "", "", { - "f": 5 + "f": 4 }, "Home", "PgDn", diff --git a/mkbd65-iso-fn.png b/mkbd65-iso-fn.png index b167b19..5a09c13 100644 Binary files a/mkbd65-iso-fn.png and b/mkbd65-iso-fn.png differ diff --git a/mkbd65-iso-fn.svg b/mkbd65-iso-fn.svg index 9959c83..42a9e41 100644 --- a/mkbd65-iso-fn.svg +++ b/mkbd65-iso-fn.svg @@ -1865,31 +1865,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mkbd65-iso-thumb-fn.png b/mkbd65-iso-thumb-fn.png index b29bc09..56659b9 100644 Binary files a/mkbd65-iso-thumb-fn.png and b/mkbd65-iso-thumb-fn.png differ diff --git a/mkbd65-iso-thumb.png b/mkbd65-iso-thumb.png index 5f3e7c3..cb8fc72 100644 Binary files a/mkbd65-iso-thumb.png and b/mkbd65-iso-thumb.png differ diff --git a/mkbd65-iso.jpg b/mkbd65-iso.jpg index 5730306..d8486fa 100644 Binary files a/mkbd65-iso.jpg and b/mkbd65-iso.jpg differ diff --git a/mkbd65-iso.json b/mkbd65-iso.json index 7c3fb15..e588989 100644 --- a/mkbd65-iso.json +++ b/mkbd65-iso.json @@ -24,15 +24,15 @@ "a": 4 }, "!\n1", - "@\n2", - "#\n3", + "\"\n2", + "§\n3", "$\n4", - "%\n5\n\n€", - "^\n6", - "&\n7", - "*\n8", - "(\n9", - ")\n0", + "%\n5", + "&\n6", + "?\n7\n\n{", + "(\n8\n\n[", + ")\n9\n\n]", + "=\n0\n\n}", { "a": 7, "f": 7, @@ -49,16 +49,16 @@ "E", "R", "T", - "Y", + "Z", "U", "I", "O", "P", + "Ü", { "a": 4 }, - "{\n[", - "}\n]", + "*\n+\n\n~", { "a": 7, "f": 7, @@ -79,18 +79,18 @@ "J", "K", "L", + "Ö", + "Ä", { "a": 4 }, - ":\n;", - "\"\n'\n~\n`", - "|\n\\" + "'\n#\n°\n^" ], [ { "a": 7 }, - "Z", + "Y", "X", "C", "V", @@ -100,16 +100,22 @@ { "a": 4 }, - "<\n,", - ">\n.", - "?\n/", + ";\n,", + ":\n.", + "_\n-", { "a": 7, "f": 7 }, "", { - "w": 2 + "a": 4, + "f": 6 + }, + ">\n<\n\n|", + { + "a": 7, + "f": 7 }, "⇧" ], @@ -134,8 +140,8 @@ { "a": 4 }, - "_\n-", - "+\n=", + "?\nß\n\n\\", + "`\n'", { "a": 7, "f": 7 diff --git a/mkbd65-iso.png b/mkbd65-iso.png index 44f3041..14ac23d 100644 Binary files a/mkbd65-iso.png and b/mkbd65-iso.png differ diff --git a/mkbd65-iso.svg b/mkbd65-iso.svg index 36d49c2..ee35878 100644 --- a/mkbd65-iso.svg +++ b/mkbd65-iso.svg @@ -1865,31 +1865,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +