aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-11-17 23:01:24 +0100
committerMario Vavti <mario@mariovavti.com>2015-11-17 23:01:24 +0100
commit6fa0807550f4e7a3da307afe9398e54c3d036228 (patch)
treee3f1bd57c57af0e7bd7320d11b29c0de39ee94e7
parent868a0d8a90c5e582bb783247fbf3a26f5226b126 (diff)
downloadvolse-hubzilla-6fa0807550f4e7a3da307afe9398e54c3d036228.tar.gz
volse-hubzilla-6fa0807550f4e7a3da307afe9398e54c3d036228.tar.bz2
volse-hubzilla-6fa0807550f4e7a3da307afe9398e54c3d036228.zip
more css fixes
-rw-r--r--include/conversation.php2
-rw-r--r--view/css/bootstrap-red.css7
-rw-r--r--view/css/conversation.css6
-rw-r--r--view/theme/redbasic/css/style.css11
-rw-r--r--view/tpl/hdr.tpl2
-rwxr-xr-xview/tpl/profile_vcard.tpl2
6 files changed, 14 insertions, 16 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 09a6d51d7..3ad89fe51 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1025,7 +1025,7 @@ function builtin_activity_puller($item, &$conv_responses) {
if((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) {
$name = (($item['author']['xchan_name']) ? $item['author']['xchan_name'] : t('Unknown'));
$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>'
);
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index fa76fa2f2..19796679a 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -61,13 +61,6 @@ aside .nav-pills > li > a {
padding: 6px 10px;
}
-.dropdown-menu img {
- float: left;
- width: 36px;
- height: 36px;
- margin-right: 5px;
-}
-
.dropdown-menu li a {
overflow: hidden;
text-overflow: ellipsis;
diff --git a/view/css/conversation.css b/view/css/conversation.css
index dc74dbbeb..6f1d4b899 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -246,9 +246,3 @@ a.wall-item-name-link {
color: #FF0000;
font-size: 1em !important;
}
-
-.response-photo {
- height: 18px !important;
- width: 18px !important;
-}
-
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index d747e9c3e..f089b8599 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1856,7 +1856,18 @@ nav .dropdown-menu {
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 {
color: $nav_icon_colour;
diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl
index c3f0700f0..3770cb9a6 100644
--- a/view/tpl/hdr.tpl
+++ b/view/tpl/hdr.tpl
@@ -1,5 +1,5 @@
<div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div>
<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>
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index bea0d894f..c52c2cd81 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -6,7 +6,7 @@
<ul class="dropdown-menu" role="menu">
{{foreach $profile.menu.entries as $e}}
<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>
{{/foreach}}
<li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>