felixfoertsch/tildes
1
0
Fork 0
mirror of https://gitlab.com/tildes/tildes.git synced 2026-04-17 23:08:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix alignment of "segmented" subgroup header links

Browse Source
This commit is contained in:
Deimos
2020-03-20 18:16:39 -06:00
parent 4dedcf1716
commit 2c6967b3da
14 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tildes/scss/modules/_site-header.scss
View File

@@ -28,6 +28,7 @@
} }
.site-header-context { .site-header-context {
display: inline-block;
vertical-align: text-bottom; vertical-align: text-bottom;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;

8
tildes/scss/themes/_theme_base.scss
View File

@@ -458,9 +458,11 @@
color: map-get($theme, "link"); color: map-get($theme, "link");
} }
.site-header-context, .site-header-context {
.site-header-context:visited { a,
color: map-get($theme, "foreground-primary"); a:visited {
color: map-get($theme, "foreground-primary");
}
} }
.site-header-logo, .site-header-logo,

2
tildes/tildes/templates/base.jinja2
View File

@@ -80,7 +80,7 @@
{% endif %} {% endif %}
>Sidebar</button> >Sidebar</button>
{% block header_context_link %}{% endblock %} <div class="site-header-context">{% block header_context_link %}{% endblock %}</div>
{{ logged_in_user_info() }} {{ logged_in_user_info() }}
</header> </header>

2
tildes/tildes/templates/group_wiki.jinja2
View File

@@ -8,7 +8,7 @@
{% block title %}~{{ group.path }} wiki{% endblock %} {% block title %}~{{ group.path }} wiki{% endblock %}
{% block header_context_link %} {% block header_context_link %}
<a class="site-header-context" href="/~{{ group.path }}">~{{ group.path }}</a> <a href="/~{{ group.path }}">~{{ group.path }}</a>
{% endblock %} {% endblock %}
{% block main_heading %}~{{ group.path }} wiki pages{% endblock %} {% block main_heading %}~{{ group.path }} wiki pages{% endblock %}

2
tildes/tildes/templates/group_wiki_edit_page.jinja2
View File

@@ -8,7 +8,7 @@
{% block title %}Edit wiki page{% endblock %} {% block title %}Edit wiki page{% endblock %}
{% block header_context_link %} {% block header_context_link %}
<a class="site-header-context" href="/~{{ page.group.path }}">~{{ page.group.path }}</a> <a href="/~{{ page.group.path }}">~{{ page.group.path }}</a>
{% endblock %} {% endblock %}
{% block main_heading %}Editing page "{{ page.page_name }}" in ~{{ page.group.path }}{% endblock %} {% block main_heading %}Editing page "{{ page.page_name }}" in ~{{ page.group.path }}{% endblock %}

2
tildes/tildes/templates/group_wiki_new_page.jinja2
View File

@@ -8,7 +8,7 @@
{% block title %}New wiki page{% endblock %} {% block title %}New wiki page{% endblock %}
{% block header_context_link %} {% block header_context_link %}
<a class="site-header-context" href="/~{{ group.path }}">~{{ group.path }}</a> <a href="/~{{ group.path }}">~{{ group.path }}</a>
{% endblock %} {% endblock %}
{% block main_heading %}Create a new wiki page in ~{{ group.path }}{% endblock %} {% block main_heading %}Create a new wiki page in ~{{ group.path }}{% endblock %}

2
tildes/tildes/templates/group_wiki_page.jinja2
View File

@@ -8,7 +8,7 @@
{% block title %}{{ page.page_name }} - ~{{ page.group.path }} wiki{% endblock %} {% block title %}{{ page.page_name }} - ~{{ page.group.path }} wiki{% endblock %}
{% block header_context_link %} {% block header_context_link %}
<a class="site-header-context" href="/~{{ page.group.path }}">~{{ page.group.path }}</a> <a href="/~{{ page.group.path }}">~{{ page.group.path }}</a>
{% endblock %} {% endblock %}
{% block main_classes %}text-formatted text-wiki{% endblock %} {% block main_classes %}text-formatted text-wiki{% endblock %}

5
tildes/tildes/templates/macros/groups.jinja2
View File

@@ -36,9 +36,8 @@
<a href="/~{{ group.path[0:1] }}" <a href="/~{{ group.path[0:1] }}"
{% if class %}class="{{ class }}"{% endif %} {% if class %}class="{{ class }}"{% endif %}
>~{{ group.path[0:1] }}</a> >~{{ group.path[0:1] }}</a>
{% for i in range(1, group.path|length) %} {%- for i in range(1, group.path|length) -%}
. .<a href="/~{{ group.path[0:i+1] }}"
<a href="/~{{ group.path[0:i+1] }}"
{% if class %}class="{{ class }}"{% endif %} {% if class %}class="{{ class }}"{% endif %}
>{{ group.path[i:i+1] }}</a> >{{ group.path[i:i+1] }}</a>
{% endfor %} {% endfor %}

2
tildes/tildes/templates/new_message.jinja2
View File

@@ -8,7 +8,7 @@
{% block title %}New private message conversation{% endblock %} {% block title %}New private message conversation{% endblock %}
{% block header_context_link %} {% block header_context_link %}
<a class="site-header-context" href="/user/{{ user.username }}">{{ user.username }}</a> <a href="/user/{{ user.username }}">{{ user.username }}</a>
{% endblock %} {% endblock %}
{% block main_heading %} {% block main_heading %}

2
tildes/tildes/templates/new_topic.jinja2
View File

@@ -6,7 +6,7 @@
{% block title %}New topic{% endblock %} {% block title %}New topic{% endblock %}
{% block header_context_link %} {% block header_context_link %}
<a class="site-header-context" href="/~{{ group.path }}">~{{ group.path }}</a> <a href="/~{{ group.path }}">~{{ group.path }}</a>
{% endblock %} {% endblock %}
{% block main_heading %}Post a new topic in ~{{ group.path }}{% endblock %} {% block main_heading %}Post a new topic in ~{{ group.path }}{% endblock %}

14
tildes/tildes/templates/search.jinja2
View File

@@ -9,14 +9,12 @@
{% block title %}Search results: {{ search }}{% endblock %} {% block title %}Search results: {{ search }}{% endblock %}
{% block header_context_link %} {% block header_context_link %}
<span class="site-header-context"> {% if group %}
{% if group %} Search in ~{{ group.path }}:
Search in ~{{ group.path }}: {% else %}
{% else %} Search:
Search: {% endif %}
{% endif %} {{ search }}
{{ search }}
</span>
{% endblock %} {% endblock %}
{% block filter_info %} {% block filter_info %}

2
tildes/tildes/templates/topic.jinja2
View File

@@ -27,7 +27,7 @@
{% endblock %} {% endblock %}
{% block header_context_link %} {% block header_context_link %}
{{ group_segmented_link(topic.group, class="site-header-context") }} {{ group_segmented_link(topic.group) }}
{% endblock %} {% endblock %}
{% block content %} {% block content %}

2
tildes/tildes/templates/topic_listing.jinja2
View File

@@ -11,7 +11,7 @@
{% block title %}Topics in ~{{ group.path }}{% endblock %} {% block title %}Topics in ~{{ group.path }}{% endblock %}
{% block header_context_link %} {% block header_context_link %}
{{ group_segmented_link(group, class="site-header-context") }} {{ group_segmented_link(group) }}
{% endblock %} {% endblock %}
{% block content %} {% block content %}

2
tildes/tildes/templates/user.jinja2
View File

@@ -17,7 +17,7 @@
{% endblock %} {% endblock %}
{% block header_context_link %} {% block header_context_link %}
<a class="site-header-context" href="/user/{{ user.username }}">{{ user.username }}</a> <a href="/user/{{ user.username }}">{{ user.username }}</a>
{% endblock %} {% endblock %}
{# Only show the heading if they can't see the type tabs and the user isn't deleted/banned #} {# Only show the heading if they can't see the type tabs and the user isn't deleted/banned #}