Merge branch 'master' into notify

3 files changed, 153 insertions, 0 deletions

diff --git a/view/theme/quattro-green/style.css b/view/theme/quattro-green/style.css
index 8dad50971..ab1083e75 100755
--- a/view/theme/quattro-green/style.css
+++ b/view/theme/quattro-green/style.css
@@ -48,6 +48,21 @@
 .icon.s10.unlock {
   background-image: url("../../../images/icons/10/unlock.png");
 }
+.icon.s10.type-unkn {
+  background-image: url("../../../images/icons/10/zip.png");
+}
+.icon.s10.type-audio {
+  background-image: url("../../../images/icons/10/audio.png");
+}
+.icon.s10.type-video {
+  background-image: url("../../../images/icons/10/video.png");
+}
+.icon.s10.type-image {
+  background-image: url("../../../images/icons/10/image.png");
+}
+.icon.s10.type-text {
+  background-image: url("../../../images/icons/10/text.png");
+}
 .icon.s10.text {
   padding: 2px 0px 0px 15px;
 }
@@ -85,6 +100,21 @@
 .icon.s16.unlock {
   background-image: url("../../../images/icons/16/unlock.png");
 }
+.icon.s16.type-unkn {
+  background-image: url("../../../images/icons/16/zip.png");
+}
+.icon.s16.type-audio {
+  background-image: url("../../../images/icons/16/audio.png");
+}
+.icon.s16.type-video {
+  background-image: url("../../../images/icons/16/video.png");
+}
+.icon.s16.type-image {
+  background-image: url("../../../images/icons/16/image.png");
+}
+.icon.s16.type-text {
+  background-image: url("../../../images/icons/16/text.png");
+}
 .icon.s16.text {
   padding: 4px 0px 0px 20px;
 }
@@ -122,6 +152,21 @@
 .icon.s22.unlock {
   background-image: url("../../../images/icons/22/unlock.png");
 }
+.icon.s22.type-unkn {
+  background-image: url("../../../images/icons/22/zip.png");
+}
+.icon.s22.type-audio {
+  background-image: url("../../../images/icons/22/audio.png");
+}
+.icon.s22.type-video {
+  background-image: url("../../../images/icons/22/video.png");
+}
+.icon.s22.type-image {
+  background-image: url("../../../images/icons/22/image.png");
+}
+.icon.s22.type-text {
+  background-image: url("../../../images/icons/22/text.png");
+}
 .icon.s22.text {
   padding: 10px 0px 0px 25px;
 }
@@ -159,6 +204,21 @@
 .icon.s48.unlock {
   background-image: url("../../../images/icons/48/unlock.png");
 }
+.icon.s48.type-unkn {
+  background-image: url("../../../images/icons/48/zip.png");
+}
+.icon.s48.type-audio {
+  background-image: url("../../../images/icons/48/audio.png");
+}
+.icon.s48.type-video {
+  background-image: url("../../../images/icons/48/video.png");
+}
+.icon.s48.type-image {
+  background-image: url("../../../images/icons/48/image.png");
+}
+.icon.s48.type-text {
+  background-image: url("../../../images/icons/48/text.png");
+}
 /* global */
 body {
   font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
@@ -564,6 +624,35 @@ aside #profiles-menu {
   widht: 48px;
   height: 58px;
 }
+/* mail view */
+.mail-conv-sender, .mail-conv-detail {
+  float: left;
+}
+.mail-conv-detail {
+  margin-left: 20px;
+  width: 500px;
+}
+.mail-conv-subject {
+  font-size: 1.4em;
+  margin: 10px 0;
+}
+.mail-conv-outside-wrapper-end {
+  clear: both;
+}
+.mail-conv-outside-wrapper {
+  margin-top: 30px;
+}
+.mail-conv-delete-wrapper {
+  float: right;
+  margin-right: 30px;
+  margin-top: 15px;
+}
+.mail-conv-break {
+  clear: both;
+}
+.mail-conv-delete-icon {
+  border: none;
+}
 /* group member */
 #contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper {
   float: right;
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index ac84e0eff..f834f2e77 100755
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -317,6 +317,41 @@ aside {
 		img { widht: 48px; height: 58px; }
 	}
 }
+/* mail view */
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
 
 /* group member */
 #contact-edit-drop-link,
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index 4c24ade8e..ed2baee7a 100755
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -624,6 +624,35 @@ aside #profiles-menu {
   widht: 48px;
   height: 58px;
 }
+/* mail view */
+.mail-conv-sender, .mail-conv-detail {
+  float: left;
+}
+.mail-conv-detail {
+  margin-left: 20px;
+  width: 500px;
+}
+.mail-conv-subject {
+  font-size: 1.4em;
+  margin: 10px 0;
+}
+.mail-conv-outside-wrapper-end {
+  clear: both;
+}
+.mail-conv-outside-wrapper {
+  margin-top: 30px;
+}
+.mail-conv-delete-wrapper {
+  float: right;
+  margin-right: 30px;
+  margin-top: 15px;
+}
+.mail-conv-break {
+  clear: both;
+}
+.mail-conv-delete-icon {
+  border: none;
+}
 /* group member */
 #contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper {
   float: right;