diff --git a/content/nixos/vsketch-and-NixOS/index.md b/content/nixos/vsketch-and-NixOS/index.md index 7000197..00159c1 100644 --- a/content/nixos/vsketch-and-NixOS/index.md +++ b/content/nixos/vsketch-and-NixOS/index.md @@ -157,11 +157,6 @@ if __name__ == "__main__": SimpleRingsSketch.display() ``` -{{< card >}} -{{
}} -{{< /card >}} - -{{< card >}} -{{
}} -{{
}} -{{< /card >}} +![](screenshot.png) +![](plot01.jpg) +![](plot02.jpg) diff --git a/content/nixos/vsketch-and-NixOS/images/plot01.jpg b/content/nixos/vsketch-and-NixOS/plot01.jpg similarity index 100% rename from content/nixos/vsketch-and-NixOS/images/plot01.jpg rename to content/nixos/vsketch-and-NixOS/plot01.jpg diff --git a/content/nixos/vsketch-and-NixOS/images/plot02.jpg b/content/nixos/vsketch-and-NixOS/plot02.jpg similarity index 100% rename from content/nixos/vsketch-and-NixOS/images/plot02.jpg rename to content/nixos/vsketch-and-NixOS/plot02.jpg diff --git a/content/nixos/vsketch-and-NixOS/images/screenshot.png b/content/nixos/vsketch-and-NixOS/screenshot.png similarity index 100% rename from content/nixos/vsketch-and-NixOS/images/screenshot.png rename to content/nixos/vsketch-and-NixOS/screenshot.png diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json index 71aa78c..d75be43 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -30,6 +30,16 @@ "peerDependencies": { "@popperjs/core": "^2.11.8" } + }, + "node_modules/normalize.css": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/normalize.css/-/normalize.css-8.0.1.tgz", + "integrity": "sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==" + }, + "node_modules/sakura.css": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/sakura.css/-/sakura.css-1.5.0.tgz", + "integrity": "sha512-AcAZa9F4SCs2xaKLWcXQxJxKfeod2PN3sR31+R22MKuyoJxNChH1wBG4mQaY9gVpJ3VpNA1XHPOrOM9hFo9cSw==" } } } diff --git a/package-lock.json b/package-lock.json index 1a471ff..72ac922 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,7 +5,9 @@ "packages": { "": { "dependencies": { - "bootstrap": "^5.3.3" + "bootstrap": "^5.3.3", + "normalize.css": "^8.0.1", + "sakura.css": "^1.5.0" } }, "node_modules/@popperjs/core": { @@ -35,6 +37,16 @@ "peerDependencies": { "@popperjs/core": "^2.11.8" } + }, + "node_modules/normalize.css": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/normalize.css/-/normalize.css-8.0.1.tgz", + "integrity": "sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==" + }, + "node_modules/sakura.css": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/sakura.css/-/sakura.css-1.5.0.tgz", + "integrity": "sha512-AcAZa9F4SCs2xaKLWcXQxJxKfeod2PN3sR31+R22MKuyoJxNChH1wBG4mQaY9gVpJ3VpNA1XHPOrOM9hFo9cSw==" } } } diff --git a/package.json b/package.json index f6dfea9..db543aa 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,7 @@ { "dependencies": { - "bootstrap": "^5.3.3" + "bootstrap": "^5.3.3", + "normalize.css": "^8.0.1", + "sakura.css": "^1.5.0" } } diff --git a/sass/main.sass b/sass/main.sass index de6e1ef..0589881 100644 --- a/sass/main.sass +++ b/sass/main.sass @@ -1,9 +1,6 @@ -@import "../node_modules/bootstrap/scss/bootstrap" +//@import "../node_modules/bootstrap/scss/bootstrap" +@import "../node_modules/sakura.css/scss/sakura" -pre - padding: 1em - font-size: 1rem - -pre code - font-size: 1rem +body + max-width: 1000px diff --git a/templates/base.html b/templates/base.html index 24e4379..525de3d 100644 --- a/templates/base.html +++ b/templates/base.html @@ -4,52 +4,55 @@ Tech-Blog - + + + + + +
-
+
{% block content %} {% endblock %} +
- \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index e570943..83bccce 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,14 +1,11 @@ {% extends "base.html" %} {% block content %} -
- -

Techblog

+

Techblog

-
{% endblock content %} \ No newline at end of file diff --git a/templates/page.html b/templates/page.html index ef7745e..6d4765b 100644 --- a/templates/page.html +++ b/templates/page.html @@ -1,11 +1,9 @@ {% extends "base.html" %} {% block content %} -

{{ page.title | safe }}

{{ page.content | safe }} -
{% endblock content %} \ No newline at end of file diff --git a/templates/shortcodes/figure.html b/templates/shortcodes/figure.html new file mode 100644 index 0000000..80182e2 --- /dev/null +++ b/templates/shortcodes/figure.html @@ -0,0 +1 @@ + \ No newline at end of file