wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-12 01:10:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Adjust styling for "Mark group as read""

Browse source
This commit is contained in:
jenkins-bot 2016-05-26 22:43:12 +00:00 committed by Gerrit Code Review
parent 2d3e1e6fb7 52525249e6
commit 3fc46a639d
6 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Resources.php
View file

@ -270,6 +270,7 @@ $wgResourceModules += array(
'ext.echo.styles.special' => $echoResourceTemplate + array(
'position' => 'top',
'styles' => array(
'nojs/mw.echo.icon.less',
'nojs/mw.echo.special.less',
),
'targets' => array( 'desktop', 'mobile' ),

2
i18n/en.json
View file

@ -94,7 +94,7 @@
"echo-displaynotificationsconfiguration-mandatory-notification-methods-header": "Required notification methods",
"echo-displaynotificationsconfiguration-mandatory-notification-methods-by-category-legend": "Which notification methods are mandatory for each category",
"echo-specialpage": "Notifications",
"echo-specialpage-section-markread": "Mark section as read",
"echo-specialpage-section-markread": "Mark group as read",
"echo-specialpage-markasread": "Notification: Mark as read",
"echo-specialpage-markasread-invalid-id": "Invalid event ID",
"notificationsmarkread-legend": "Mark notification as read",

1
includes/special/SpecialNotifications.php
View file

@ -109,6 +109,7 @@ class SpecialNotifications extends SpecialPage {
'label' => $this->msg( 'echo-specialpage-section-markread' )->text(),
'href' => $markReadSpecialPage->getLocalURL() . '/' . join( ',', $data[ 'unread' ] ),
'classes' => array( 'mw-echo-markAsReadSectionButton' ),
'icon' => 'doubleCheck',
) );
$sectionTitle .= $markSectionAsReadButton;
}

5
modules/icons/double-check.svg Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
<path d="M17 9.5L9.5 17 6 13.5 4.5 15l5 5L20 9.5c-.706-.706-2.294-.706-3 0z"/>
<path d="M17 4.5L9.5 12 6 8.5 4.5 10l5 5L20 4.5c-.706-.706-2.294-.706-3 0z"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 295 B

5
modules/nojs/mw.echo.icon.less Normal file
View file

@ -0,0 +1,5 @@
@import 'mediawiki.mixins';
.oo-ui-icon-doubleCheck {
.background-image('../icons/double-check.svg');
}

17
modules/nojs/mw.echo.special.less
View file

@ -49,16 +49,18 @@
}
.mw-echo-date-section {
font-weight: 800;
font-size: 1.1em;
text-transform: uppercase;
border-bottom: 1px solid #C9C9C9;
margin: 20px 0 5px 0;
color: #686868;
display: inline-block;
width: 100%;
padding-bottom: 0.5em;
}
.mw-echo-date-section-text {
text-transform: uppercase;
font-size: 1.1em;
font-weight: 800;
}
.mw-echo-special-container {
@ -92,6 +94,15 @@
.mw-echo-markAsReadSectionButton {
float: right;
// HACK: temporary workaround for T136024
line-height: normal;
.oo-ui-buttonElement-button {
.oo-ui-labelElement-label {
font-weight: normal;
}
}
}
.mw-echo-special-container {