diff --git a/_data/i18n.js b/_data/i18n.js index 17a0a25..af27cab 100644 --- a/_data/i18n.js +++ b/_data/i18n.js @@ -87,7 +87,12 @@ module.exports = { wrongosWebring: "This site is a member of the Wrongos webring.", previousSite: "previous site", nextSite: "next site", - random: "random" + random: "random", + showMore: "Show more", + previous: "previous", + next: "next", + about: "about", + thisWebsiteDoesNotTrackYou: "This website does not track you." }, pt: { language: "português", @@ -150,6 +155,11 @@ module.exports = { wrongosWebring: "Esse website faz parte do webring Wrongos.", previousSite: "site anterior", nextSite: "próximo site", - random: "aleatório" + random: "aleatório", + showMore: "Ver mais", + previous: "anterior", + next: "próximo", + about: "sobre", + thisWebsiteDoesNotTrackYou: "Esse website não rastreia você." } }; \ No newline at end of file diff --git a/_includes/base.njk b/_includes/base.njk index 8dda116..66a5297 100644 --- a/_includes/base.njk +++ b/_includes/base.njk @@ -13,20 +13,16 @@ Adrian Victor{% if pageTitle or postTitle %} - {{ pageTitle or postTitle }}{% endif %} - - - - @@ -37,21 +33,26 @@ + + +
+ {% include "header.njk" %} +
{{ content | safe }}
diff --git a/_includes/macros.njk b/_includes/macros.njk index eaeec1b..bdac862 100644 --- a/_includes/macros.njk +++ b/_includes/macros.njk @@ -40,4 +40,17 @@

{{ projectDescription }}

+{% endmacro %} + +{% macro webring(opts) %} +
+

{{ opts.text }}

+
+ {% for link in opts.links %} + {{ link | safe }} + {% endfor %} +
+
{% endmacro %} \ No newline at end of file diff --git a/_includes/post.11tydata.js b/_includes/post.11tydata.js deleted file mode 100644 index c45c03e..0000000 --- a/_includes/post.11tydata.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - langKey: data => data.lang -}; \ No newline at end of file diff --git a/_includes/widgets/droidring.html b/_includes/widgets/droidring.html new file mode 100644 index 0000000..d1e4545 --- /dev/null +++ b/_includes/widgets/droidring.html @@ -0,0 +1,44 @@ +
+
+
+ +
+ + + +
+ +
+
\ No newline at end of file diff --git a/index.njk b/index.njk index c666cdb..b35a01d 100644 --- a/index.njk +++ b/index.njk @@ -9,13 +9,13 @@ layout: base.njk {% from "macros.njk" import i88x31 with context %} {% from "macros.njk" import videoCard with context %} {% from "macros.njk" import projectCard %} +{% from "macros.njk" import webring %} -
-
+ +
+
- - +
+

{{ i18n[langKey].kaoMain | safe }}

{{ i18n[langKey].kaoLink | safe }} →

+

{{ i18n[langKey].welcome | smartTitle }}

{{ i18n[langKey].homeWelcomeParagraph | safe }}

@@ -60,6 +63,7 @@ layout: base.njk

{{ i18n[langKey].homeSocialsAndContactParagraphTwo | safe }}

+

{{ i18n[langKey].myMusic | smartTitle }}

@@ -88,6 +92,7 @@ layout: base.njk
+

{{ i18n[langKey].myVideos | smartTitle }}

@@ -107,6 +112,7 @@ layout: base.njk }}
+

{{ i18n[langKey].mySoftware | smartTitle }}

@@ -159,105 +165,61 @@ layout: base.njk
-