jenkins-bot has submitted this change and it was merged.
Change subject: Bug: prevent floats from breaking out of topic summary
......................................................................
Bug: prevent floats from breaking out of topic summary
Change-Id: I83b5bd2e356454d0aecc041099e79f0360b664f7
---
M handlebars/compiled/flow_block_topic.handlebars.php
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/flow_topic_titlebar_summary.handlebars
M modules/styles/common.less
4 files changed, 10 insertions(+), 2 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 eba9a67..9c7540d 100644
--- a/handlebars/compiled/flow_block_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic.handlebars.php
@@ -47,6 +47,7 @@
<div class="flow-topic-summary">
'.LCRun3::ch($cx, 'escapeContent',
Array(Array(((isset($in['summary']['format']) && is_array($in['summary'])) ?
$in['summary']['format'] : null),((isset($in['summary']['content']) &&
is_array($in['summary'])) ? $in['summary']['content'] : null)),Array()),
'encq').'
</div>
+ <br class="flow-ui-clear"/>
' : '').'
</div>
';},'flow_topic_titlebar_content' => function ($cx, $in) {return '<h2
class="flow-topic-title">'.LCRun3::ch($cx, 'escapeContent',
Array(Array(((isset($in['content']['format']) && is_array($in['content'])) ?
$in['content']['format'] : null),((isset($in['content']['content']) &&
is_array($in['content'])) ? $in['content']['content'] : null)),Array()),
'encq').'</h2>
@@ -303,4 +304,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 a37eb9f..2fc5637 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -151,6 +151,7 @@
<div class="flow-topic-summary">
'.LCRun3::ch($cx, 'escapeContent',
Array(Array(((isset($in['summary']['format']) && is_array($in['summary'])) ?
$in['summary']['format'] : null),((isset($in['summary']['content']) &&
is_array($in['summary'])) ? $in['summary']['content'] : null)),Array()),
'encq').'
</div>
+ <br class="flow-ui-clear"/>
' : '').'
</div>
';},'flow_topic_titlebar_content' => function ($cx, $in) {return '<h2
class="flow-topic-title">'.LCRun3::ch($cx, 'escapeContent',
Array(Array(((isset($in['content']['format']) && is_array($in['content'])) ?
$in['content']['format'] : null),((isset($in['content']['content']) &&
is_array($in['content'])) ? $in['content']['content'] : null)),Array()),
'encq').'</h2>
@@ -411,4 +412,4 @@
</div>
';
}
-?>
\ No newline at end of file
+?>
diff --git a/handlebars/flow_topic_titlebar_summary.handlebars
b/handlebars/flow_topic_titlebar_summary.handlebars
index 5dcc60d..48df93a 100644
--- a/handlebars/flow_topic_titlebar_summary.handlebars
+++ b/handlebars/flow_topic_titlebar_summary.handlebars
@@ -4,5 +4,6 @@
<div class="flow-topic-summary">
{{escapeContent summary.format summary.content}}
</div>
+ <br class="flow-ui-clear"/>
{{/if}}
</div>
diff --git a/modules/styles/common.less b/modules/styles/common.less
index 3e377d1..9d15db8 100644
--- a/modules/styles/common.less
+++ b/modules/styles/common.less
@@ -71,6 +71,11 @@
}
}
+.flow-ui-clear {
+ clear: both;
+ line-height: 0;
+}
+
@media all and (min-width: @wgFlowDeviceWidthTablet) {
.flow-topic-meta {
font-size: 1em;
--
To view, visit https://gerrit.wikimedia.org/r/168492
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I83b5bd2e356454d0aecc041099e79f0360b664f7
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
