external-repos/ivatar
1
0
Fork 0
mirror of https://git.linux-kernel.at/oliver/ivatar.git synced 2025-11-18 14:08:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Improved design of navbar dropdowns

See merge request oliver/ivatar!85
This commit is contained in:
Oliver Falk
2018-12-02 17:09:35 +01:00
parent 8e6becf98f b56f8d6366
commit 3c60f28acf
4 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ivatar/static/css/tortin.css
View File

File diff suppressed because one or more lines are too long

11
ivatar/static/css/tortin.less
View File

@@ -258,6 +258,17 @@ background-color:@bg-hero;
.navbar-tortin .navbar-collapse, .navbar-tortin .navbar-form { .navbar-tortin .navbar-collapse, .navbar-tortin .navbar-form {
border:0; border:0;
} }
.dropdown-menu {
background-color:@bg-hero;
border:1px solid darken(@bg-hero, 10%);
}
.dropdown-menu>li>a {
color:#FFFFFF;
}
.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover {
background-color:darken(@bg-hero, 10%);
color:#FFFFFF;
}
@media (max-width:767px) { @media (max-width:767px) {
.navbar-tortin .navbar-nav .open .dropdown-menu > li > a { .navbar-tortin .navbar-nav .open .dropdown-menu > li > a {
color:#FFFFFF color:#FFFFFF

20
templates/_account_bar.html
View File

@@ -11,22 +11,22 @@
</a> </a>
<ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink"> <ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}
<li><a href="{% url 'profile' %}"><i class="fa fa-image" aria-hidden="true"></i> {% trans 'Profile' %}</a></li> <li><a href="{% url 'profile' %}"><i class="fa fa-fw fa-image" aria-hidden="true"></i> {% trans 'Profile' %}</a></li>
<li><a href="{% url 'user_preference' %}"><i class="fa fa-cog" aria-hidden="true"></i> {% trans 'Preferences' %}</a></li> <li><a href="{% url 'user_preference' %}"><i class="fa fa-fw fa-cog" aria-hidden="true"></i> {% trans 'Preferences' %}</a></li>
<li><a href="{% url 'import_photo' %}"><i class="fa fa-envelope-square" aria-hidden="true"></i> {% trans 'Import photo via mail address' %}</a></li> <li><a href="{% url 'import_photo' %}"><i class="fa fa-fw fa-envelope-square" aria-hidden="true"></i> {% trans 'Import photo via mail address' %}</a></li>
<li><a href="{% url 'upload_export' %}"><i class="fa fa-file-archive-o" aria-hidden="true"></i> {% trans 'Import libravatar XML export' %}</a></li> <li><a href="{% url 'upload_export' %}"><i class="fa fa-fw fa-file-archive-o" aria-hidden="true"></i> {% trans 'Import libravatar XML export' %}</a></li>
<li><a href="{% url 'password_change' %}"><i class="fa fa-key" aria-hidden="true"></i> {% trans 'Change password' %}</a></li> <li><a href="{% url 'password_change' %}"><i class="fa fa-fw fa-key" aria-hidden="true"></i> {% trans 'Change password' %}</a></li>
<li><a href="{% url 'password_reset' %}"><i class="fa fa-unlock-alt" aria-hidden="true"></i> {% trans 'Reset password' %}</a></li> <li><a href="{% url 'password_reset' %}"><i class="fa fa-fw fa-unlock-alt" aria-hidden="true"></i> {% trans 'Reset password' %}</a></li>
<li><a href="{% url 'logout' %}"><i class="fa fa-sign-out" aria-hidden="true"></i> {% trans 'Logout' %}</a></li> <li><a href="{% url 'logout' %}"><i class="fa fa-fw fa-sign-out" aria-hidden="true"></i> {% trans 'Logout' %}</a></li>
{% else %} {% else %}
<li><a href="{% url 'login' %}"><i class="fa fa-sign-in" aria-hidden="true"></i> {% trans 'Local' %}</a></li> <li><a href="{% url 'login' %}"><i class="fa fa-fw fa-sign-in" aria-hidden="true"></i> {% trans 'Local' %}</a></li>
<li><a href="{% url 'new_account' %}"><i class="fa fa-user-plus" aria-hidden="true"></i> {% trans 'Create account' %}</a></li> <li><a href="{% url 'new_account' %}"><i class="fa fa-fw fa-user-plus" aria-hidden="true"></i> {% trans 'Create account' %}</a></li>
{% endif %} {% endif %}
</ul> </ul>
</li> </li>
{% if user.is_staff %} {% if user.is_staff %}
<li> <li>
<a href="{% url 'admin:index' %}" target="_new"><i class="fa fa-user-secret" aria-hidden="true"></i> {% trans 'Admin' %}</a> <a href="{% url 'admin:index' %}" target="_new"><i class="fa fa-fw fa-user-secret" aria-hidden="true"></i> {% trans 'Admin' %}</a>
</li> </li>
{% endif %} {% endif %}
</ul> </ul>

2
templates/base.html
View File

@@ -54,7 +54,7 @@
</a> </a>
<ul class="dropdown-menu" aria-labelledby="tools_dropdown"> <ul class="dropdown-menu" aria-labelledby="tools_dropdown">
<li><a id="tools-check" href="{% url 'tools_check' %}"> <li><a id="tools-check" href="{% url 'tools_check' %}">
<i class="fa fa-check-square" aria-hidden="true"></i> {% trans 'Check' %} <i class="fa fa-fw fa-check-square" aria-hidden="true"></i> {% trans 'Check' %}
</a></li> </a></li>
</ul> </ul>
</li> </li>