Merge icons

This commit is contained in:
Th3NiKo 2019-12-08 10:40:52 +01:00
commit 0bac11d36a
3 changed files with 6 additions and 6 deletions

View File

@ -7,13 +7,13 @@
<span class="navbar-toggler-icon"></span>
</button>
<ul class="navbar-nav collapse navbar-collapse" id="navbarNav">
<li class="nav-item nav-link active" ><a class="nolink" href="{% url 'homepage' %}">Strona główna</a> <span class="sr-only">(current)</span></li>
<li class="nav-item nav-link"><a class="nolink" href="{% url 'homepage' %}"><i class="fa fa-home fa-2x"></a></i></li>
{% if user.is_authenticated %}
<li class="nav-item nav-link active"><a class="nolink" href="{% url 'subject' %}">Przedmioty</a></li>
<li class="nav-item nav-link"><a class="nolink" href="{% url 'logout' %}">Wyloguj się</a></li>
<li class="nav-item nav-link"><a class="nolink" href="#"><i class="fa fa-pencil-square-o fa-2x"></a></i></li>
<li class="nav-item nav-link active"><a class="nolink" href="{% url 'subject' %}"><i class="fa fa-list-ul fa-2x"></i></a></li>
<li class="nav-item nav-link"><a class="nolink" href="{% url 'logout' %}"><i class="fa fa-sign-out fa-2x"></i></a></li>
{% else %}
<li class="nav-item nav-link"><a class="nolink" href="{% url 'login' %}">Zaloguj się</a></li>
{% endif %}
</ul>
</nav>

View File

@ -26,11 +26,11 @@
<div class="input-group mb-3">
<div class="input-group-prepend"><i class="input-group-text fa fa-envelope fa-lg"></i></div>
{% render_field form.username class="form-control" placeholder="Email"%}
{% render_field form.username class="form-control" placeholder="Email" id="loginform"%}
</div>
<div class="input-group">
<div class="input-group-prepend"><i class="input-group-text fa fa-lock fa-lg"></i></div>
{% render_field form.password class="form-control" placeholder="Hasło"%}
{% render_field form.password class="form-control" placeholder="Hasło" id="passwordform"%}
</div>
<div class="form-group mt-3">
<input type="submit" class="btnSubmit" value="Login" />

Binary file not shown.