Merge https://github.com/friendica/red into pending_merge

2 files changed, 3 insertions, 11 deletions

diff --git a/app/manage.apd b/app/manage.apd
index ed6cb9f0a..2e0a92d74 100644
--- a/app/manage.apd
+++ b/app/manage.apd
@@ -1,4 +1,4 @@
 url: $baseurl/manage
 requires: local_user
-name: Channel Select
+name: Channel Manager
 photo: $baseurl/app/manage.png
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 85ab4adb8..0f2949a49 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -366,11 +366,6 @@ aside li {
 	font-weight: bold;
 }
 
-
-#profile-vcard-break {
-	clear: both;
-}
-
 #profile-edit-wrapper .field label {
 	margin-top: 20px;
 	width: 175px;
@@ -446,11 +441,6 @@ aside li {
 	margin-bottom: 0px;
 }
 
-.vcard-profile-edit-icon:hover {
-	text-decoration: none;
-}
-
-
 #profile-extra-links {
 	clear: both;
 	margin-top: 10px;
@@ -468,6 +458,7 @@ aside li {
 
 
 .profile-edit-side-link {
+	padding: 3px 0px;
 	opacity: 0;
 	filter:alpha(opacity=30);
 	float: right;
@@ -787,6 +778,7 @@ aside li {
 }
 
 #contact-block {
+	width: 100%;
 	float: left;
 	background-color: $comment_item_colour;
 	border-bottom: 1px solid $widget_brdrcolour;