From bd1b38381d460e1912f620b25ce3c17a9879822b Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 27 Apr 2012 02:28:44 -0400
Subject: [PATCH 1/2] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  reset qcomment selector after insert.
  put fakelink back in birthday notice
  birthday contact link goes to event page instead of remote profile
  make comment edit icons look more like base theme
  rev update

* master:

From b936e3a18ae766ffa26c6b119a0bb639b0c5fd5b Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 27 Apr 2012 02:33:58 -0400
Subject: [PATCH 2/2] fix 2 issues. contacts img in finder; wall filer title

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy/dark/style.css   |  5 +++++
 view/theme/dispy/dark/style.less  | 26 ++++++++++++++++++++++++++
 view/theme/dispy/light/style.css  |  5 +++++
 view/theme/dispy/light/style.less | 26 ++++++++++++++++++++++++++
 view/theme/dispy/wall_item.tpl    |  2 +-
 5 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index d151cfa1cd..91dfde4ae4 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 6bab0109a0..5efb44603b 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 7c996f6f97..e38a712495 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 141ff731b1..bbbc07742b 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 52af07532b..35e65f397d 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>