Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small navbar enhancements #104

Merged
merged 2 commits into from
Jan 12, 2024
+5 −4
Merged

Small navbar enhancements #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bcd7df
Add nav-underline to nav elements
pehala Jan 12, 2024
49cf4e2
Convert login button to an actual button
pehala Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion frontend/static/styles.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ hr

.custom-link
color: $colDefault
&:hover
color: $colHighlight

.small-hr
height: 1px
Expand All @@ -94,4 +96,3 @@ hr

.accordion-button:focus
box-shadow: none

4 changes: 2 additions & 2 deletions frontend/templates/base/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
</ul>
{% block extra_nav %}{% endblock %}
<ul class="my-lg-0 navbar-nav navbar-right languages">
<li class="nav-item dropdown">
<li class="nav-item dropdown ms-1 nav-underline">
<a class="nav-link dropdown-toggle" href="#" id="languageDropdown" role="button"
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{% trans "Options" %}
Expand Down Expand Up @@ -90,7 +90,7 @@
{% if user.is_authenticated %}
<span class="navbar-text ms-2 me-4">{% trans "Logged as" %} <b>{{ user.username }}</b></span>
{% else %}
<a class="me-4 ms-1 custom-link link-underline link-underline-opacity-0 link-underline-opacity-75-hover" href="{% url 'login' %}" role="button">{% trans "Log in" %}</a>
<a class="me-4 ms-1 custom-link btn border-primary" href="{% url 'login' %}" role="button">{% trans "Log in" %}</a>
{% endif %}

</div>
Expand Down
2 changes: 1 addition & 1 deletion frontend/templates/menu/bootstrap4-menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<li class="divider-vertical"></li>
{% endif %}

<li class="nav-item{% if item.children %} dropdown{% endif %}"
<li class="nav-item{% if item.children %} dropdown{% endif %} nav-underline"
id="top-menu-{{ item.slug }}">
{% if item.children %}
<a href="{{ item.url }}" class="nav-link dropdown-toggle" id="{{ item.title }}" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Expand Down