aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-18 01:52:11 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-18 01:52:11 +0100
commit545dc5cf65fef823a9ca8a5bcde6e346d4503d4c (patch)
tree91a1e3e32cef9019ffbb5aeebe42197a1616bc3e /view
parentc545ada746a384988172ea1ce28d43dd4ac276b3 (diff)
parenta089064588352b60bebf27c94a51d480f8062368 (diff)
downloadvolse-hubzilla-545dc5cf65fef823a9ca8a5bcde6e346d4503d4c.tar.gz
volse-hubzilla-545dc5cf65fef823a9ca8a5bcde6e346d4503d4c.tar.bz2
volse-hubzilla-545dc5cf65fef823a9ca8a5bcde6e346d4503d4c.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view')
-rw-r--r--view/css/bootstrap-red.css7
-rw-r--r--view/css/conversation.css6
-rw-r--r--view/js/acl.js4
-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, 15 insertions, 17 deletions
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/js/acl.js b/view/js/acl.js
index 847997de0..a0c1c6c02 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -31,7 +31,7 @@ function ACL(backend_url, preset) {
$("#acl-search").keypress(that.on_search);
/* startup! */
- that.get(0,100);
+ that.get(0,1000);
that.on_submit();
});
}
@@ -60,7 +60,7 @@ ACL.prototype.on_submit = function() {
ACL.prototype.search = function() {
var srcstr = $("#acl-search").val();
that.list_content.html("");
- that.get(0, 100, srcstr);
+ that.get(0, 1000, srcstr);
};
ACL.prototype.on_search = function(event) {
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>