From deea7d2b99aabaf88bd5c3909d7808c9f6a33f4f Mon Sep 17 00:00:00 2001 From: Wil Thieme Date: Sun, 17 Mar 2024 17:46:55 -0400 Subject: [PATCH] html button tag for showmore/less --- _includes/avatar.html | 12 ++-- _includes/calendar.html | 4 +- _includes/main-info.html | 68 +++++++++++------------ _includes/single-post.html | 111 +++++++++++++++++++++++-------------- assets/css/app.css | 26 ++------- 5 files changed, 114 insertions(+), 107 deletions(-) diff --git a/_includes/avatar.html b/_includes/avatar.html index 0ef7fad..5c10d6a 100644 --- a/_includes/avatar.html +++ b/_includes/avatar.html @@ -1,7 +1,7 @@ {{locale.alt_text_prefix}} {{post.author}} + width="{{include.width}}" + class="{{include.class}}" + {% if post.author and post.avatar %} + alt="{{locale.alt_text_prefix}} {{post.author}}" + {% endif %} + src="{% if post.avatar contains '://' %}{% elsif post.avatar %}{{ site.baseurl }}/hackergotchi/{% else %}{{ site.baseurl }}/hackergotchi/default.png{% endif %}{{ post.avatar }}"/> diff --git a/_includes/calendar.html b/_includes/calendar.html index ad40c73..00f41c8 100644 --- a/_includes/calendar.html +++ b/_includes/calendar.html @@ -5,9 +5,9 @@

{% include icons/calendar.svg %} {% if page.locale.id == 'en' %} - {{ post.created_at | date: '%a' }}, {{ post.created_at | date_to_string: "ordinal", "US" }} + {{ post.created_at | date: '%a' }}, {{ post.created_at | date_to_string: "ordinal", "US" }} {% else %} - {{ post.created_at | localize_date }} + {{ post.created_at | localize_date }} {% endif %}

{% endif %} diff --git a/_includes/main-info.html b/_includes/main-info.html index 4f2dd24..24b2f04 100644 --- a/_includes/main-info.html +++ b/_includes/main-info.html @@ -1,38 +1,38 @@
-
- {% include map.svg %} -
-
-
-
- {{locale.logo_alt_text}} -
-
-

{% if page.locale.name == 'Global' %}{{ locale.welcome }}{% else %}{{ locale.welcome_lang }}{% endif %}

- {% capture project %} - {{ locale.subtitle_project }} - {% endcapture %} -
{{ locale.subtitle | replace: '$project', project }}
-
-
- {% assign sorted = site.tags | sort %} - {% for tag in sorted %} - {% assign lang = site.localization.locales_set[tag.first] %} - {{ lang.name }} - {% endfor %} -
-
-
+
+ {% include map.svg %} +
+
+
+
+ {{locale.logo_alt_text}} +
+
+

{% if page.locale.name == 'Global' %}{{ locale.welcome }}{% else %}{{ locale.welcome_lang }}{% endif %}

+ {% capture project %} + {{ locale.subtitle_project }} + {% endcapture %} +
{{ locale.subtitle | replace: '$project', project }}
+
+
+ {% assign sorted = site.tags | sort %} + {% for tag in sorted %} + {% assign lang = site.localization.locales_set[tag.first] %} + {{ lang.name }} + {% endfor %} +
+
+
-
- {% capture instructions %} - {{ locale.addnotice_instructions }} - {% endcapture %} -
{{ locale.addnotice | replace: '$instructions', instructions }}
-
+
+ {% capture instructions %} + {{ locale.addnotice_instructions }} + {% endcapture %} +
{{ locale.addnotice | replace: '$instructions', instructions }}
+
diff --git a/_includes/single-post.html b/_includes/single-post.html index 5608cfc..e19581d 100644 --- a/_includes/single-post.html +++ b/_includes/single-post.html @@ -5,58 +5,83 @@
-
- {% include avatar.html width="48px" class="my-auto mr-2" %} -
-
-
- {% capture post_author %} - {{ post.author }} - {% include icons/feed.svg %} - {% endcapture %} - {% capture post_language %} - {% assign lang = site.localization.locales_set[post.tags.first] %} - {{ lang.name }} - {% endcapture %} - {% capture post_time %} - {{ post.created_at | date: "%H:%M" }} - {% endcapture %} - - {% if include.language %} - {{ locale.postedinat | replace: '$author', post_author | replace: '$language', post_language | replace: '$time', post_time }} - {% else %} - {{ locale.postedat | replace: '$author', post_author | replace: '$time', post_time }} - {% endif %} - +
+ {% include avatar.html width="48px" class="my-auto mr-2" %}
-
- {% if post.member %} - Member - {% elsif post.connect %} - - {% endif %} - {% if post.irc %} - {{ post.irc }} - {% endif %} - {% if post.gsoc %} - - {% endif %} +
+
+ {% capture post_author %} + {{ post.author }} + {% include icons/feed.svg %} + {% endcapture %} + {% capture post_language %} + {% assign lang = site.localization.locales_set[post.tags.first] %} + {{ lang.name }} + {% endcapture %} + {% capture post_time %} + {{ post.created_at | date: "%H:%M" }} + {% endcapture %} + + {% if include.language %} + {{ locale.postedinat | replace: '$author', post_author | replace: '$language', post_language | replace: '$time', post_time }} + {% else %} + {{ locale.postedat | replace: '$author', post_author | replace: '$time', post_time }} + {% endif %} + +
-

{{ post.title }}
- - -
{{ post.content }}
+ +
+ {{ post.content }} +
+
-
+
\ No newline at end of file diff --git a/assets/css/app.css b/assets/css/app.css index 8612710..6725d9a 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -58,34 +58,16 @@ transition: all .15s ease; overflow: hidden; } + .roller { position: relative; - margin-bottom: 3rem!important; + margin-bottom: 3rem !important; } -.roller-label { + +.roller-button { position: absolute; top: 100%; } -.roller-input { - display: none; -} -.roller-label .show-less { - display: none; -} -.roller-label .show-more { - display: block; -} -.roller-input:checked + .roller-label .show-less { - display: block; -} -.roller-input:checked + .roller-label .show-more { - display: none; -} -.roller-input:checked ~ .roller-item { - max-height: 100%; - transition: all .15s ease; - overflow: hidden; -} .avatar { width: calc(100% - 1rem);