harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more css fixes

Browse Source
This commit is contained in:
Mario Vavti 2015-11-17 23:01:24 +01:00
parent 868a0d8a90
commit 6fa0807550
6 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/conversation.php
View File

@ -1025,7 +1025,7 @@ function builtin_activity_puller($item, &$conv_responses) {
if((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) { if((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) {
$name = (($item['author']['xchan_name']) ? $item['author']['xchan_name'] : t('Unknown')); $name = (($item['author']['xchan_name']) ? $item['author']['xchan_name'] : t('Unknown'));
$url = (($item['author']['xchan_url'] && $item['author']['xchan_photo_s']) $url = (($item['author']['xchan_url'] && $item['author']['xchan_photo_s'])
? '<a href="' . chanlink_url($item['author']['xchan_url']) . '">' . '<img class="response-photo" src="' . zid($item['author']['xchan_photo_s']) . '" alt="' . urlencode($name) . '" /> ' . $name . '</a>' ? '<a href="' . chanlink_url($item['author']['xchan_url']) . '">' . '<img class="dropdown-menu-img-xs" src="' . zid($item['author']['xchan_photo_s']) . '" alt="' . urlencode($name) . '" /> ' . $name . '</a>'
: '<a href="#" class="disabled">' . $name . '</a>' : '<a href="#" class="disabled">' . $name . '</a>'
); );

7
view/css/bootstrap-red.css vendored
View File

@ -61,13 +61,6 @@ aside .nav-pills > li > a {
padding: 6px 10px; padding: 6px 10px;
} }
.dropdown-menu img {
float: left;
width: 36px;
height: 36px;
margin-right: 5px;
}
.dropdown-menu li a { .dropdown-menu li a {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

6
view/css/conversation.css
View File

@ -246,9 +246,3 @@ a.wall-item-name-link {
color: #FF0000; color: #FF0000;
font-size: 1em !important; font-size: 1em !important;
} }
.response-photo {
height: 18px !important;
width: 18px !important;
}

11
view/theme/redbasic/css/style.css
View File

@ -1856,7 +1856,18 @@ nav .dropdown-menu {
border-bottom-left-radius: $radiuspx; border-bottom-left-radius: $radiuspx;
} }
.dropdown-menu-img-sm {
float: left;
width: 36px;
height: 36px;
margin-right: 5px;
}
.dropdown-menu-img-xs {
height: 18px;
width: 18px;
margin-right: 5px;
}
#usermenu-caret { #usermenu-caret {
color: $nav_icon_colour; color: $nav_icon_colour;

2
view/tpl/hdr.tpl
View File

@ -1,5 +1,5 @@
<div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div> <div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div>
<ul id="nav-notifications-template" style="display:none;" rel="template"> <ul id="nav-notifications-template" style="display:none;" rel="template">
<li class="{5}"><a href="{0}" title="{2} {3}"><img data-src="{1}"><span class="contactname">{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span></a></li> <li class="{5}"><a href="{0}" title="{2} {3}"><img class="dropdown-menu-img-sm" data-src="{1}"><span class="contactname">{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span></a></li>
</ul> </ul>

2
view/tpl/profile_vcard.tpl
View File

@ -6,7 +6,7 @@
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
{{foreach $profile.menu.entries as $e}} {{foreach $profile.menu.entries as $e}}
<li> <li>
<a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}<div class='clear'></div></a> <a href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'>{{$e.profile_name}}<div class='clear'></div></a>
</li> </li>
{{/foreach}} {{/foreach}}
<li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li> <li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>