From 44b714d0eb13263d5900bd8d51bf3995388f4bd0 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 3 Mar 2015 14:38:34 -0800
Subject: group/collection edit page cleanup

---
 version.inc                       | 2 +-
 view/css/mod_group.css            | 8 ++++----
 view/theme/redbasic/css/style.css | 1 -
 view/tpl/group_drop.tpl           | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/version.inc b/version.inc
index baaf78090..8dd1bb24f 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-03-02.959
+2015-03-03.960
diff --git a/view/css/mod_group.css b/view/css/mod_group.css
index 91d5b2136..b828e551d 100644
--- a/view/css/mod_group.css
+++ b/view/css/mod_group.css
@@ -2,7 +2,7 @@
 #group-new-submit-wrapper {
 	margin-top: 30px;
 }
-
+/*
 #group-edit-form > label {
 	float: left;
 	width: 300px;
@@ -16,7 +16,7 @@
 #group-edit-form .field {
 	clear: both;
 }
-
+*/
 #group-edit-submit-wrapper input {
 	clear: both;
 	width: 100px;
@@ -25,7 +25,7 @@
 #group-edit-select-end {
 	clear: both;
 }
-
+/*
 #group-edit-name-label {
 	float: left;
 	width: 175px;
@@ -44,7 +44,7 @@
 
 
 }
-
+*/
 
 #group_members_select_label {
 	display: block;
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 248c85592..a27de499f 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -662,7 +662,6 @@ footer {
 
 .group-delete-wrapper {
 	float: right;
-	margin-right: 50px;
 }
 
 .rconnect {
diff --git a/view/tpl/group_drop.tpl b/view/tpl/group_drop.tpl
index 850e7101f..34ee3e3fd 100755
--- a/view/tpl/group_drop.tpl
+++ b/view/tpl/group_drop.tpl
@@ -2,6 +2,6 @@
 	<a href="group/drop/{{$id}}?t={{$form_security_token}}" 
 		onclick="return confirmDelete();" 
 		id="group-delete-icon-{{$id}}" 
-		class="group-delete-icon" ><i class="icon-remove drop-icons"></i></a>
+		class="group-delete-icon btn btn-default" title="{{$delete}}" ><i class="icon-trash drop-icons"></i></a>
 </div>
 <div class="group-delete-end"></div>
-- 
cgit v1.2.3