Download as
Browse Code »

Commit 823a903806388b889f71b8da6523c11c998c0325

Authored by fbormann
1 parent dab6a0e8
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

finished #59, added white logo, changed log out icon and remove animation

Showing 3 changed files with 20 additions and 10 deletions   Show diff stats
core/static/css/base/header.css
  Diff comments   View file @823a903
@@ -10,15 +10,25 @@ @@ -10,15 +10,25 @@
10 10
11 .logo{ 11 .logo{
12 height:100%; 12 height:100%;
13 - margin-left: 30%;  
14 } 13 }
15 14
16 .link{ 15 .link{
17 - transition-duration: 0.5s; 16 + text-decoration: none;
  17 + position: relative;
18 } 18 }
19 19
20 -.link:hover{  
21 - transform:scale(1.1); 20 +.link:after{
  21 + content: '';
  22 + position: absolute;
  23 + bottom: 0;
  24 + left: 0;
  25 + width: 0%;
  26 + border-bottom: 2px solid;
  27 + transition: 0.4s;
  28 +}
  29 +
  30 +.link:hover:after{
  31 + width: 100%;
22 } 32 }
23 33
24 .notification-count{ 34 .notification-count{
core/static/img/topo-amadeus-white.png 0 → 100644
View file @823a903

990 Bytes
core/templates/base.html
  Diff comments   View file @823a903
@@ -45,12 +45,12 @@ @@ -45,12 +45,12 @@
45 <span class="icon-bar"></span> 45 <span class="icon-bar"></span>
46 <span class="icon-bar"></span> 46 <span class="icon-bar"></span>
47 </button> 47 </button>
48 - <a class="navbar-brand" href="{% url 'app:index' %}"><img class="logo" src="{% static 'img/topo-amadeus.png' %}" alt="Logo"/></a> 48 + <a class="navbar-brand" href="{% url 'app:index' %}"><img class="logo" src="{% static 'img/topo-amadeus-white.png' %}" alt="Logo"/></a>
49 </div> 49 </div>
50 <div class="navbar-collapse collapse navbar-responsive-collapse"> 50 <div class="navbar-collapse collapse navbar-responsive-collapse">
51 <ul class="nav navbar-nav navbar-right notifications"> 51 <ul class="nav navbar-nav navbar-right notifications">
52 - <li class="" data-toggle="tooltip" data-placement="bottom" title data-original-title="notifications">  
53 - <a class="dropdown-toggle" data-toggle="dropdown"> <span class="badge notification-count">{{notifications.count}}</span><i class="fa fa-bell-o" aria-hidden="true"></i></a> 52 + <li class="" data-toggle="tooltip" data-placement="bottom" title data-original-title="notifications">
  53 + <a class="dropdown-toggle" data-toggle="dropdown"> <span class="badge notification-count">{{notifications.count}}</span><i class="fa fa-bell" aria-hidden="true"></i></a>
54 <ul id="notification-dropdown" class="dropdown-menu"> 54 <ul id="notification-dropdown" class="dropdown-menu">
55 <li class="dropdown-header">Notifications</li> 55 <li class="dropdown-header">Notifications</li>
56 {% for notification in notifications %} 56 {% for notification in notifications %}
@@ -89,9 +89,9 @@ @@ -89,9 +89,9 @@
89 </ul> 89 </ul>
90 </li> 90 </li>
91 91
92 - <li class="link" data-toggle="tooltip" data-placement="bottom" title data-original-title="messages"> <a href="#"><i class="fa fa-comments" aria-hidden="true"></i></a> </li>  
93 - <li class="link"> <a href="{% url 'users:profile' %}">{{ user }}</a></li>  
94 - <li class="link"> <a href="{% url 'core:logout' %}">{% trans 'Log out' %}</a></li> 92 + <li data-toggle="tooltip" data-placement="bottom" title data-original-title="{% trans 'messages' %}"> <a href="#"><i class="fa fa-comments" aria-hidden="true"></i></a> </li>
  93 + <li > <a class="link" href="{% url 'users:profile' %}">{{ user }}</a></li>
  94 + <li data-toggle="tooltip" data-placement="bottom" title data-original-title="log out"> <a href="{% url 'core:logout' %}"><i class="fa fa-sign-out" aria-hidden="true"></i></a></li>
95 </ul> 95 </ul>
96 </div> 96 </div>
97 </div> 97 </div>