jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Use OOUI icon instead of WikiFont for load-more spinner"
......................................................................
Revert "Use OOUI icon instead of WikiFont for load-more spinner"
While the dependency in OOUI has been merged, it hasn't
yet been released into MW core. Until that has happened,
this will produce a wobbly spinner.
This reverts commit aaf267ff8398d508044add9e5a47a3826dd88e06.
Change-Id: Ia8d507f7075a1a37e7307b8c9a77afb34df5dbc6
---
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/flow_load_more.partial.handlebars
M modules/styles/js.less
3 files changed, 29 insertions(+), 32 deletions(-)
Approvals:
Catrope: 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 728db71..248517d 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -339,8 +339,6 @@
'.$sp.' <div class="flow-error-container">
'.$sp.' </div>
'.$sp.'
-'.$sp.' <div class="flow-ui-loading"><div class="mw-ui-icon
mw-ui-icon-before mw-ui-icon-advanced"></div></div>
-'.$sp.'
'.$sp.' <a data-flow-interactive-handler="apiRequest"
'.$sp.'
data-flow-api-handler="'.htmlentities((string)((isset($in['loadMoreApiHandler'])
&& is_array($in)) ? $in['loadMoreApiHandler'] : null), ENT_QUOTES, 'UTF-8').'"
'.$sp.' data-flow-api-target="< .flow-load-more"
@@ -380,4 +378,4 @@
</div>
';
}
-?>
+?>
\ No newline at end of file
diff --git a/handlebars/flow_load_more.partial.handlebars
b/handlebars/flow_load_more.partial.handlebars
index cbb0ab0..f823058 100644
--- a/handlebars/flow_load_more.partial.handlebars
+++ b/handlebars/flow_load_more.partial.handlebars
@@ -4,8 +4,6 @@
{{!-- placeholder for javascript injected errors --}}
</div>
- <div class="flow-ui-loading"><div class="mw-ui-icon
mw-ui-icon-before mw-ui-icon-advanced"></div></div>
-
<a data-flow-interactive-handler="apiRequest"
data-flow-api-handler="{{loadMoreApiHandler}}"
data-flow-api-target="< .flow-load-more"
diff --git a/modules/styles/js.less b/modules/styles/js.less
index 914a95c..6f97ecd 100644
--- a/modules/styles/js.less
+++ b/modules/styles/js.less
@@ -39,33 +39,10 @@
}
// When the load more wrapper is being processed, show the spinning loading
icon
-.flow-ui-loading {
- // Hide by default
- display: none;
-
- // But show when a load is pending
- .flow-load-more.flow-api-inprogress & {
- display: block;
- }
-
- // Align the icon in the center
- text-align: center;
- .mw-ui-icon {
- display: inline-block;
- font-size: 2em;
-
- // Make the icon rotate
- &:before {
- -webkit-animation: spin infinite 2s linear;
- -moz-animation: spin infinite 2s linear;
- -ms-animation: spin infinite 2s linear;
- -o-animation: spin infinite 2s linear;
- animation: spin infinite 2s linear;
- }
-
- &.mw-ui-icon-before:before {
- margin-right: 0;
- }
+.flow-load-more.flow-api-inprogress {
+ .flow-topics > &,
+ .flow-board-header-menu .flow-list & {
+ .flow-loading;
}
}
@@ -75,6 +52,30 @@
cursor: wait;
}
+// Spinning loading icon
+.flow-loading {
+ overflow: visible;
+
+ display: block;
+ width: 100%;
+ text-align: center;
+
+ &:before {
+ display: inline-block;
+ content: "\e018";
+ font-family: 'WikiFont-Glyphs';
+ font-size: 3em;
+ line-height: 1em;
+ -webkit-font-smoothing: antialiased;
+
+ -webkit-animation: spin infinite 2s linear;
+ -moz-animation: spin infinite 2s linear;
+ -ms-animation: spin infinite 2s linear;
+ -o-animation: spin infinite 2s linear;
+ animation: spin infinite 2s linear;
+ }
+}
+
@-webkit-keyframes spin {
0% { -webkit-transform: rotate(0deg); opacity: .5; }
50% { opacity: .75; }
--
To view, visit https://gerrit.wikimedia.org/r/220829
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8d507f7075a1a37e7307b8c9a77afb34df5dbc6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
