Merge remote-tracking branch 'friendica/master' into mobile

2 files changed, 93 insertions, 1 deletions

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 1724ff30f..ac84e0eff 100755
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -318,7 +318,51 @@ aside {
 	}
 }
 
-
+/* group member */
+#contact-edit-drop-link,
+.mail-list-delete-wrapper,
+.group-delete-wrapper {
+	float: right;
+	margin-right: 50px;
+        .drophide {
+            background-image: url('../../../images/icons/22/delete.png');
+            display: block; width: 22px; height: 22px;
+            opacity: 0.3;
+            position: relative;
+            top: -50px;
+        }
+        .drop {
+            background-image: url('../../../images/icons/22/delete.png');
+            display: block; width: 22px; height: 22px;
+            position: relative;
+            top: -50px;
+        }
+}
+#group-members {
+	margin-top: 20px;
+	padding: 10px;
+	height: 250px;
+	overflow: auto;
+	border: 1px solid #ddd;
+}
+#group-members-end {
+	clear: both;
+}
+#group-all-contacts {
+	padding: 10px;
+	height: 450px;
+	overflow: auto;
+	border: 1px solid #ddd;
+}
+#group-all-contacts-end {
+	clear: both;
+	margin-bottom: 10px;
+}
+.contact-block-div {
+	float: left;
+	width: 52px;
+	height: 52px;
+}
 /* widget */
 .widget {
 	margin-bottom: 2em;
@@ -969,3 +1013,4 @@ footer { height: 100px; display: table-row; }
     margin-top: 25px;
     clear: both;
 }
+
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index 8ff57813f..0f5db6fe1 100755
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -564,6 +564,53 @@ aside #profiles-menu {
   widht: 48px;
   height: 58px;
 }
+/* group member */
+#contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper {
+  float: right;
+  margin-right: 50px;
+}
+#contact-edit-drop-link .drophide, .mail-list-delete-wrapper .drophide, .group-delete-wrapper .drophide {
+  background-image: url('../../../images/icons/22/delete.png');
+  display: block;
+  width: 22px;
+  height: 22px;
+  opacity: 0.3;
+  position: relative;
+  top: -50px;
+}
+#contact-edit-drop-link .drop, .mail-list-delete-wrapper .drop, .group-delete-wrapper .drop {
+  background-image: url('../../../images/icons/22/delete.png');
+  display: block;
+  width: 22px;
+  height: 22px;
+  position: relative;
+  top: -50px;
+}
+#group-members {
+  margin-top: 20px;
+  padding: 10px;
+  height: 250px;
+  overflow: auto;
+  border: 1px solid #ddd;
+}
+#group-members-end {
+  clear: both;
+}
+#group-all-contacts {
+  padding: 10px;
+  height: 450px;
+  overflow: auto;
+  border: 1px solid #ddd;
+}
+#group-all-contacts-end {
+  clear: both;
+  margin-bottom: 10px;
+}
+.contact-block-div {
+  float: left;
+  width: 52px;
+  height: 52px;
+}
 /* widget */
 .widget {
   margin-bottom: 2em;