Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

4 files changed, 11 insertions, 36 deletions

diff --git a/view/css/conversation.css b/view/css/conversation.css
index 289e389fa..27601b453 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -182,19 +182,20 @@ a.wall-item-name-link {
 .comment-edit-text-empty,
 .comment-edit-text-full {
 	padding: 0.5rem;
-	line-height: 1.25;
 	width: 100%;
 	display: inherit;
 }
 
 .comment-edit-text-empty {
-	height: 2.25rem;
+	height: 2rem;
+	line-height: 1;
 	overflow: hidden;
 	resize: none;
 }
 
 .comment-edit-text-full {
 	height: 7rem;
+	line-height: 1.25;
 	overflow: auto;
 	resize: vertical;
 }
diff --git a/view/css/mod_apps.css b/view/css/mod_apps.css
index 0a231bc84..5e6000fb4 100644
--- a/view/css/mod_apps.css
+++ b/view/css/mod_apps.css
@@ -1,8 +1,7 @@
 .app-container {
 	float: left;
-	width: 150px;
-	height: 180px;
-	padding: 20px;
+	width: 148px;
+	margin: 20px;
 }
 
 .app-name {
diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css
index 6a98267f0..8072b4668 100644
--- a/view/css/mod_mail.css
+++ b/view/css/mod_mail.css
@@ -1,34 +1,3 @@
-.mail-conv-sender {
-	float: left;
-	margin-right: 10px;
-	margin-bottom: 10px;
-}
-
-.mail-conv-sender img{
-	width: 2.2rem;
-	height: 2.2rem;
-}
-
-.mail-conv-sender-name {
-	font-weight: bold;
-}
-
-.mail-conv-body {
-	margin-bottom: 10px;
-}
-
 .mail-conv-body img {
 	max-width: 100%;
 }
-
-#prvmail-rotator {
-	margin: 15px;
-}
-
-#prvmail-text {
-	height: 15.0em;
-}
-
-.mail-conv-outside-wrapper {
-	margin-bottom: 20px;
-}
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 622c1cb86..880745ba2 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -155,3 +155,9 @@ li:hover .group-edit-icon {
 a.wikilist {
 	z-index: 1;
 }
+
+/* mail list */
+
+.active .conv-participants {
+	color: #fff;
+}