Merge branch 'master' into notify

2 files changed, 64 insertions, 0 deletions

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;