jenkins-bot has submitted this change and it was merged.
Change subject: Switch to neutral buttons and don't use destructive flag
excessively
......................................................................
Switch to neutral buttons and don't use destructive flag excessively
Special:Newsletter
There are plans to merge progressive/constructive flags so all buttons
except Subscribe/Unsubscribe have been converted to neutral flags.
Also removed 'primary' flag from Subscribe/Unsubscribe button as these
don't do an action on click but navigates to another page.
Special:Newsletters
Change to blue/black color to get rid of the OOUI "primary" flag.
Bug: T124527
Change-Id: I31c70d1e35bff3ed9fb8117eec1926187cb384c0
---
M includes/specials/SpecialNewsletter.php
M modules/ext.newsletter.newsletters.styles.css
2 files changed, 9 insertions(+), 12 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialNewsletter.php
b/includes/specials/SpecialNewsletter.php
index 4361525..c8c6034 100644
--- a/includes/specials/SpecialNewsletter.php
+++ b/includes/specials/SpecialNewsletter.php
@@ -192,7 +192,6 @@
$buttons[] = new OOUI\ButtonWidget(
array(
'label' => $this->msg(
'newsletter-delete-button' )->escaped(),
- 'flags' => array( 'destructive' ),
'icon' => 'remove',
'href' => $this->getPageTitle( $id .
'/' . self::NEWSLETTER_DELETE )->getFullURL()
)
@@ -203,7 +202,6 @@
$buttons[] = new OOUI\ButtonWidget(
array(
'label' => $this->msg(
'newsletter-manage-button' )->escaped(),
- 'flags' => array(),
'icon' => 'settings',
'href' => SpecialPage::getTitleFor(
'NewsletterManage' )->getFullURL()
)
@@ -214,7 +212,6 @@
$buttons[] = new OOUI\ButtonWidget(
array(
'label' => $this->msg(
'newsletter-announce-button' )->escaped(),
- 'flags' => array( 'progressive' ),
'icon' => 'comment',
'href' => $this->getPageTitle( $id .
'/' . self::NEWSLETTER_ANNOUNCE )->getFullURL()
)
@@ -225,7 +222,7 @@
$buttons[] = new OOUI\ButtonWidget(
array(
'label' => $this->msg(
'newsletter-unsubscribe-button' )->escaped(),
- 'flags' => array( 'primary',
'destructive' ),
+ 'flags' => array( 'destructive' ),
'href' => $this->getPageTitle( $id .
'/' . self::NEWSLETTER_UNSUBSCRIBE )->getFullURL()
)
);
@@ -233,7 +230,7 @@
$buttons[] = new OOUI\ButtonWidget(
array(
'label' => $this->msg(
'newsletter-subscribe-button' )->escaped(),
- 'flags' => array( 'primary',
'constructive' ),
+ 'flags' => array( 'constructive' ),
'href' => $this->getPageTitle( $id .
'/' . self::NEWSLETTER_SUBSCRIBE )->getFullURL()
)
);
diff --git a/modules/ext.newsletter.newsletters.styles.css
b/modules/ext.newsletter.newsletters.styles.css
index 3e09a21..94c804f 100644
--- a/modules/ext.newsletter.newsletters.styles.css
+++ b/modules/ext.newsletter.newsletters.styles.css
@@ -1,27 +1,27 @@
/**
- * Used on Special:Newsletters. We use the OOUI color scheme here. :)
+ * Used on Special:Newsletters.
*/
.newsletter-subscribed,
.newsletter-subscribed:link, .newsletter-subscribed:visited {
- color: #D11D13;
+ color: #13385A;
font-weight: bold;
}
.newsletter-subscribed:hover, .newsletter-subscribed:active {
- color: #8C130D;
- text-decoration: none;
+ color: #0c1f30;
+ text-decoration: none;
}
.newsletter-unsubscribed,
.newsletter-unsubscribed:link, .newsletter-unsubscribed:visited {
- color: #00AF89;
+ color: #245e8f;
font-weight: bold;
}
.newsletter-unsubscribed:hover, .newsletter-unsubscribed:active {
- color: #008064;
- text-decoration: none;
+ color: #173d5d;
+ text-decoration: none;
}
.newsletter-link-disabled {
--
To view, visit https://gerrit.wikimedia.org/r/267448
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I31c70d1e35bff3ed9fb8117eec1926187cb384c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Glaisher <glaisher.w...@gmail.com>
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
