From 5293df9ccbcfb726a8c6e14b875ddca4178c3480 Mon Sep 17 00:00:00 2001
From: Hannes Mannerheim <h@nnesmannerhe.im>
Date: Mon, 15 Sep 2014 18:58:34 +0200
Subject: [PATCH] small design issues with mentions

---
 actions/qvitter.php  |  4 ++--
 css/qvitter.css      | 25 +++++++++++++++++++------
 js/misc-functions.js |  2 +-
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/actions/qvitter.php b/actions/qvitter.php
index b9c12ca..9a5d01d 100644
--- a/actions/qvitter.php
+++ b/actions/qvitter.php
@@ -102,7 +102,7 @@ class QvitterAction extends ApiAction
 				<title><?php print $sitetitle; ?></title>
 				<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 				<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0">		
-				<link rel="stylesheet" type="text/css" href="<?php print $qvitterpath; ?>css/qvitter.css?v=16" />
+				<link rel="stylesheet" type="text/css" href="<?php print $qvitterpath; ?>css/qvitter.css?v=17" />
 				<link rel="stylesheet" type="text/css" href="<?php print $qvitterpath; ?>css/jquery.minicolors.css" />		
 				<link rel="shortcut icon" type="image/x-icon" href="<?php print $qvitterpath; ?>favicon.ico?v=2">
 				<?php
@@ -366,7 +366,7 @@ class QvitterAction extends ApiAction
 				<script type="text/javascript" src="<?php print $qvitterpath; ?>js/lib/jquery.jWindowCrop.js"></script>	
 				<script type="text/javascript" src="<?php print $qvitterpath; ?>js/lib/load-image.min.js"></script>	
 				<script type="text/javascript" src="<?php print $qvitterpath; ?>js/dom-functions.js?v=21"></script>		    	
-				<script type="text/javascript" src="<?php print $qvitterpath; ?>js/misc-functions.js?v=15"></script>		    		    
+				<script type="text/javascript" src="<?php print $qvitterpath; ?>js/misc-functions.js?v=16"></script>		    		    
 				<script type="text/javascript" src="<?php print $qvitterpath; ?>js/ajax-functions.js?v=9"></script>		    		    	    
 				<script type="text/javascript" src="<?php print $qvitterpath; ?>js/lan.js?v=23"></script>	
 				<script type="text/javascript" src="<?php print $qvitterpath; ?>js/qvitter.js?v=17"></script>		
diff --git a/css/qvitter.css b/css/qvitter.css
index 425553e..1bb13d6 100644
--- a/css/qvitter.css
+++ b/css/qvitter.css
@@ -2097,7 +2097,14 @@ span.inline-reply-caret .caret-inner {
     position: absolute;
 	}
 
+.queet-box-syntax {
+	white-space:nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+	}
+
 .inline-reply-queetbox .queet-box-syntax[contenteditable="true"] {
+	white-space:normal;	
 	z-index:101;
 	position:relative;
 	}
@@ -3415,22 +3422,28 @@ body.rtl .profile-banner-footer ul.stats {
 .queet.rtl .queet-text .tag a {
 	direction:rtl;
 	}
-.queet-text .vcard .mention:before {
+.queet-text .vcard .mention:before,
+.queet-text .h-card.mention:before {
 	content:"@";
 	}
-.queet.rtl .queet-text .vcard .mention:before {
+.queet.rtl .queet-text .vcard .mention:before,
+.queet.rtl .queet-text .h-card.mention:before {
 	content: "";
 	}		
-.queet.rtl .queet-text .vcard .mention:after {
+.queet.rtl .queet-text .vcard .mention:after,
+.queet.rtl .queet-text .h-card.mention:after {
 	content: "@";
 	}				
-.queet-text .vcard .group:before {
+.queet-text .vcard .group:before,
+.queet-text .h-card .group:before {
 	content:"!";
 	}	
-.queet.rtl .queet-text .vcard .group:before {
+.queet.rtl .queet-text .vcard .group:before,
+.queet.rtl .queet-text .h-card.group:before {
 	content: "";
 	}		
-.queet.rtl .queet-text .vcard .group:after {
+.queet.rtl .queet-text .vcard .group:after,
+.queet.rtl .queet-text .h-card.group:after {
 	content: "!";
 	}			
 .queet-text .tag a:before {
diff --git a/js/misc-functions.js b/js/misc-functions.js
index f4c60c4..18b35ac 100644
--- a/js/misc-functions.js
+++ b/js/misc-functions.js
@@ -249,7 +249,7 @@ function detectRTL(s) {
     else if ($queetText.html().length==0 && $('body').hasClass('rtl')) {
     	$streamItem.children('.stream-item').children('.queet').addClass('rtl');
     	}	    	    	    	
-	return $streamItem.html().replace(/@<span class="vcard">/gi,'<span class="vcard">').replace(/!<span class="vcard">/gi,'<span class="vcard">').replace(/#<span class="tag">/gi,'<span class="tag">'); // hacky way to get @#! into mention tags to stop bidirection (css sets an @ with before content method)
+	return $streamItem.html().replace(/@<a href="/gi,'<a href="').replace(/!<a href="/gi,'<a href="').replace(/@<span class="vcard">/gi,'<span class="vcard">').replace(/!<span class="vcard">/gi,'<span class="vcard">').replace(/#<span class="tag">/gi,'<span class="tag">'); // hacky way to get @#! into mention tags to stop bidirection (css sets an @ with before content method)
 	}