jenkins-bot has submitted this change and it was merged.
Change subject: H99: Never collapse on topic pages
......................................................................
H99: Never collapse on topic pages
Change-Id: I5ab8edd5c2234742d9ba53141703533576a3e476
---
M handlebars/compiled/flow_block_topic.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/compiled/flow_post.handlebars.php
M handlebars/flow_block_topic.handlebars
M modules/new/styles/board/collapser.less
7 files changed, 20 insertions(+), 18 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/handlebars/compiled/flow_block_topic.handlebars.php
b/handlebars/compiled/flow_block_topic.handlebars.php
index 759d02e..d396b3b 100644
--- a/handlebars/compiled/flow_block_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic.handlebars.php
@@ -30,7 +30,7 @@
'sp_vars' => Array(),
);
- return '<div class="flow-board">
+ return '<div class="flow-board flow-disable-collapse">
<div class="flow-topics">
'.'
'.LCRun3::sec($cx, ((is_array($in) && isset($in['roots'])) ?
$in['roots'] : null), $in, true, function($cx, $in) {return '
@@ -467,4 +467,4 @@
</div>
';
}
-?>
+?>
\ No newline at end of file
diff --git a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
index 8278df5..23cd539 100644
--- a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
@@ -620,4 +620,4 @@
</div>
';
}
-?>
+?>
\ No newline at end of file
diff --git a/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
b/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
index 8e7e79e..a703e10 100644
--- a/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
@@ -620,4 +620,4 @@
</div>
';
}
-?>
+?>
\ No newline at end of file
diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php
b/handlebars/compiled/flow_block_topiclist.handlebars.php
index 08b1d08..1038eca 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -611,4 +611,4 @@
</div>
';
}
-?>
+?>
\ No newline at end of file
diff --git a/handlebars/compiled/flow_post.handlebars.php
b/handlebars/compiled/flow_post.handlebars.php
index 0b81cff..971b006 100644
--- a/handlebars/compiled/flow_post.handlebars.php
+++ b/handlebars/compiled/flow_post.handlebars.php
@@ -583,4 +583,4 @@
';}).'
';
}
-?>
+?>
\ No newline at end of file
diff --git a/handlebars/flow_block_topic.handlebars
b/handlebars/flow_block_topic.handlebars
index 1b7ca0d..598acfe 100644
--- a/handlebars/flow_block_topic.handlebars
+++ b/handlebars/flow_block_topic.handlebars
@@ -1,4 +1,4 @@
-<div class="flow-board">
+<div class="flow-board flow-disable-collapse">
<div class="flow-topics">
{{!-- There is only one topic, but we use same api response
structure --}}
{{> flow_topiclist_loop}}
diff --git a/modules/new/styles/board/collapser.less
b/modules/new/styles/board/collapser.less
index a442f04..57fc88e 100644
--- a/modules/new/styles/board/collapser.less
+++ b/modules/new/styles/board/collapser.less
@@ -28,19 +28,21 @@
}
}
-div.flow-element-collapsed {
- // topic hidden
- .flow-post,
- .flow-reply-form {
- display: none;
- }
-
- // post hidden
- .flow-post & {
- .flow-post-content,
- .flow-post-meta {
+.flow-board:not(.flow-disable-collapse) {
+ div.flow-element-collapsed {
+ // topic hidden
+ .flow-post,
+ .flow-reply-form {
display: none;
}
+
+ // post hidden
+ .flow-post & {
+ .flow-post-content,
+ .flow-post-meta {
+ display: none;
+ }
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/160822
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5ab8edd5c2234742d9ba53141703533576a3e476
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: SG <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
