Merge pull request #1710 from hendrikbl/feature/navbar-tweaks
Navbar tweaks
This commit is contained in:
commit
d1065c8ac4
4
cookbook/static/css/app.min.css
vendored
4
cookbook/static/css/app.min.css
vendored
@ -1,3 +1,7 @@
|
|||||||
|
.brand-icon {
|
||||||
|
height: 40px;
|
||||||
|
}
|
||||||
|
|
||||||
.spinner-tandoor {
|
.spinner-tandoor {
|
||||||
animation: rotation 3s infinite linear;
|
animation: rotation 3s infinite linear;
|
||||||
content: url("../assets/spinner.svg");
|
content: url("../assets/spinner.svg");
|
||||||
|
@ -61,16 +61,18 @@
|
|||||||
|
|
||||||
<nav class="navbar navbar-expand-lg navbar-dark bg-{% nav_color request %} bg-header" id="id_main_nav"
|
<nav class="navbar navbar-expand-lg navbar-dark bg-{% nav_color request %} bg-header" id="id_main_nav"
|
||||||
style="{% sticky_nav request %}">
|
style="{% sticky_nav request %}">
|
||||||
|
|
||||||
|
{% if not request.user.is_authenticated or request.user.userpreference.theme == request.user.userpreference.TANDOOR %}
|
||||||
|
<a class="navbar-brand p-0 me-2 justify-content-center" href="{% base_path request 'base' %}" aria-label="Tandoor">
|
||||||
|
<img class="brand-icon" src="{% static 'assets/brand_logo.svg' %}" alt="Logo">
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText"
|
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText"
|
||||||
aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
|
aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
|
||||||
<span class="navbar-toggler-icon"></span>
|
<span class="navbar-toggler-icon"></span>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
{% if not request.user.is_authenticated or request.user.userpreference.theme == request.user.userpreference.TANDOOR %}
|
|
||||||
<a class="navbar-brand p-0 me-2 justify-content-center" href="{% base_path request 'base' %}" aria-label="Tandoor">
|
|
||||||
<img class="brand-icon" src="{% static 'assets/brand_logo.png' %}" alt="" style="height: 5vh;">
|
|
||||||
</a>
|
|
||||||
{% endif %}
|
|
||||||
<div class="collapse navbar-collapse" id="navbarText">
|
<div class="collapse navbar-collapse" id="navbarText">
|
||||||
<ul class="navbar-nav mr-auto">
|
<ul class="navbar-nav mr-auto">
|
||||||
<li class="nav-item {% if request.resolver_match.url_name in 'view_search' %}active{% endif %}">
|
<li class="nav-item {% if request.resolver_match.url_name in 'view_search' %}active{% endif %}">
|
||||||
|
Loading…
Reference in New Issue
Block a user