jenkins-bot has submitted this change and it was merged.
Change subject: Remove mw-ui-active and change subscribe button inversion
......................................................................
Remove mw-ui-active and change subscribe button inversion
Change-Id: I4ede8b216c5ab475b2674a32712a8ee8fc920941
---
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/flow_topic_titlebar_watch.handlebars
M includes/View.php
M modules/new/styles/board/topic/watchlist.less
4 files changed, 12 insertions(+), 35 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php
b/handlebars/compiled/flow_block_topiclist.handlebars.php
index 1dfaefd..98b4c55 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -182,10 +182,10 @@
'.((LCRun3::ifvar($cx, ((is_array($in) &&
isset($in['watchable'])) ? $in['watchable'] : null))) ? '
<div class="flow-topic-watchlist">
'.((LCRun3::ifvar($cx, ((is_array($in) &&
isset($in['isAlwaysWatched'])) ? $in['isAlwaysWatched'] : null))) ? '
- <span class="mw-ui-quiet mw-ui-constructive
mw-ui-active">'.htmlentities(((is_array($in) && isset($in['null'])) ?
$in['null'] : null), ENT_QUOTES, 'UTF-8').'<span class="wikiglyph
wikiglyph-star"></span>'.htmlentities(((is_array($in) && isset($in['null'])) ?
$in['null'] : null), ENT_QUOTES, 'UTF-8').'</span>
+ <span class="mw-ui-constructive">'.htmlentities(((is_array($in)
&& isset($in['null'])) ? $in['null'] : null), ENT_QUOTES, 'UTF-8').'<span
class="wikiglyph wikiglyph-star"></span>'.htmlentities(((is_array($in) &&
isset($in['null'])) ? $in['null'] : null), ENT_QUOTES, 'UTF-8').'</span>
' : '
<a href="'.((LCRun3::ifvar($cx, ((is_array($in) &&
isset($in['isWatched'])) ? $in['isWatched'] : null))) ?
''.htmlentities(((is_array($in['links']['unwatch-topic']) &&
isset($in['links']['unwatch-topic']['url'])) ?
$in['links']['unwatch-topic']['url'] : null), ENT_QUOTES, 'UTF-8').'' :
''.htmlentities(((is_array($in['links']['watch-topic']) &&
isset($in['links']['watch-topic']['url'])) ? $in['links']['watch-topic']['url']
: null), ENT_QUOTES, 'UTF-8').'').'"
- class="mw-ui-quiet mw-ui-constructive '.((LCRun3::ifvar($cx,
((is_array($in) && isset($in['isWatched'])) ? $in['isWatched'] : null))) ?
'mw-ui-active' : '').'"
+ class="mw-ui-constructive '.((!LCRun3::ifvar($cx,
((is_array($in) && isset($in['isWatched'])) ? $in['isWatched'] : null))) ?
'mw-ui-quiet' : '').'"
data-flow-api-handler="watchTopic"
data-flow-api-target="< .flow-topic-watchlist"
data-flow-api-method="POST">'.htmlentities(((is_array($in)
&& isset($in['null'])) ? $in['null'] : null), ENT_QUOTES, 'UTF-8').'<span
class="wikiglyph wikiglyph-star"></span>'.htmlentities(((is_array($in) &&
isset($in['null'])) ? $in['null'] : null), ENT_QUOTES,
'UTF-8').''.htmlentities(((is_array($in) && isset($in['null'])) ? $in['null'] :
null), ENT_QUOTES, 'UTF-8').'<span class="wikiglyph
wikiglyph-unstar"></span>'.htmlentities(((is_array($in) && isset($in['null']))
? $in['null'] : null), ENT_QUOTES, 'UTF-8').'</a>
@@ -451,4 +451,4 @@
</div>
';
}
-?>
+?>
\ No newline at end of file
diff --git a/handlebars/flow_topic_titlebar_watch.handlebars
b/handlebars/flow_topic_titlebar_watch.handlebars
index e17f2cd..da25cce 100644
--- a/handlebars/flow_topic_titlebar_watch.handlebars
+++ b/handlebars/flow_topic_titlebar_watch.handlebars
@@ -1,11 +1,11 @@
<div class="flow-topic-watchlist">
{{#if isAlwaysWatched}}
- <span class="mw-ui-quiet mw-ui-constructive mw-ui-active">
+ <span class="mw-ui-constructive">
{{~null~}}<span class="wikiglyph
wikiglyph-star"></span>{{~null~}}
</span>
{{else}}
<a href="{{#if
isWatched}}{{links.unwatch-topic.url}}{{else}}{{links.watch-topic.url}}{{/if}}"
- class="mw-ui-quiet mw-ui-constructive {{#if
isWatched}}mw-ui-active{{/if}}"
+ class="mw-ui-constructive {{#unless
isWatched}}mw-ui-quiet{{/unless}}"
data-flow-api-handler="watchTopic"
data-flow-api-target="< .flow-topic-watchlist"
data-flow-api-method="POST">
diff --git a/includes/View.php b/includes/View.php
index 7eae824..7d825f8 100644
--- a/includes/View.php
+++ b/includes/View.php
@@ -44,9 +44,9 @@
$out = $this->getOutput();
$styles = array(
'mediawiki.ui',
+ 'mediawiki.ui.anchor',
'mediawiki.ui.button',
'mediawiki.ui.input',
- 'mediawiki.ui.anchor',
'ext.flow.styles',
'ext.flow.mediawiki.ui.tooltips',
'ext.flow.mediawiki.ui.form',
diff --git a/modules/new/styles/board/topic/watchlist.less
b/modules/new/styles/board/topic/watchlist.less
index 643f2bf..c24b5a2 100644
--- a/modules/new/styles/board/topic/watchlist.less
+++ b/modules/new/styles/board/topic/watchlist.less
@@ -15,44 +15,21 @@
padding: .25em .5em;
font-size: 2em;
- &.mw-ui-active {
- // Active mode shows the full star
- .wikiglyph-unstar {
+ &.mw-ui-quiet {
+ // Quiet mode shows the outline star
+ .wikiglyph-star {
display: none;
}
- .wikiglyph-star {
+ .wikiglyph-unstar {
display: inline-block;
*display: inline;
zoom: 1;
}
-
- // Invert on hover when already subscribed
- &:hover {
- .wikiglyph-unstar {
- display: inline-block;
- *display: inline;
- zoom: 1;
- }
- .wikiglyph-star {
- display: none;
- }
- }
}
- // Inactive mode shows the star outline
- .wikiglyph-star {
+ // Regular mode shows the full star
+ .wikiglyph-unstar {
display: none;
- }
- // Invert on hover
- &:hover {
- .wikiglyph-unstar {
- display: none;
- }
- .wikiglyph-star {
- display: inline-block;
- *display: inline;
- zoom: 1;
- }
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/150978
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4ede8b216c5ab475b2674a32712a8ee8fc920941
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: SG <shah...@gmail.com>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
