Revert "initial adaptations #228"

This reverts commit 0c33dc1cb5.
This commit is contained in:
GitHub
2025-12-27 19:06:07 +08:00
parent 48d23ea79a
commit d6f1ace93f
9 changed files with 298 additions and 112 deletions

View File

@@ -1 +1,180 @@
/* reset by bulma v1.0.4 upgrade #228 */
#sign {
max-width: 350px;
}
nav,
section,
footer {
max-width: 1100px;
margin: 0 auto;
}
nav {
height: 48px;
}
@media screen and (max-device-width: 769px) {
main {
padding-right: 0 !important;
}
aside {
padding-left: 0 !important;
}
}
#notification-indicator {
border-radius: 50%;
width: 14px;
height: 14px;
margin-left: -16px;
margin-top: -4px;
}
.media-content {
min-width: 0;
}
.list-item-content {
min-width: 0;
}
.divider {
margin: 1.5rem 0 0;
}
.section {
padding: 1.5rem 0 0;
min-height: calc(100vh - 48px - 144px - 1.5em);
/* ^ header ^ divider
^ footer */
}
.tabs.is-toggle a {
background-color: white;
}
.pagination > a {
background-color: white;
}
.pagination {
padding-bottom: 1.5rem;
}
.overlay {
position: fixed;
top: 0;
bottom: 0;
left: 0;
right: 0;
background: rgba(0, 0, 0, 0.7);
transition: opacity 500ms;
visibility: hidden;
opacity: 0;
}
.overlay:target {
visibility: visible;
opacity: 1;
}
.overlay:target ~ .column {
visibility: hidden;
}
.popup {
min-width: 300px;
margin: 70px auto;
padding: 20px;
background: #fff;
border-radius: 5px;
width: 30%;
position: relative;
transition: all 2s ease-in-out;
}
.popup .close {
position: absolute;
top: 20px;
right: 15px;
transition: all 200ms;
font-size: 30px;
color: #333;
}
.popup .close:hover {
color: #06d85f;
}
pre {
overflow-x: auto;
border: 1px solid #b5b5b5;
border-radius: 5px;
padding: 1rem;
}
p {
word-wrap: break-word;
text-align: justify;
}
details summary {
cursor: pointer;
}
.replytag {
display: inline-block;
line-height: 1;
font-weight: 700;
font-size: 0.7rem;
background: #e8e8e8;
padding: 0.5833em 0.833em 0.5833em 0.5em;
border-radius: 0.28571429rem;
}
.replytag img {
height: 2.1666em;
display: inline-block;
vertical-align: top;
margin: -0.5833em 0.5em -0.5833em -0.5em;
border-radius: 0.28571429rem 0 0 0.28571429rem;
}
.replytag a {
text-decoration: none;
color: rgba(62, 212, 70, 0.6);
}
#transcript-wrapper {
max-height: 400px;
margin: 0 auto;
overflow-y: auto;
border: 1px solid #ccc;
padding: 1rem;
text-align: justify;
}
#transcript {
line-height: 1.8;
font-size: 1.2rem;
}
.audio-player {
position: sticky;
top: 0;
padding: 10px;
z-index: 100;
}
audio {
max-width: 100%;
height: auto;
display: block;
box-sizing: border-box;
}
/* #386 */
.textarea:not([rows]) {
height: auto;
max-height: none;
}

View File

@@ -11,8 +11,8 @@
{% endblock %}
{% block tabs %}
<a class="navbar-item" href="/inn/0">{{ "inn"|l10n(page_data.lang) }}</a>
<a class="navbar-item" href="/solo/user/0">{{ "solo"|l10n(page_data.lang) }}</a>
<li><a href="/inn/0">{{ "inn"|l10n(page_data.lang) }}</a></li>
<li><a href="/solo/user/0">{{ "solo"|l10n(page_data.lang) }}</a></li>
{% endblock %}
{% block content %}

View File

@@ -5,8 +5,8 @@
{% endblock %}
{% block tabs %}
<a class="navbar-item is-active" href="/inn/0">{{ "inn"|l10n(page_data.lang) }}</a>
<a class="navbar-item" href="/solo/user/0">{{ "solo"|l10n(page_data.lang) }}</a>
<li class="is-active"><a href="/inn/0">{{ "inn"|l10n(page_data.lang) }}</a></li>
<li><a href="/solo/user/0">{{ "solo"|l10n(page_data.lang) }}</a></li>
{% endblock %}
{% block content %}
@@ -95,7 +95,7 @@
{% if post.is_pinned %} 📌 {% endif %}{{post.title}}</a></strong>
</div>
<div class="list-item-description">
<span class="tag"><a href="/inn/{{post.iid}}">{{post.inn_name}}</a></span>
<span class="tag is-light is-link"><a href="/inn/{{post.iid}}">{{post.inn_name}}</a></span>
<span class="tag">{{post.created_at}}</span>
{% match post.last_reply %}{% when Some(user) %}
<span class="tag" title="last reply"><a href="/user/{{user.0}}">{{user.1}}</a></span>

View File

@@ -1,8 +1,8 @@
{% extends "layout.html" %}
{% block tabs %}
<a class="navbar-item" href="/inn/0">{{ "inn"|l10n(page_data.lang) }}</a>
<a class="navbar-item" href="/solo/user/0">{{ "solo"|l10n(page_data.lang) }}</a>
<li><a href="/inn/0">{{ "inn"|l10n(page_data.lang) }}</a></li>
<li><a href="/solo/user/0">{{ "solo"|l10n(page_data.lang) }}</a></li>
{% endblock %}
{% block content %}

View File

@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html class="has-background">
<html class="has-background-grey-lighter">
<head>
{% block csp %}
@@ -12,7 +12,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href='/static/style.css?v={{ crate::VERSION }}'>
<link rel="icon" type="image/svg+xml" href="/favicon.svg">
<title>{{ page_data.title }}</title>
<title> {{ page_data.title }} </title>
<meta property="og:title" content="{{ page_data.title }}">
<meta property="og:site_name" content="{{ page_data.site_name }}">
@@ -23,128 +23,135 @@
<body>
<header>
<nav class="navbar">
<div class="container">
<div class="navbar-brand">
<a class="navbar-item" href="/">{{page_data.site_name}}</a>
</div>
<div class="navbar-menu">
<nav class="level is-mobile has-background-white">
<div class="level-left navbar-item">
<div class="level is-mobile">
{% block menu_left %}
<div class="navbar-start">
{% block tabs %}
<a class="navbar-item" href="/inn/0">{{ "inn"|l10n(page_data.lang) }}</a>
<a class="navbar-item" href="/solo/user/0">{{ "solo"|l10n(page_data.lang) }}</a>
{% endblock %}
<a class="level-item" href="/">{{page_data.site_name}}</a>
<div class="tabs is-small is-boxed">
<ul>
{% block tabs %}
<li><a href="/inn/0">{{ "inn"|l10n(page_data.lang) }}</a></li>
<li><a href="/solo/user/0">{{ "solo"|l10n(page_data.lang) }}</a></li>
{% endblock %}
</ul>
</div>
{% endblock %}
<div class="navbar-end">
{% block menu_right %}
{% match page_data.claim %} {% when Some with (val) %}
<a class="navbar-item" href="/feed/{{val.uid}}" title="{{ "feeds"|l10n(page_data.lang) }}">
</div>
</div>
<div class="level-right navbar-item">
<div class="level is-mobile">
{% block menu_right %}
{% match page_data.claim %} {% when Some with (val) %}
<a href="/feed/{{val.uid}}" title="{{ "feeds"|l10n(page_data.lang) }}">
<span class="icon is-large">
{% include "icons/feeds.svg" %}
<span class="icon">
{% include "icons/feeds.svg" %}
</span>
</span>
</a>
<a class="navbar-item" href="/notification">
<a href="/notification">
<span class="icon is-large" title="{{ "notifications"|l10n(page_data.lang) }}">
<span class="icon-text icon-text-info">
{% include "icons/notification.svg" %}
<span class="icon">
{% include "icons/notification.svg" %}
</span>
{% if page_data.has_unread %}
<span id="notification-indicator" class="has-background-primary"></span>
{% endif %}
</span>
</span>
</a>
<a class="navbar-item" href="/signout" title="{{ "sign_out"|l10n(page_data.lang) }}">
<a href="/signout" title="{{ "sign_out"|l10n(page_data.lang) }}">
<span class="icon is-large is-hidden-mobile">
<span class="icon">
{% include "icons/signout.svg" %}
</span>
</span>
</a>
<a href="/user/setting" title="{{ "settings"|l10n(page_data.lang) }}">
<span class="icon is-large is-hidden-mobile">
<span class="icon">
{% include "icons/setting.svg" %}
</span>
</span>
</a>
<a href="/user/{{val.uid}}" title="{{ "profile"|l10n(page_data.lang) }}">
<span class="icon is-large">
{% include "icons/signout.svg" %}
<span class="image"><img src="/static/avatars/{{val.uid}}.png" alt="{{val.username}}"></span>
</span>
</a>
<a class="navbar-item" href="/user/setting" title="{{ "settings"|l10n(page_data.lang) }}">
<span class="icon is-large">
{% include "icons/setting.svg" %}
</span>
</a>
<a class="navbar-item" href="/user/{{val.uid}}" title="{{ "profile"|l10n(page_data.lang) }}">
<span class="image">
<img class="is-rounded" src="/static/avatars/{{val.uid}}.png" alt="{{val.username}}">
</span>
</a>
{% else %}
{% else %}
<div class="buttons has-addons">
<a class="navbar-item" href="/signin"><button class="button is-info is-small">{{ "sign_in"|l10n(page_data.lang) }}</button></a>
<a class="navbar-item" href="/signup"><button class="button is-success is-small">{{ "sign_up"|l10n(page_data.lang) }}</button></a>
<a href="/signin"><button class="button is-info is-small">{{ "sign_in"|l10n(page_data.lang) }}</button></a>
<a href="/signup"><button class="button is-success is-small">{{ "sign_up"|l10n(page_data.lang) }}</button></a>
</div>
{% endmatch %}
{% endblock %}
</div>
{% endmatch %}
{% endblock %}
</div>
</div>
</nav>
</header>
{% block section %}
<section class="section">
<div class="container">
<div class="columns mx-0">
<main class="column is-three-quarters pl-0">
{% block content %}{% endblock %}
</main>
<aside class="column is-one-quarter pr-0">
{% block aside %}
<div class="panel">
<form id="search" action="/search" method="get">
<fieldset>
<div class="field has-addons">
<div class="control">
<input class="input" name="search" type="text" placeholder='{{ "search"|l10n(page_data.lang) }}'>
</div>
<div class="control">
<button type="submit" form="search" class="button">🔍</button>
</div>
<div class="columns mx-0">
<main class="column is-three-quarters pl-0">
{% block content %}{% endblock %}
</main>
<aside class="column is-one-quarter pr-0">
{% block aside %}
<div class="box">
<form id="search" action="/search" method="get">
<fieldset>
<div class="field has-addons">
<div class="control">
<input class="input" name="search" type="text" placeholder='{{ "search"|l10n(page_data.lang) }}'>
</div>
<div class="control">
<button type="submit" form="search" class="button">🔍</button>
</div>
</fieldset>
</form>
</div>
{% match page_data.claim %} {% when Some with (val) %}
{% if val.role == 255 %}
<div class="panel">
<a href="/admin">
<span class="tag is-info">{{ "site_settings"|l10n(page_data.lang) }}</span>
</a>
<a href="/admin/view">
<span class="tag is-info">{{ "db_view"|l10n(page_data.lang) }}</span>
</a>
<a href="/admin/view?tree_name=user_stats">
<span class="tag is-info">{{ "stats"|l10n(page_data.lang) }}</span>
</a>
<a href="/admin/gallery">
<span class="tag is-info">{{ "gallery"|l10n(page_data.lang) }}</span>
</a>
</div>
{% endif %}
{% else %}{% endmatch %}
</fieldset>
</form>
</div>
{% match page_data.claim %} {% when Some with (val) %}
{% if val.role == 255 %}
<div class="box">
<a href="/admin">
<span class="tag is-info">{{ "site_settings"|l10n(page_data.lang) }}</span>
</a>
<a href="/admin/view">
<span class="tag is-info">{{ "db_view"|l10n(page_data.lang) }}</span>
</a>
<a href="/admin/view?tree_name=user_stats">
<span class="tag is-info">{{ "stats"|l10n(page_data.lang) }}</span>
</a>
<a href="/admin/gallery">
<span class="tag is-info">{{ "gallery"|l10n(page_data.lang) }}</span>
</a>
</div>
{% endif %}
{% else %}{% endmatch %}
{% block box %}
{% endblock %}
{% block box %}
{% endblock %}
</aside>
</div>
{% endblock %}
</aside>
</div>
</section>
<div class="divider"></div>
{% endblock %}
<footer class="footer">
<div class="container">
{% if let Some(custom_footer_code) = page_data.custom_footer_code %}
{{ custom_footer_code|safe }}
{% else %}
<p><a href="https://github.com/freedit-org/freedit">GitHub</a></p>
<p>version: <a href="https://github.com/freedit-org/freedit/releases/tag/v{{ crate::VERSION }}">v{{ crate::VERSION }}</a></p>
<p>sha256: {{ crate::CURRENT_SHA256.as_str() }}</p>
<p>commit: <a href="https://github.com/freedit-org/freedit/commit/{{ crate::GIT_COMMIT }}">{{ crate::GIT_COMMIT }}</a></p>
{% endif %}
</div>
<footer class="footer p-5">
{% if let Some(custom_footer_code) = page_data.custom_footer_code %}
{{ custom_footer_code|safe }}
{% else %}
<p><a href="https://github.com/freedit-org/freedit">GitHub</a></p>
<p><small>version: <a href="https://github.com/freedit-org/freedit/releases/tag/v{{ crate::VERSION }}">v{{ crate::VERSION }}</a></small></p>
<p><small>sha256: {{ crate::CURRENT_SHA256.as_str()|truncate(10) }}</small></p>
<p><small>commit: <a href="https://github.com/freedit-org/freedit/commit/{{ crate::GIT_COMMIT }}">{{ crate::GIT_COMMIT }}</a></small></p>
{% endif %}
</footer>
</body>

View File

@@ -7,8 +7,8 @@
{% endblock %}
{% block tabs %}
<a class="navbar-item" href="/inn/0">{{ "inn"|l10n(page_data.lang) }}</a>
<a class="navbar-item" href="/solo/user/0">{{ "solo"|l10n(page_data.lang) }}</a>
<li><a href="/inn/0">{{ "inn"|l10n(page_data.lang) }}</a></li>
<li><a href="/solo/user/0">{{ "solo"|l10n(page_data.lang) }}</a></li>
{% endblock %}
{% block og %}
@@ -87,7 +87,7 @@
<div class="box content">
{{post.content_html}}
{% for tag in post.tags %}
<a href="/inn/tag/{{tag}}"><span class="tag">🏷️ {{tag}}</span></a>
<a href="/inn/tag/{{tag}}"><span class="tag is-light is-info">🏷️ {{tag}}</span></a>
{% endfor %}
</div>
@@ -96,13 +96,13 @@
{% if post.is_upvoted %}
<a href="/post/{{post.iid}}/{{post.pid}}/upvote#upvote"><span class="tag is-success is-rounded">👍 󠁮󠁮󠁮󠁮{% if post.upvotes >0 %} {{post.upvotes}} {% endif %}</span></a>
{% else %}
<a href="/post/{{post.iid}}/{{post.pid}}/upvote#upvote"><span class="tag is-rounded">👍 󠁮󠁮󠁮󠁮{% if post.upvotes >0 %} {{post.upvotes}} {% endif %}</span></a>
<a href="/post/{{post.iid}}/{{post.pid}}/upvote#upvote"><span class="tag is-info is-light is-rounded">👍 󠁮󠁮󠁮󠁮{% if post.upvotes >0 %} {{post.upvotes}} {% endif %}</span></a>
{% endif %}
{% if post.is_downvoted %}
<a href="/post/{{post.iid}}/{{post.pid}}/downvote#downvote"><span class="tag is-success is-rounded">👎 󠁮󠁮󠁮󠁮{% if post.downvotes >0 %} {{post.downvotes}} {% endif %}</span></a>
{% else %}
<a href="/post/{{post.iid}}/{{post.pid}}/downvote#downvote"><span class="tag is-rounded">👎 󠁮󠁮󠁮󠁮{% if post.downvotes >0 %} {{post.downvotes}} {% endif %}</span></a>
<a href="/post/{{post.iid}}/{{post.pid}}/downvote#downvote"><span class="tag is-info is-light is-rounded">👎 󠁮󠁮󠁮󠁮{% if post.downvotes >0 %} {{post.downvotes}} {% endif %}</span></a>
{% endif %}
</div>
</div>
@@ -125,13 +125,13 @@
{% if comment.is_upvoted %}
<a href="/post/{{post.iid}}/{{post.pid}}/{{comment.cid}}/upvote?anchor={{anchor}}&is_desc={{is_desc}}#{{comment.cid}}"><span class="tag is-success is-rounded">👍 {% if comment.upvotes >0 %} {{comment.upvotes}} {% endif %}</span></a>
{% else %}
<a href="/post/{{post.iid}}/{{post.pid}}/{{comment.cid}}/upvote?anchor={{anchor}}&is_desc={{is_desc}}#{{comment.cid}}"><span class="tag is-rounded">👍 {% if comment.upvotes >0 %} {{comment.upvotes}} {% endif %}</span></a>
<a href="/post/{{post.iid}}/{{post.pid}}/{{comment.cid}}/upvote?anchor={{anchor}}&is_desc={{is_desc}}#{{comment.cid}}"><span class="tag is-info is-light is-rounded">👍 {% if comment.upvotes >0 %} {{comment.upvotes}} {% endif %}</span></a>
{% endif %}
{% if comment.is_downvoted %}
<a href="/post/{{post.iid}}/{{post.pid}}/{{comment.cid}}/downvote?anchor={{anchor}}&is_desc={{is_desc}}#{{comment.cid}}"><span class="tag is-success is-rounded">👎 {% if comment.downvotes >0 %} {{comment.downvotes}} {% endif %}</span></a>
{% else %}
<a href="/post/{{post.iid}}/{{post.pid}}/{{comment.cid}}/downvote?anchor={{anchor}}&is_desc={{is_desc}}#{{comment.cid}}"><span class="tag is-rounded">👎 {% if comment.downvotes >0 %} {{comment.downvotes}} {% endif %}</span></a>
<a href="/post/{{post.iid}}/{{post.pid}}/{{comment.cid}}/downvote?anchor={{anchor}}&is_desc={{is_desc}}#{{comment.cid}}"><span class="tag is-info is-light is-rounded">👎 {% if comment.downvotes >0 %} {{comment.downvotes}} {% endif %}</span></a>
{% endif %}
{% if comment.uid == post.uid %}

View File

@@ -7,8 +7,8 @@
{% endblock %}
{% block tabs %}
<a class="navbar-item" href="/inn/0">Inn</a></li>
<a class="navbar-item is-active" href="/solo/user/0">{{ "solo"|l10n(page_data.lang) }}</a>
<li><a href="/inn/0">Inn</a></li>
<li class="is-active"><a href="/solo/user/0">{{ "solo"|l10n(page_data.lang) }}</a></li>
{% endblock %}
{% block content %}

View File

@@ -7,8 +7,8 @@
{% endblock %}
{% block tabs %}
<a class="navbar-item" href="/inn/0">{{ "inn"|l10n(page_data.lang) }}</a>
<a class="navbar-item is-active" href="/solo/user/0">{{ "solo"|l10n(page_data.lang) }}</a>
<li><a href="/inn/0">{{ "inn"|l10n(page_data.lang) }}</a></li>
<li class="is-active"><a href="/solo/user/0">{{ "solo"|l10n(page_data.lang) }}</a></li>
{% endblock %}
{% block content %}

View File

@@ -1,8 +1,8 @@
{% extends "layout.html" %}
{% block tabs %}
<a class="navbar-item" href="/inn/0">{{ "inn"|l10n(page_data.lang) }}</a>
<a class="navbar-item" href="/solo/user/0">{{ "solo"|l10n(page_data.lang) }}</a>
<li class="is-active"><a href="/inn/0">{{ "inn"|l10n(page_data.lang) }}</a></li>
<li><a href="/solo/user/0">{{ "solo"|l10n(page_data.lang) }}</a></li>
{% endblock %}
{% block content %}
@@ -32,7 +32,7 @@
<div class="list-item-content">
<div class="list-item-title"><strong><a href="/post/{{post.iid}}/{{post.pid}}">{{post.title}}</a></strong></div>
<div class="list-item-description">
<span class="tag"><a href="/inn/{{post.iid}}">{{post.inn_name}}</a></span>
<span class="tag is-light is-link"><a href="/inn/{{post.iid}}">{{post.inn_name}}</a></span>
<span class="tag">{{post.created_at}}</span>
</div>
</div>