diff --git a/settings.yaml b/settings.yaml index dddbb1a..eb637ee 100644 --- a/settings.yaml +++ b/settings.yaml @@ -1,4 +1,3 @@ -copyright_start: 2021 guilds: # Tegaki Tuesday - id: 814700630958276649 diff --git a/src/models/settings.rs b/src/models/settings.rs index 0e3e36d..a331404 100644 --- a/src/models/settings.rs +++ b/src/models/settings.rs @@ -6,7 +6,6 @@ use std::fs; #[derive(Serialize, Deserialize)] pub struct Settings { pub guilds: Vec, - pub copyright_start: u32, } impl Settings { diff --git a/styles/sass/style.scss b/styles/sass/style.scss index 2bf823d..a1be5d2 100644 --- a/styles/sass/style.scss +++ b/styles/sass/style.scss @@ -43,19 +43,11 @@ input[type=number] { #content { width: 100%; height: 100%; - - display: grid; - grid-template-areas: - "nav nav" - "challenge submissions"; - grid-template-columns: 30em auto; - grid-template-rows: min-content auto; - + display: flex; + flex-direction: column; overflow: hidden; nav { - grid-area: nav; - --bg: #{$fg}; --fg: #{$bg}; background: var(--bg); @@ -106,20 +98,16 @@ input[type=number] { } } - & > div { - overflow: scroll; + & > div:first-of-type { display: flex; - flex-direction: column; - gap: 1em; - - footer { - margin-top: auto; - text-align: center; + height: 100%; + & > :first-child { + min-width: 40em; + padding: 1em; + } + & > * { + overflow: scroll; } - } - - #challenge { - padding: 1em; } } @@ -128,17 +116,17 @@ input[type=number] { } #submissions { - grid-area: submissions; - + display: flex; + flex-direction: column; + height: calc(100% - 2em); background: rgba(0, 0, 0, 0.125); - padding: 1em; - + $gap: 0.5em; + padding: $gap; & > div { width: 100%; column-count: 3; margin: 0; - $gap: 0.5em; gap: $gap; & > figure { diff --git a/templates/copyright-years.html.tera b/templates/copyright-years.html.tera deleted file mode 100644 index abc881b..0000000 --- a/templates/copyright-years.html.tera +++ /dev/null @@ -1 +0,0 @@ -© {% set year = now() | date(format="%Y") | int %}{{ settings.copyright_start }}{% if year != settings.copyright_start %}–{{ year }}{% endif %} \ No newline at end of file diff --git a/templates/index.html.tera b/templates/index.html.tera index 3837301..7272dd5 100644 --- a/templates/index.html.tera +++ b/templates/index.html.tera @@ -64,7 +64,7 @@ -
+

Welcome to Tegaki Tuesday #{{ challenge }}!

{% if content.japanese %} @@ -118,41 +118,38 @@

This challenge was suggested by {{ content.suggester }} using the -h suggest command.

{%- endif -%}
-
- Copyright {% include "copyright-years" %} Tegaki Tuesday. All rights reserved. 字ちゃん mascot art by @bellumela. -
-
-
- -
- {% for submission in submissions %} - {% set author = users[submission.author_id] %} -
- {{ author.username }}'s submission -
{% if not author.deleted %}{% endif %}{{ author.username }}{% if author.deleted %} (deleted account){% else %}{% endif %}
-
- {% endfor %} -
- +
+ +
+ {% for submission in submissions %} + {% set author = users[submission.author_id] %} +
+ {{ author.username }}'s submission +
{% if not author.deleted %}{% endif %}{{ author.username }}{% if author.deleted %} (deleted account){% else %}{% endif %}
+
+ {% endfor %} +
+
+ some random shit goes here +
+