jenkins-bot has submitted this change and it was merged.
Change subject: Fix style to show sort icon (downCaret)
......................................................................
Fix style to show sort icon (downCaret)
Bug: T99855
Change-Id: I3154450b7f104d90c2f7d1db7a9178ca332033e9
---
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/flow_board_navigation.partial.handlebars
M modules/styles/board/navigation.less
3 files changed, 19 insertions(+), 9 deletions(-)
Approvals:
Mooeypoo: 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 3709f73..248517d 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -38,9 +38,11 @@
'.$sp.' data-tooltip-pointing="right"
'.$sp.' title="'.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($in['sortby']) && is_array($in)) ? $in['sortby'] :
null),'===','updated'),array()), $in, false, function($cx, $in)use($sp){return
''.LCRun3::ch($cx, 'l10n', array(array('flow-sorting-tooltip-recent'),array()),
'encq').'';}, function($cx, $in)use($sp){return ''.LCRun3::ch($cx, 'l10n',
array(array('flow-sorting-tooltip-newest'),array()), 'encq').'';}).'"
'.$sp.' data-flow-interactive-handler="menuToggle"
-'.$sp.' data-flow-menu-target="< .flow-board-navigation
.flow-board-sort-menu">'.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($in['sortby']) && is_array($in)) ? $in['sortby'] :
null),'===','updated'),array()), $in, false, function($cx, $in)use($sp){return
' '.LCRun3::ch($cx, 'l10n',
array(array('flow-recent-topics'),array()), 'encq').'
-'.$sp.'';}, function($cx, $in)use($sp){return '
'.LCRun3::ch($cx, 'l10n', array(array('flow-newest-topics'),array()), 'encq').'
-'.$sp.'';}).' <span class="mw-ui-icon mw-ui-icon-after
mw-ui-icon-caretDown"></span>
+'.$sp.' data-flow-menu-target="< .flow-board-navigation
.flow-board-sort-menu">
+'.$sp.' <span>'.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($in['sortby']) && is_array($in)) ? $in['sortby'] :
null),'===','updated'),array()), $in, false, function($cx, $in)use($sp){return
' '.LCRun3::ch($cx, 'l10n',
array(array('flow-recent-topics'),array()), 'encq').'
+'.$sp.'';}, function($cx, $in)use($sp){return '
'.LCRun3::ch($cx, 'l10n', array(array('flow-newest-topics'),array()),
'encq').'
+'.$sp.'';}).' </span>
+'.$sp.' <span class="mw-ui-icon mw-ui-icon-before
mw-ui-icon-caretDown"> </span>
'.$sp.' </a>
'.$sp.'
'.$sp.' <a href=""
diff --git a/handlebars/flow_board_navigation.partial.handlebars
b/handlebars/flow_board_navigation.partial.handlebars
index aad3011..5c8e23f 100644
--- a/handlebars/flow_board_navigation.partial.handlebars
+++ b/handlebars/flow_board_navigation.partial.handlebars
@@ -17,12 +17,14 @@
"
data-flow-interactive-handler="menuToggle"
data-flow-menu-target="< .flow-board-navigation
.flow-board-sort-menu">
- {{~#ifCond sortby "===" "updated"}}
- {{l10n "flow-recent-topics"}}
- {{else}}
- {{l10n "flow-newest-topics"}}
- {{/ifCond}}
- <span class="mw-ui-icon mw-ui-icon-after
mw-ui-icon-caretDown"></span>
+ <span>
+ {{~#ifCond sortby "===" "updated"}}
+ {{l10n "flow-recent-topics"}}
+ {{else}}
+ {{l10n "flow-newest-topics"}}
+ {{/ifCond}}
+ </span>
+ <span class="mw-ui-icon mw-ui-icon-before
mw-ui-icon-caretDown"> </span>
</a>
<a href=""
diff --git a/modules/styles/board/navigation.less
b/modules/styles/board/navigation.less
index 9a17b31..27828c9 100644
--- a/modules/styles/board/navigation.less
+++ b/modules/styles/board/navigation.less
@@ -24,6 +24,9 @@
a.flow-board-navigator-last {
float: right;
position: static;
+ span {
+ display: inline-block;
+ }
}
.flow-board-navigation-inner {
@@ -59,6 +62,9 @@
&.flow-board-navigator-first {
padding-left: 0;
}
+ &.flow-board-navigator-last {
+ padding-right: 0;
+ }
}
// Added by JS when the window has been scrolled beyond the navigation,
so it sticks to the viewport
--
To view, visit https://gerrit.wikimedia.org/r/220478
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3154450b7f104d90c2f7d1db7a9178ca332033e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Sbisson <sbis...@wikimedia.org>
Gerrit-Reviewer: Mooeypoo <mor...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
