Merge https://github.com/redmatrix/hubzilla into pending_merge

6 files changed, 30 insertions, 34 deletions

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index abffe2f78..19796679a 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -29,7 +29,7 @@ nav ul li {
 	max-height: 50px;
 }
 
-nav img {
+nav .navbar-header img {
 	height: 49px;
 	width: 49px;
 	margin-top: 1px;
@@ -61,18 +61,9 @@ aside .nav-pills > li > a {
 	padding: 6px 10px;
 }
 
-.dropdown-menu img {
-	float: left;
-	width: 32px;
-	height: 32px;
-	margin-right: 5px;
-}
-
 .dropdown-menu li a {
 	overflow: hidden;
 	text-overflow: ellipsis;
-	line-height: 1em;
-	padding: 5px 10px;
 }
 
 .nav-tabs.nav-justified > li {
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 d981a38b9..f089b8599 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1328,6 +1328,7 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
 .contactname {
 	padding-top: 2px;
 	font-weight: bold;
+	line-height: 1em;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -1335,7 +1336,7 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
 }
 
 .dropdown-sub-text {
-	font-size: 0.833em;
+	line-height: 1em;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	display: block;
@@ -1720,7 +1721,8 @@ img.mail-conv-sender-photo {
     box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
 }
 
-.wall-item-ago {
+.wall-item-ago,
+.dropdown-sub-text {
 	color: #777;
 	font-size: 0.833em;
 }
@@ -1854,6 +1856,19 @@ 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/acl_selector.tpl b/view/tpl/acl_selector.tpl
index a873457fe..013f3f296 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -8,11 +8,11 @@
 			<div class="modal-body">
 				{{if $jotnets}}
 				<div class="jotnets-wrapper" role="tab" id="jotnets-wrapper">
-         	       <a data-toggle="collapse" class="btn btn-block btn-default" href="#jotnets-collapse" aria-expanded="false" aria-controls="jotnets-collapse">{{$jnetModalTitle}} <span class="caret"></span></a>
-                </div>
+					<a data-toggle="collapse" class="btn btn-block btn-default" href="#jotnets-collapse" aria-expanded="false" aria-controls="jotnets-collapse">{{$jnetModalTitle}} <span class="caret"></span></a>
+				</div>
 				<div id="jotnets-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="acl-select">
-				{{$jotnets}}
-				<div class="clear"></div>
+					{{$jotnets}}
+					<div class="clear"></div>
 				</div>
 				{{/if}}
 
@@ -41,14 +41,10 @@
 </div><!-- /.modal -->
 
 <script>
-//$(document).ready(function() {
-//	setTimeout( function () {
-		if(typeof acl=="undefined"){
-			acl = new ACL(
-				baseurl+"/acl",
-				[ {{$allowcid}},{{$allowgid}},{{$denycid}},{{$denygid}} ]
-			);
-		}
-//	}, 5000 );
-//});
+	if(typeof acl=="undefined"){
+		acl = new ACL(
+			baseurl+"/acl",
+			[ {{$allowcid}},{{$allowgid}},{{$denycid}},{{$denygid}} ]
+		);
+	}
 </script>
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>