Commit 9382db65 by Oláh István Gergely

templates and css: modify BD's profile icon theme

parent 77a4efd9
...@@ -10,6 +10,16 @@ html { ...@@ -10,6 +10,16 @@ html {
min-height: 100%; min-height: 100%;
} }
.navbar-nav img {
width: 46px;
height: 46px;
margin-top: -4px;
}
.navbar-fixed-top {
border: 0px;
}
/* Set widths on the navbar form inputs since otherwise they're 100% wide */ /* Set widths on the navbar form inputs since otherwise they're 100% wide */
.navbar-form input[type="text"], .navbar-form input[type="text"],
.navbar-form input[type="password"] { .navbar-form input[type="password"] {
...@@ -32,7 +42,7 @@ html { ...@@ -32,7 +42,7 @@ html {
#dashboard-menu { #dashboard-menu {
margin-right: 15px; margin-right: 0px;
} }
/* we need this for mobile view */ /* we need this for mobile view */
...@@ -56,6 +66,13 @@ html { ...@@ -56,6 +66,13 @@ html {
padding-bottom: 12.5px; padding-bottom: 12.5px;
} }
.navbar-nav > li:last-child > a {
padding-top: 4px;
padding-bottom: 0px;
padding-right: 0px;
padding-left: 0px;
}
} }
.no-margin { .no-margin {
...@@ -110,6 +127,11 @@ html { ...@@ -110,6 +127,11 @@ html {
background-color: black!important; background-color: black!important;
} }
.timeline img{
border-radius: 50%;
margin-bottom: 2px;
}
.timeline a { .timeline a {
color: black; color: black;
} }
......
{% load i18n %} {% load i18n %}
{% if user and user.pk %} {% if user and user.pk %}
{% if user.profile %}
<img src="{{ user.profile.get_avatar_url }}" width="46px" height="46px" title="
{% endif %}
{% if user.get_full_name %}{{ user.get_full_name }}{% else %}{{ user.username }}{% endif %}{% if new_line %}<br />{% endif %} {% if user.get_full_name %}{{ user.get_full_name }}{% else %}{{ user.username }}{% endif %}{% if new_line %}<br />{% endif %}
{% if show_org %} {% if show_org %}
...@@ -10,4 +13,5 @@ ...@@ -10,4 +13,5 @@
({% trans "username" %}: {{ user.username }}) ({% trans "username" %}: {{ user.username }})
{% endif %} {% endif %}
{% endif %} {% endif %}
" >
{% endif %} {% endif %}
...@@ -47,18 +47,7 @@ ...@@ -47,18 +47,7 @@
</a> </a>
</li> </li>
{% endif %} {% endif %}
<li> <li class="visible-xs">
<a href="{% url "dashboard.views.profile-preferences" %}">
<i class="fa fa-user"></i>
{% include "dashboard/_display-name.html" with user=user show_org=True %}
</a>
</li>
<li>
<a href="{% url "logout" %}?next={% url "login" %}">
<i class="fa fa-sign-out"></i> {% trans "Log out" %}
</a>
</li>
<li class="visible-xs">
<a href="{% url "dashboard.views.notifications" %}"> <a href="{% url "dashboard.views.notifications" %}">
{% trans "Notifications" %} {% trans "Notifications" %}
{% if NEW_NOTIFICATIONS_COUNT > 0 %} {% if NEW_NOTIFICATIONS_COUNT > 0 %}
...@@ -81,7 +70,17 @@ ...@@ -81,7 +70,17 @@
<li>{% trans "Loading..." %}</li> <li>{% trans "Loading..." %}</li>
</ul> </ul>
</li> </li>
</ul> <li>
<a href="{% url "logout" %}?next={% url "login" %}">
<i class="fa fa-sign-out"></i> {% trans "Log out" %}
</a>
</li>
<li>
<a href="{% url "dashboard.views.profile-preferences" %}">
{% include "dashboard/_display-name.html" with user=user show_org=True %}
</a>
</li>
</ul>
{% else %} {% else %}
<a class="navbar-brand pull-right" href="{% url "login" %}?next={{ request.path }}"><i class="fa fa-sign-in"></i> {% trans "Log in " %}</a> <a class="navbar-brand pull-right" href="{% url "login" %}?next={{ request.path }}"><i class="fa fa-sign-in"></i> {% trans "Log in " %}</a>
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
{% trans "Back" %}</a> {% trans "Back" %}</a>
</div> </div>
<h3 class="no-margin"> <h3 class="no-margin">
<i class="fa fa-user"></i>
{% include "dashboard/_display-name.html" with user=profile show_org=True %} {% include "dashboard/_display-name.html" with user=profile show_org=True %}
</h3> </h3>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment