Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/62437
Change subject: (bug 37917) Ugly bolding of entire section when one "other
filter" is selected
......................................................................
(bug 37917) Ugly bolding of entire section when one "other filter" is selected
If an entry in the filter/sort dropdown is selected, all values in the dropdown
were bolded (which makes no sense). This will undo that behaviour.
Also aft-prefixed the rather "general" class names.
Bug: 37917
Change-Id: Ib2dd52733894d84267c121dbd38b73e8f263978f
---
M SpecialArticleFeedbackv5.php
M SpecialArticleFeedbackv5Watchlist.php
M modules/ext.articleFeedbackv5/ext.articleFeedbackv5.dashboard.css
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
4 files changed, 15 insertions(+), 14 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5
refs/changes/37/62437/1
diff --git a/SpecialArticleFeedbackv5.php b/SpecialArticleFeedbackv5.php
index eb13f8a..8a07b1a 100644
--- a/SpecialArticleFeedbackv5.php
+++ b/SpecialArticleFeedbackv5.php
@@ -573,7 +573,7 @@
array(
'href' => '#',
'id' =>
"articleFeedbackv5-special-filter-$filter",
- 'class' =>
'articleFeedbackv5-filter-link' . ( $this->startingFilter == $filter ? '
filter-active' : '' )
+ 'class' =>
'articleFeedbackv5-filter-link' . ( $this->startingFilter == $filter ? '
articleFeedbackv5-filter-active' : '' )
),
$this->msg(
"articlefeedbackv5-special-filter-$filter", $count )->escaped()
);
diff --git a/SpecialArticleFeedbackv5Watchlist.php
b/SpecialArticleFeedbackv5Watchlist.php
index 9cbf3ad..efc8f9a 100644
--- a/SpecialArticleFeedbackv5Watchlist.php
+++ b/SpecialArticleFeedbackv5Watchlist.php
@@ -112,7 +112,7 @@
array(
'href' => '#',
'id' =>
"articleFeedbackv5-special-filter-$filter",
- 'class' =>
'articleFeedbackv5-filter-link' . ( $this->startingFilter == $filter ? '
filter-active' : '' )
+ 'class' =>
'articleFeedbackv5-filter-link' . ( $this->startingFilter == $filter ? '
articleFeedbackv5-filter-active' : '' )
),
$this->msg(
"articlefeedbackv5-special-filter-$filter-watchlist" )->escaped()
);
diff --git a/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.dashboard.css
b/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.dashboard.css
index 6164f2e..27a363f 100644
--- a/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.dashboard.css
+++ b/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.dashboard.css
@@ -140,14 +140,14 @@
margin-right: 10px;
font-weight: bold;
}
-.filter-active, .filter-active:hover,
.articleFeedbackv5-filter-link.filter-active:hover {
+.articleFeedbackv5-filter-active, .articleFeedbackv5-filter-active:hover,
.articleFeedbackv5-filter-link.articleFeedbackv5-filter-active:hover {
font-weight: bold;
/* @embed */
background-image: url(images/bg-feedbackpage-header-on.png);
background-position: bottom left;
background-repeat: repeat-x;
}
-.filter-active, .filter-active:visited {
+.articleFeedbackv5-filter-active, .articleFeedbackv5-filter-active:visited {
color: #000;
}
#articleFeedbackv5-select-wrapper,
@@ -157,7 +157,7 @@
padding: 0 5px;
}
#articleFeedbackv5-select-wrapper:hover,
-#articleFeedbackv5-select-wrapper.filter-active {
+#articleFeedbackv5-select-wrapper.articleFeedbackv5-filter-active {
/* @embed */
background-image: url(images/bg-feedbackpage-header-on.png);
background-position: bottom left;
@@ -168,13 +168,14 @@
margin-right: 0px;
color: #444444;
}
-.filter-active #articleFeedbackv5-filter-select,
-.filter-active #articleFeedbackv5-sort-select {
+.articleFeedbackv5-filter-active #articleFeedbackv5-filter-select,
+.articleFeedbackv5-filter-active #articleFeedbackv5-sort-select {
color: black;
- font-weight: bold;
+ font-weight: normal;
}
-.articleFeedbackv5-filter-label, .articleFeedbackv5-sort-label {
- color: #333;
+.articleFeedbackv5-filter-active #articleFeedbackv5-filter-select
option.articleFeedbackv5-filter-selected,
+.articleFeedbackv5-filter-active #articleFeedbackv5-sort-select
option.articleFeedbackv5-filter-selected {
+ font-weight: bold;
}
/** Sorting **/
diff --git
a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
index 55fef3b..fd05ea6 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
@@ -513,14 +513,14 @@
$.articleFeedbackv5special.userType );
// update filter in select (if present) & text-links (if any)
- $( '#articleFeedbackv5-select-wrapper' ).removeClass(
'filter-active' );
- $( '.articleFeedbackv5-filter-link' ).removeClass(
'filter-active' );
+ $( '#articleFeedbackv5-select-wrapper' ).removeClass(
'articleFeedbackv5-filter-active' );
+ $( '.articleFeedbackv5-filter-link' ).removeClass(
'articleFeedbackv5-filter-active' );
if ( $( '#articleFeedbackv5-filter-select option[value=' + id +
']' ).length > 0 ) {
- $( '#articleFeedbackv5-select-wrapper' ).addClass(
'filter-active' );
+ $( '#articleFeedbackv5-select-wrapper' ).addClass(
'articleFeedbackv5-filter-active' );
} else {
$( '#articleFeedbackv5-filter-select' ).val( '' );
}
- $( '#articleFeedbackv5-special-filter-' + id).addClass(
'filter-active' );
+ $( '#articleFeedbackv5-special-filter-' + id ).addClass(
'articleFeedbackv5-filter-active' );
};
// }}}
--
To view, visit https://gerrit.wikimedia.org/r/62437
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2dd52733894d84267c121dbd38b73e8f263978f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
