Merge https://github.com/friendica/friendica into pull

5 files changed, 63 insertions, 1 deletions

diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index d151cfa1c..91dfde4ae 100644
--- a/view/theme/dispy/dark/style.css
+++ b/view/theme/dispy/dark/style.css
@@ -215,7 +215,12 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 .wall-item-body code{display:block;padding:0 0 10px 5px;border-color:#ccc;border-style:solid;border-width:1px 1px 1px 10px;background:#eee;color:#2e2f2e;width:95%;}
 div[id$="text"]{font-weight:bold;border-bottom:1px solid #ccc;}
 div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:left;}
+.profile-match-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;}
+.icon.drophide.profile-match-ignore{margin:0 6px 0 -3px;}
 [id$="-end"],[class$="end"]{clear:both;margin:0 0 10px 0;}
+.profile-match-end{margin:0 0 5px 0;}
+.profile-match-name{font-weight:bold;margin:auto auto auto 23px;}
+.profile-match-connect{font-style:italic;margin:auto auto auto 23px;}
 #advanced-profile-with{margin-left:200px;}
 .photos{height:auto;overflow:auto;}
 #photo-top-links{margin-bottom:30px;}
diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index 6bab0109a..5efb44603 100644
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -1385,10 +1385,36 @@ div {
     br {
       clear: left; } } }
 
+.profile-match-wrapper {
+	float: left;
+	margin: 0 5px 40px 0;
+	width: 120px;
+	height: 120px;
+	padding: 3px;
+	position: relative;
+}
+.icon.drophide.profile-match-ignore {
+	margin: 0 6px 0 -3px;
+}
+.profile-match-photo {
+	
+}
+
 [id$="-end"], [class$="end"] {
   clear: both;
   margin: 0 0 10px 0; }
 
+.profile-match-end {
+	margin: 0 0 5px 0;
+}
+.profile-match-name {
+	font-weight: bold;
+	margin: auto auto auto 23px;
+}
+.profile-match-connect {
+	font-style: italic;
+	margin: auto auto auto 23px;
+}
 #advanced-profile-with {
   margin-left: 200px; }
 
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css
index 7c996f6f9..e38a71249 100644
--- a/view/theme/dispy/light/style.css
+++ b/view/theme/dispy/light/style.css
@@ -215,7 +215,12 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 .wall-item-body code{display:block;padding:0 0 10px 5px;border-color:#ccc;border-style:solid;border-width:1px 1px 1px 10px;background:#eee;color:#444;width:95%;}
 div[id$="text"]{font-weight:bold;border-bottom:1px solid #ccc;}
 div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:left;}
+.profile-match-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;}
+.icon.drophide.profile-match-ignore{margin:0 6px 0 -3px;}
 [id$="-end"],[class$="end"]{clear:both;margin:0 0 10px 0;}
+.profile-match-end{margin:0 0 5px 0;}
+.profile-match-name{font-weight:bold;margin:auto auto auto 23px;}
+.profile-match-connect{font-style:italic;margin:auto auto auto 23px;}
 #advanced-profile-with{margin-left:200px;}
 .photos{height:auto;overflow:auto;}
 #photo-top-links{margin-bottom:30px;}
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index 141ff731b..bbbc07742 100644
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -1386,10 +1386,36 @@ div {
     br {
       clear: left; } } }
 
+.profile-match-wrapper {
+	float: left;
+	margin: 0 5px 40px 0;
+	width: 120px;
+	height: 120px;
+	padding: 3px;
+	position: relative;
+}
+.icon.drophide.profile-match-ignore {
+	margin: 0 6px 0 -3px;
+}
+.profile-match-photo {
+	
+}
+
 [id$="-end"], [class$="end"] {
   clear: both;
   margin: 0 0 10px 0; }
 
+.profile-match-end {
+	margin: 0 0 5px 0;
+}
+.profile-match-name {
+	font-weight: bold;
+	margin: auto auto auto 23px;
+}
+.profile-match-connect {
+	font-style: italic;
+	margin: auto auto auto 23px;
+}
 #advanced-profile-with {
   margin-left: 200px; }
 
diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index 52af07532..35e65f397 100644
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -40,7 +40,7 @@
 			</ul><br style="clear:left;" />
 			<ul class="wall-item-subtools2">
 				{{ if $item.filer }}
-				<li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>
+				<li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.filer"></a></li>
 				{{ endif }}
 				{{ if $item.plink }}
 				<li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>