Bsitu has submitted this change and it was merged.
Change subject: Revert "Bug 49269: Echo markup adjustments"
......................................................................
Revert "Bug 49269: Echo markup adjustments"
This reverts commit 8ff2c4dec3eecf566066ef98df6cbe7ec0e3fbd2.
Change-Id: I3936c574854640c49689d42586fbddde6a9e45bb
---
M modules/special/ext.echo.special.css
M modules/special/ext.echo.special.js
M special/SpecialNotifications.php
3 files changed, 5 insertions(+), 15 deletions(-)
Approvals:
Bsitu: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/special/ext.echo.special.css
b/modules/special/ext.echo.special.css
index f45def5..9e1789e 100644
--- a/modules/special/ext.echo.special.css
+++ b/modules/special/ext.echo.special.css
@@ -49,12 +49,11 @@
border-bottom: 1px solid #C9C9C9;
margin: 30px 0 5px 50px;
color: #686868;
- max-width: 550px;
}
ul#mw-echo-special-container {
list-style: none;
- margin: 0;
+ margin: 30px 0 0 0;
max-width: 600px;
}
.mw-echo-notification {
diff --git a/modules/special/ext.echo.special.js
b/modules/special/ext.echo.special.js
index 44cea2b..55470ec 100644
--- a/modules/special/ext.echo.special.js
+++ b/modules/special/ext.echo.special.js
@@ -49,7 +49,7 @@
// Apply custom header styling for vector and monobook
skins
if ( skin === 'vector' || skin === 'monobook' ) {
$( '#firstHeading' )
- .css( { 'max-width': '550px',
'margin-left': '50px' } );
+ .css( { 'max-width': '555px',
'margin-left': '50px' } );
$( '#mw-echo-moreinfo-link' )
.text( '' )
.appendTo( '#firstHeading' );
diff --git a/special/SpecialNotifications.php b/special/SpecialNotifications.php
index eb2a719..1d19e4c 100644
--- a/special/SpecialNotifications.php
+++ b/special/SpecialNotifications.php
@@ -52,18 +52,13 @@
$dateHeader = '';
$notices = '';
$unread = array();
- $openListElement = false;
- $html = Html::openElement( 'div', array( 'id' =>
'mw-echo-special-container' ) );
foreach ( $notif as $row ) {
// Output the date header if it has not been displayed
if ( $dateHeader !== $row['timestamp']['date'] ) {
$dateHeader = $row['timestamp']['date'];
- if ( $openListElement ) {
- $notices .= Html::closeElement( 'ul' );
- }
+ $notices .= Html::openElement( 'li' );
$notices .= Html::element( 'h2', array( 'class'
=> 'mw-echo-date-section' ), $dateHeader );
- $notices .= Html::openElement( 'ul', array(
'id' => 'mw-echo-special-container' ), $notices );
- $openListElement = true;
+ $notices .= Html::closeElement( 'li' );
}
$class = 'mw-echo-notification';
@@ -82,11 +77,7 @@
$row['*']
);
}
- $html .= $notices;
- if ( $openListElement ) {
- $html .= Html::closeElement( 'ul' );
- }
- $html .= Html::closeElement( 'div' );
+ $html = Html::rawElement( 'ul', array( 'id' =>
'mw-echo-special-container' ), $notices );
// Build the more link
if ( $nextContinue ) {
--
To view, visit https://gerrit.wikimedia.org/r/71729
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3936c574854640c49689d42586fbddde6a9e45bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Bsitu <[email protected]>
Gerrit-Reviewer: Bsitu <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
