Mostly reverting change Ifb9a287e since it isn't rendering correctly

For Chrome and Safari

Change-Id: I954a33a1a218d2b6f3996a78d9c244ca6b57042a

modules/special/ext.echo.special.css

@@ -14,17 +14,12 @@ h1#firstHeading {
 	max-width: 600px;
 }
 
-.mw-echo-special-header-link {
-	display: block;
-	float: right;
-	font-size: 13px;
-	font-weight: normal;
-	line-height: 14px;
-}
 #mw-echo-pref-link {
 	margin: 5px 3px;
 	height: 18px;
 	width: 18px;
+	display: block;
+	float: right;
 	/* @embed */
 	background-image: url(Preferences.png);
 	background-repeat: no-repeat;
@@ -38,6 +33,8 @@ h1#firstHeading {
 	margin: 5px 3px;
 	height: 18px;
 	width: 18px;
+	display: block;
+	float: right;
 	/* @embed */
 	background-image: url(MoreInfo.png);
 	background-repeat: no-repeat;
@@ -48,15 +45,6 @@ h1#firstHeading {
 	background-image: url(MoreInfoHover.png);
 }
 
-#mw-echo-feedback-link {
-	margin: 10px 7px;
-	cursor: pointer;
-}
-#mw-echo-link-separator {
-	color: #AAAAAA;
-	margin: 10px 3px;
-}
-
 .mw-echo-date-section {
 	font-weight: 800;
 	font-size: 1.1em;

modules/special/ext.echo.special.js

@@ -40,24 +40,6 @@
 				}
 			} );
 
-			$( '#mw-echo-pref-link' )
-				.appendTo( $( '#firstHeading' ) );
-
-			$( '<div></div>' )
-				.attr( 'id', 'mw-echo-link-separator' )
-				.attr( 'class', 'mw-echo-special-header-link' )
-				.text( '|' )
-				.appendTo( $( '#firstHeading' ) );
-
-			$( '<a/>' )
-				.attr( 'href', mw.config.get( 'wgEchoFeedbackPage' ) )
-				.attr( 'id', 'mw-echo-feedback-link' )
-				.attr( 'class', 'mw-echo-special-header-link' )
-				.prop( 'target', '_blank' )
-				.text( 'Feedback' )
-				.appendTo( $( '#firstHeading' ) );
-
-			/* This is going to be changed and re-added soon --kaldari 04/2013
 			$( '<a/>' )
 				.attr( 'href', mw.config.get( 'wgEchoHelpPage' ) )
 				.attr( 'title', mw.msg( 'echo-more-info' ) )
@@ -65,7 +47,10 @@
 				.attr( 'class', 'mw-echo-special-header-link' )
 				.prop( 'target', '_blank' )
 				.appendTo( $( '#firstHeading' ) );
-			*/
+
+			$( '#mw-echo-pref-link' )
+				.appendTo( $( '#firstHeading' ) );
+
 		},
 
 		/**

special/SpecialNotifications.php

@@ -39,7 +39,6 @@ class SpecialNotifications extends SpecialPage {
 		$html = Html::rawElement( 'a', array(
 			'href' => SpecialPage::getTitleFor( 'Preferences' )->getLinkURL() . '#mw-prefsection-echo',
 			'id' => 'mw-echo-pref-link',
-			'class' => 'mw-echo-special-header-link',
 			'title' => wfMessage( 'preferences' )->text()
 		) );