SG has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148604
Change subject: Revert "Make Flow use mw-ui-constructive etc rather than
flow-ui-"
......................................................................
Revert "Make Flow use mw-ui-constructive etc rather than flow-ui-"
This reverts commit 7e606eaf600435da8b8647f2c30120b091f38c8b.
Change-Id: Ibc9c4bfe16b4c74119e62e3688ffd1d995892e3f
---
M handlebars/flow_topic_navigation.handlebars
M includes/TemplateHelper.php
M modules/new/flow-handlebars.js
M modules/new/mw-ui.enhance.js
M modules/new/styles/mediawiki.ui/tooltips.less
5 files changed, 11 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/04/148604/1
diff --git a/handlebars/flow_topic_navigation.handlebars
b/handlebars/flow_topic_navigation.handlebars
index d956042..b522f68 100644
--- a/handlebars/flow_topic_navigation.handlebars
+++ b/handlebars/flow_topic_navigation.handlebars
@@ -26,7 +26,7 @@
<a href="{{links.pagination.rev.url}}"
title="{{links.pagination.rev.title}}" class="mw-ui-button mw-ui-progressive
mw-ui-quiet"><span class="wikiglyph wikiglyph-article"></span> {{l10n
"flow-load-more"}}</a>
{{else}}
<!-- @todo make disabled class do something? -->
- <a class="mw-ui-button mw-ui-progressive
mw-ui-quiet disabled"><span class="wikiglyph wikiglyph-article"></span> {{l10n
"flow-load-more"}}</a>
+ <a class="mw-ui-button flow-ui-progressive
mw-ui-quiet disabled"><span class="wikiglyph wikiglyph-article"></span> {{l10n
"flow-load-more"}}</a>
{{/if}}
{{/if}}
</li>
diff --git a/includes/TemplateHelper.php b/includes/TemplateHelper.php
index f50e9b8..2c3fc7b 100644
--- a/includes/TemplateHelper.php
+++ b/includes/TemplateHelper.php
@@ -868,7 +868,7 @@
return (
self::processTemplate( 'flow_tooltip', array(
'positionClass' => $params['positionClass'] ?
'flow-ui-tooltip-' . $params['positionClass'] : null,
- 'contextClass' => $params['contextClass'] ?
'mw-ui-' . $params['contextClass'] : null,
+ 'contextClass' => $params['contextClass'] ?
'flow-ui-' . $params['contextClass'] : null,
'extraClass' => $params['extraClass'] ?: '',
'blockClass' => $params['isBlock'] ?
'flow-ui-tooltip-block' : null,
'content' => $fn(),
diff --git a/modules/new/flow-handlebars.js b/modules/new/flow-handlebars.js
index 3b8a64e..4704b3a 100644
--- a/modules/new/flow-handlebars.js
+++ b/modules/new/flow-handlebars.js
@@ -558,7 +558,7 @@
"flow_tooltip",
{
positionClass: params.positionClass ?
'flow-ui-tooltip-' + params.positionClass : null,
- contextClass: params.contextClass ? 'mw-ui-' +
params.contextClass : null,
+ contextClass: params.contextClass ? 'flow-ui-'
+ params.contextClass : null,
extraClass: params.extraClass,
blockClass: params.isBlock ?
'flow-ui-tooltip-block' : null,
content: options.fn( this )
diff --git a/modules/new/mw-ui.enhance.js b/modules/new/mw-ui.enhance.js
index 37c0921..01aefda 100644
--- a/modules/new/mw-ui.enhance.js
+++ b/modules/new/mw-ui.enhance.js
@@ -218,11 +218,11 @@
// Try to inherit tooltipContext from the target's
classes
if ( !optionsUnreferenced.tooltipContext ) {
- if ( $target.hasClass( 'mw-ui-progressive' ) ) {
+ if ( $target.hasClass( 'flow-ui-progressive' )
) {
optionsUnreferenced.tooltipContext =
'progressive';
- } else if ( $target.hasClass(
'mw-ui-constructive' ) ) {
+ } else if ( $target.hasClass(
'flow-ui-constructive' ) ) {
optionsUnreferenced.tooltipContext =
'constructive';
- } else if ( $target.hasClass(
'mw-ui-destructive' ) ) {
+ } else if ( $target.hasClass(
'flow-ui-destructive' ) ) {
optionsUnreferenced.tooltipContext =
'destructive';
}
}
@@ -242,8 +242,8 @@
// Tooltip style context
if ( optionsUnreferenced.tooltipContext ) {
- $tooltip.removeClass( 'mw-ui-progressive
mw-ui-constructive mw-ui-destructive' );
- $tooltip.addClass( 'mw-ui-' +
optionsUnreferenced.tooltipContext );
+ $tooltip.removeClass( 'flow-ui-progressive
flow-ui-constructive flow-ui-destructive' );
+ $tooltip.addClass( 'flow-ui-' +
optionsUnreferenced.tooltipContext );
}
// Tooltip size (small, large)
diff --git a/modules/new/styles/mediawiki.ui/tooltips.less
b/modules/new/styles/mediawiki.ui/tooltips.less
index 76a3400..176d52e 100644
--- a/modules/new/styles/mediawiki.ui/tooltips.less
+++ b/modules/new/styles/mediawiki.ui/tooltips.less
@@ -181,13 +181,13 @@
// Don't apply these classes on IE6
&[class] {
- &.mw-ui-progressive {
+ &.flow-ui-progressive {
.flow-ui-tooltip-color( @colorProgressive );
}
- &.mw-ui-constructive {
+ &.flow-ui-constructive {
.flow-ui-tooltip-color( @colorConstructive );
}
- &.mw-ui-destructive {
+ &.flow-ui-destructive {
.flow-ui-tooltip-color( @colorDestructive );
}
&.flow-ui-tooltip-small {
--
To view, visit https://gerrit.wikimedia.org/r/148604
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc9c4bfe16b4c74119e62e3688ffd1d995892e3f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: SG <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
