wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[COMPONENTS][Search] Polished search template for a clearer header hierarchy

Browse Source
This commit is contained in:
Eliseu Amaro 2022-01-27 02:17:41 +00:00
parent ab6dabf4f7
commit 64a698d255
No known key found for this signature in database
GPG Key ID: 96DA09D4B97BC2D5
4 changed files with 111 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/Collection/templates/collection/notes.html.twig
View File

@ -19,12 +19,14 @@
{% if page_title is defined %} {% if page_title is defined %}
{% if current_path starts with 'feed_' %} {% if current_path starts with 'feed_' %}
<h1 class="section-title">{{ page_title | trans }}</h1> <h1 class="section-title">{{ page_title | trans }}</h1>
{% else %}
<span class="section-title">{{ page_title | trans }}</span>
{% endif %} {% endif %}
{% else %}
{% if current_path starts with 'search' %}
<h3 class="heading-no-margin">{{ 'Notes found' | trans }}</h3>
{% else %} {% else %}
<span class="section-title">{{ 'Notes' | trans }}</span> <span class="section-title">{{ 'Notes' | trans }}</span>
{% endif %} {% endif %}
{% endif %}
<nav class="feed-actions"> <nav class="feed-actions">
<details class="feed-actions-details"> <details class="feed-actions-details">
<summary> <summary>

20
components/Search/templates/search/view.html.twig
View File

@ -8,15 +8,16 @@
</label> </label>
{% endif %} {% endif %}
<section class="frame-section frame-section-padding"> <h1>{% trans %}Search{% endtrans %}</h1>
<h1 class="section-title">{% trans %}Search{% endtrans %}</h1>
<section class="frame-section frame-section-padding">
{{ form_start(search_form) }} {{ form_start(search_form) }}
<section class="frame-section section-form">
{{ form_errors(search_form) }} {{ form_errors(search_form) }}
<div class="section-title">
{{ form_row(search_form.search_query) }} {{ form_row(search_form.search_query) }}
</div>
{% if actor is not null %} {% if actor is not null %}
<details class="section-details-subtitle"> <details class="frame-section section-details-subtitle">
<summary class="details-summary-subtitle"> <summary class="details-summary-subtitle">
<strong>{% trans %}Other options{% endtrans %}</strong> <strong>{% trans %}Other options{% endtrans %}</strong>
</summary> </summary>
@ -38,17 +39,19 @@
</details> </details>
{% endif %} {% endif %}
{{ form_row(search_form.submit_search) }} {{ form_row(search_form.submit_search) }}
</section> {{ form_rest(search_form) }}
{{ form_end(search_form)}} {{ form_end(search_form)}}
<hr>
<section class="frame-section"> <section class="frame-section">
<details class="section-details-subtitle"> <details class="section-details-subtitle">
<summary class="details-summary-subtitle"> <summary class="details-summary-subtitle">
<strong>{% trans %}Build a search query{% endtrans %}</strong> <strong>{% trans %}Build a search query{% endtrans %}</strong>
</summary> </summary>
{{ form_start(search_builder_form) }}
<div class="section-form"> <div class="section-form">
{{ form_start(search_builder_form) }}
{# actor options, display if first checked, with checkbox trick #} {# actor options, display if first checked, with checkbox trick #}
<details class="section-details-subtitle"> <details class="section-details-subtitle">
<summary class="details-summary-subtitle"> <summary class="details-summary-subtitle">
@ -85,8 +88,9 @@
</div> </div>
<hr> <hr>
</details> </details>
</div> {{ form_rest(search_builder_form) }}
{{ form_end(search_builder_form) }} {{ form_end(search_builder_form) }}
</div>
</details> </details>
</section> </section>
</section> </section>
@ -114,6 +118,8 @@
</div> </div>
</section> </section>
<div class="frame-section-button-like">
{{ "Page: " ~ page }} {{ "Page: " ~ page }}
</div>
{% endblock body %} {% endblock body %}

5
public/assets/default_theme/css/base.css
View File

@ -8,6 +8,11 @@ html {
scroll-margin-top: var(--xxl); scroll-margin-top: var(--xxl);
} }
hr {
margin-top: var(--s);
margin-bottom: var(--s);
}
.icon { .icon {
align-self: center; align-self: center;
fill: var(--foreground); fill: var(--foreground);

5
public/assets/default_theme/css/pages/feeds.css
View File

@ -134,7 +134,6 @@
.feed-header { .feed-header {
display: flex; display: flex;
margin-top: var(--s);
margin-bottom: var(--m); margin-bottom: var(--m);
align-items: center; align-items: center;
} }
@ -202,10 +201,6 @@
border: 2px solid var(--accent) !important; border: 2px solid var(--accent) !important;
} }
.h-feed hr, .notes hr {
margin-top: var(--s);
}
.note-attachments { .note-attachments {
display: flex; display: flex;
} }