4 files changed, 66 insertions, 54 deletions
diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less
index 5314b5284..18d0fc620 100755
--- a/view/theme/quattro/colors.less
+++ b/view/theme/quattro/colors.less
@@ -1,6 +1,7 @@
 // Quattro Theme LESS file
 
 // "Echo" palette from Inkscape
+@Yellow1 : #fce94f;
 @Blue1:rgb(25,174,255);
 @Blue2:rgb(0,132,200);
 @Blue3:rgb(0,92,148);
@@ -71,6 +72,7 @@
 @NoticeBackgroundColor: #511919;
 
 @ThreadBackgroundColor: #f6f7f8;
+@ShinyBorderColor: @Yellow1;
 
 @CommentBoxEmptyColor: @Grey3;
 @CommentBoxEmptyBorderColor: @Grey3;
@@ -91,4 +93,4 @@
 @JotPermissionUnlockBackgroundColor: @Grey2;
 @JotPermissionLockBackgroundColor: @Grey4;
 @JotLoadingBackgroundColor: @Grey1;
-
+@JotPreviewBackgroundColor: @Yellow1;
diff --git a/view/theme/quattro/contact_template.tpl b/view/theme/quattro/contact_template.tpl
deleted file mode 100755
index f2749656a..000000000
--- a/view/theme/quattro/contact_template.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-
-<div class="contact-wrapper" id="contact-entry-wrapper-$id" >
-	<div class="contact-photo-wrapper" >
-		<div class="contact-photo mframe" id="contact-entry-photo-$id"
-		onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('contact-photo-menu-button-$id')" onmouseout="t$id=setTimeout('closeMenu(\'contact-photo-menu-button-$id\'); closeMenu(\'contact-photo-menu-$id\');',200)" >
-
-			<a href="$url" title="$img_hover" /><img src="$thumb" $sparkle alt="$name" /></a>
-
-			<a href="#" rel="#contact-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="contact-photo-menu-button-$id">menu</a>
-			<ul class="contact-photo-menu menu-popup" id="contact-photo-menu-$id">
-				$contact_photo_menu
-			</ul>
-
-		</div>
-			
-	</div>
-	<div class="contact-name" id="contact-entry-name-$id" >$name</div>
-
-
-</div>
-
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index f834f2e77..1c14177c6 100755
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -309,12 +309,13 @@ aside {
 	.allcontact-link { float: right; margin: 5px 0px; }
 	.contact-block-content {
 		clear: both;
-		overflow: auto;	height: auto;
+		overflow: idden;	height: auto;
 	}
+	/*.contact-block-div { width:60px; height: 60px; }*/
 	.contact-block-link {
 		float: left;
 		margin: 0px 2px 2px 0px;
-		img { widht: 48px; height: 58px; }
+		img { widht: 48px; height: 48px; }
 	}
 }
 /* mail view */
@@ -373,6 +374,7 @@ aside {
             top: -50px;
         }
 }
+/*
 #group-members {
 	margin-top: 20px;
 	padding: 10px;
@@ -395,9 +397,10 @@ aside {
 }
 .contact-block-div {
 	float: left;
-	width: 52px;
-	height: 52px;
-}
+	width: 60px;
+	height: 60px;
+}*/
+ 
 /* widget */
 .widget {
 	margin-bottom: 2em;
@@ -551,6 +554,8 @@ section {
 
 }
 
+.shiny { border-right:10px solid @ShinyBorderColor; }
+#jot-preview-content .tread-wrapper { background-color: @JotPreviewBackgroundColor; }
 
 
 .wall-item-tags { padding-top: 5px; }
@@ -589,7 +594,7 @@ section {
  right: 5px;
 }
 
-/* contacts menu */
+
 .contact-photo-wrapper { position: relative; }
 .contact-photo { 
 	width: 48px; height: 48px;
@@ -606,9 +611,14 @@ section {
 
 .contact-wrapper {
 	float: left;
-	width: 90px;
+	width: 300px;
 	height: 90px;
-        margin-bottom: 15px;
+	padding-right: 10px;
+	margin: 0 10px 10px 0px;
+	.contact-photo-wrapper { 
+		float: left; 
+		margin-right: 10px;
+	}
 	.contact-photo { 
 		width: 80px; height: 80px;
 		img { width: 80px; height: 80px; }
@@ -627,8 +637,13 @@ section {
 		img { width: 175px; height: 175px; }
 	}
 }
-.contact-name { text-align: center; font-weight: bold; }
-.contact-details { color: @Grey3;}
+.contact-name { font-weight: bold; padding-top: 15px; }
+.contact-details { 
+	color: @Grey3; white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
 /* editor */
 .jothidden { display: none; }
 #jot {
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index ed2baee7a..2a912ccba 100755
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -602,6 +602,8 @@ aside #profiles-menu {
 #contact-block {
   overflow: auto;
   height: auto;
+  /*.contact-block-div { width:60px; height: 60px; }*/
+
 }
 #contact-block .contact-block-h4 {
   float: left;
@@ -613,7 +615,7 @@ aside #profiles-menu {
 }
 #contact-block .contact-block-content {
   clear: both;
-  overflow: auto;
+  overflow: idden;
   height: auto;
 }
 #contact-block .contact-block-link {
@@ -622,7 +624,7 @@ aside #profiles-menu {
 }
 #contact-block .contact-block-link img {
   widht: 48px;
-  height: 58px;
+  height: 48px;
 }
 /* mail view */
 .mail-conv-sender, .mail-conv-detail {
@@ -675,31 +677,32 @@ aside #profiles-menu {
   position: relative;
   top: -50px;
 }
+/*
 #group-members {
-  margin-top: 20px;
-  padding: 10px;
-  height: 250px;
-  overflow: auto;
-  border: 1px solid #ddd;
+	margin-top: 20px;
+	padding: 10px;
+	height: 250px;
+	overflow: auto;
+	border: 1px solid #ddd;
 }
 #group-members-end {
-  clear: both;
+	clear: both;
 }
 #group-all-contacts {
-  padding: 10px;
-  height: 450px;
-  overflow: auto;
-  border: 1px solid #ddd;
+	padding: 10px;
+	height: 450px;
+	overflow: auto;
+	border: 1px solid #ddd;
 }
 #group-all-contacts-end {
-  clear: both;
-  margin-bottom: 10px;
+	clear: both;
+	margin-bottom: 10px;
 }
 .contact-block-div {
-  float: left;
-  width: 52px;
-  height: 52px;
-}
+	float: left;
+	width: 60px;
+	height: 60px;
+}*/
 /* widget */
 .widget {
   margin-bottom: 2em;
@@ -946,6 +949,12 @@ section {
   padding: 0;
   margin: 10px 0;
 }
+.shiny {
+  border-right: 10px solid #fce94f;
+}
+#jot-preview-content .tread-wrapper {
+  background-color: #fce94f;
+}
 .wall-item-tags {
   padding-top: 5px;
 }
@@ -985,7 +994,6 @@ section {
   bottom: 5px;
   right: 5px;
 }
-/* contacts menu */
 .contact-photo-wrapper {
   position: relative;
 }
@@ -1007,9 +1015,14 @@ section {
 }
 .contact-wrapper {
   float: left;
-  width: 90px;
+  width: 300px;
   height: 90px;
-  margin-bottom: 15px;
+  padding-right: 10px;
+  margin: 0 10px 10px 0px;
+}
+.contact-wrapper .contact-photo-wrapper {
+  float: left;
+  margin-right: 10px;
 }
 .contact-wrapper .contact-photo {
   width: 80px;
@@ -1037,11 +1050,14 @@ section {
   height: 175px;
 }
 .contact-name {
-  text-align: center;
   font-weight: bold;
+  padding-top: 15px;
 }
 .contact-details {
   color: #999999;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 /* editor */
 .jothidden {