nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not hardcode image path

Browse source
This commit is contained in:
flaburgan 2017-08-01 21:57:56 +02:00
parent 0798bfbc8c
commit 047bb607f3
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/stylesheets/header.scss
View file

@ -119,6 +119,10 @@
} }
} }
.user-menu-dropdown {
padding: 0;
}
.user-avatar { .user-avatar {
height: $navbar-height; height: $navbar-height;
margin-bottom: -$navbar-padding-vertical; margin-bottom: -$navbar-padding-vertical;
@ -197,7 +201,7 @@
} }
} }
#user-menu { .user-menu {
&.open .dropdown-toggle { background-color: darken($navbar-inverse-bg, 7%); } &.open .dropdown-toggle { background-color: darken($navbar-inverse-bg, 7%); }
.dropdown-toggle { .dropdown-toggle {
margin: 0 1px; margin: 0 1px;
@ -219,6 +223,10 @@
color: $gray-lighter; color: $gray-lighter;
} }
} }
li:last-child a {
padding-bottom: 6px;
}
} }
} }
} }

6
app/assets/templates/header_tpl.jst.hbs
View file

@ -12,7 +12,7 @@
<a href="/stream" class="navbar-brand" data-stream-title="{{t "my_stream"}}"> <a href="/stream" class="navbar-brand" data-stream-title="{{t "my_stream"}}">
<span class="hidden-xs">{{ podname }}</span> <span class="hidden-xs">{{ podname }}</span>
<span class="visible-xs header-title"> <span class="visible-xs header-title">
<img src="/assets/branding/logos/asterisk_white_mobile.png" alt="{{ podname }}" /> <img src="{{imageUrl 'branding/logos/asterisk_white_mobile.png'}}" alt="{{ podname }}" />
</span> </span>
</a> </a>
<ul class="nav navbar-nav hidden-xs"> <ul class="nav navbar-nav hidden-xs">
@ -51,7 +51,7 @@
</ul> </ul>
</li> </li>
<li> <li>
<a href="/conversations" title="{{t "header.conversations"}}" class="conversations-link nav-badge"> <a id="conversations-link" href="/conversations" title="{{t "header.conversations"}}" class="conversations-link nav-badge">
<i class="entypo-mail"></i> <i class="entypo-mail"></i>
<span class="badge badge-important {{#unless current_user.unread_messages_count}} hidden {{/unless}}"> <span class="badge badge-important {{#unless current_user.unread_messages_count}} hidden {{/unless}}">
{{current_user.unread_messages_count}} {{current_user.unread_messages_count}}
@ -68,7 +68,7 @@
</ul> </ul>
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li class="dropdown" id="user-menu"> <li class="dropdown user-menu" id="user-menu">
<a href="{{urlTo "person" current_user.guid}}" class="dropdown-toggle hidden-xs hidden-sm" data-toggle="dropdown" role="button" aria-expanded="false"> <a href="{{urlTo "person" current_user.guid}}" class="dropdown-toggle hidden-xs hidden-sm" data-toggle="dropdown" role="button" aria-expanded="false">
<span class="user-avatar pull-left"> <span class="user-avatar pull-left">
{{{personImage current_user "small"}}} {{{personImage current_user "small"}}}