diff --git a/_data/meta.json b/_data/meta.json index 9213835..62765d9 100644 --- a/_data/meta.json +++ b/_data/meta.json @@ -1,3 +1,4 @@ { - "sitename": "yukinets" + "sitename": "yukinets", + "motd": "kill everyone now!! condone first degree murder!!" } \ No newline at end of file diff --git a/_includes/base.njk b/_includes/base.njk index bfabbb1..6b45a81 100644 --- a/_includes/base.njk +++ b/_includes/base.njk @@ -1,12 +1,21 @@ - - - {% if title %} {{ title }} | {{ meta.sitename }} {% else %} {{ meta.sitename }} {% endif %} - + {% include "base_head.njk" %} - {{ content | safe }} +
+
+ yukinets +
+ + +

{{ motd if motd else meta.motd }}

+ + + {{ content | safe }} +
\ No newline at end of file diff --git a/_includes/base_head.njk b/_includes/base_head.njk new file mode 100644 index 0000000..c64c03e --- /dev/null +++ b/_includes/base_head.njk @@ -0,0 +1,4 @@ + + +{% if title %} {{ title }} | {{ meta.sitename }} {% else %} {{ meta.sitename }} {% endif %} + \ No newline at end of file diff --git a/_includes/general.scss b/_includes/general.scss index 2591576..e6185a2 100644 --- a/_includes/general.scss +++ b/_includes/general.scss @@ -1,4 +1,11 @@ -body { - background-color: bisque; - color: blueviolet; -} \ No newline at end of file +* { + margin: 0; + box-sizing: border-box; +} + +.main-page-wrapper { + height: min-content; + min-width: 0; + max-width: 802px; + margin: 8px auto; +} diff --git a/_includes/main-palette.scss b/_includes/main-palette.scss new file mode 100644 index 0000000..2a300ac --- /dev/null +++ b/_includes/main-palette.scss @@ -0,0 +1,2 @@ +$bg: #e4ffdc; +$border: #000; \ No newline at end of file diff --git a/css/general_styles.scss b/css/general_styles.scss deleted file mode 100644 index ec42bf1..0000000 --- a/css/general_styles.scss +++ /dev/null @@ -1 +0,0 @@ -@use "general"; diff --git a/css/main.scss b/css/main.scss new file mode 100644 index 0000000..0e8b562 --- /dev/null +++ b/css/main.scss @@ -0,0 +1,32 @@ +@use "general"; +@use "main-palette" as mp; + +body { + background-color: mp.$bg; + background-image: url("/img/bgpat.png"); + background-repeat: repeat; +} + +.header-wrapper { + width: 100%; + + img { + border: 1px solid mp.$border; + display: block; + margin-bottom: 8px; + } +} + +.motd { + img { display: inline; } + p { display: inline; } +} + +.navbar-wrapper { + margin: 0; + padding: 0; + + .nav-button { + border: 1px solid mp.$border; + } +} diff --git a/img/Witch-on-broom.gif b/img/Witch-on-broom.gif new file mode 100644 index 0000000..7aba024 Binary files /dev/null and b/img/Witch-on-broom.gif differ diff --git a/img/banner-alt.png b/img/banner-alt.png index 5947daa..4f6156e 100644 Binary files a/img/banner-alt.png and b/img/banner-alt.png differ diff --git a/img/bgpat.png b/img/bgpat.png new file mode 100644 index 0000000..d58d28c Binary files /dev/null and b/img/bgpat.png differ diff --git a/img/btnbg.png b/img/btnbg.png new file mode 100644 index 0000000..dbace2a Binary files /dev/null and b/img/btnbg.png differ diff --git a/img/button.png b/img/button.png new file mode 100644 index 0000000..6fe7bf8 Binary files /dev/null and b/img/button.png differ diff --git a/img/hbutton.png b/img/hbutton.png new file mode 100644 index 0000000..2bc6238 Binary files /dev/null and b/img/hbutton.png differ diff --git a/img/homeb.png b/img/homeb.png new file mode 100644 index 0000000..ffb4cbf Binary files /dev/null and b/img/homeb.png differ