Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/248988
Change subject: Use flow- prefix for the CSS classes
......................................................................
Use flow- prefix for the CSS classes
This is for consistency, so they can be easily attributed to Flow
(as opposed to an on-wiki script or another extension), and to avoid
clashes with other codebases.
Change-Id: I2f329665f3c2aad6eee9dba1dafd120536de677d
---
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/flow_load_more.partial.handlebars
M includes/View.php
M modules/engine/components/board/flow-board.js
M modules/flow-initialize.js
M modules/styles/board/moderated.less
M modules/styles/common.less
7 files changed, 13 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/88/248988/1
diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php
b/handlebars/compiled/flow_block_topiclist.handlebars.php
index 849097e..88feb8e 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -262,7 +262,7 @@
'.$sp.'' : ' <div class="flow-no-more">
'.$sp.' '.LCRun3::ch($cx, 'l10n',
array(array('flow-no-more-fwd'),array()), 'encq').'
'.$sp.' </div>
-'.$sp.' <div class="bottom-spacer"></div>
+'.$sp.' <div class="flow-bottom-spacer"></div>
'.$sp.'').'';},),
'scopes' => array(),
'sp_vars' => array('root' => $in),
diff --git a/handlebars/flow_load_more.partial.handlebars
b/handlebars/flow_load_more.partial.handlebars
index edc591a..fc5976c 100644
--- a/handlebars/flow_load_more.partial.handlebars
+++ b/handlebars/flow_load_more.partial.handlebars
@@ -22,5 +22,5 @@
{{!-- TODO: Does this i18n message need to be generalized? --}}
{{l10n "flow-no-more-fwd"}}
</div>
- <div class="bottom-spacer"></div>
+ <div class="flow-bottom-spacer"></div>
{{/if}}
diff --git a/includes/View.php b/includes/View.php
index 8c8d0ea..2024aa3 100644
--- a/includes/View.php
+++ b/includes/View.php
@@ -298,7 +298,7 @@
// Get the block loop template
$template = $this->lightncandy->getTemplate(
'flow_block_loop' );
- $classes = array( 'flow-component', "$page-page" );
+ $classes = array( 'flow-component', "flow-$page-page" );
// Always add mw-content-{ltr,rtl} class
$title = Title::newFromText( $apiResponse['title'] );
diff --git a/modules/engine/components/board/flow-board.js
b/modules/engine/components/board/flow-board.js
index b239ec8..1b0d1ac 100644
--- a/modules/engine/components/board/flow-board.js
+++ b/modules/engine/components/board/flow-board.js
@@ -45,7 +45,7 @@
// There is a weird bug with url ending with
#flow-post-xxxx
// and full height side rail.
// We only enable the full height when we don't have
such url.
- $container.addClass( 'full-height-side-rail' );
+ $container.addClass( 'flow-full-height-side-rail' );
}
_overrideWatchlistNotification();
diff --git a/modules/flow-initialize.js b/modules/flow-initialize.js
index 9772ec5..b2b3954 100644
--- a/modules/flow-initialize.js
+++ b/modules/flow-initialize.js
@@ -55,7 +55,7 @@
flowBoard = mw.flow.getPrototypeMethod( 'component',
'getInstanceByElement' )( $board );
if (
- $component.hasClass( 'topic-page' ) &&
+ $component.hasClass( 'flow-topic-page' ) &&
$( 'body' ).hasClass( 'action-view' )
) {
$board
diff --git a/modules/styles/board/moderated.less
b/modules/styles/board/moderated.less
index 0e0f66e..4678de4 100644
--- a/modules/styles/board/moderated.less
+++ b/modules/styles/board/moderated.less
@@ -16,7 +16,7 @@
}
// hide posts of collapsed topics
-.board-page {
+.flow-board-page {
.flow-board {
.flow-element-collapsed {
.flow-post {
diff --git a/modules/styles/common.less b/modules/styles/common.less
index e1a5f75..425908c 100644
--- a/modules/styles/common.less
+++ b/modules/styles/common.less
@@ -37,14 +37,14 @@
padding-bottom: 24px;
}
-.board-page {
+.flow-board-page {
.flow-board-navigation,
.flow-board {
max-width: 700px;
}
}
-.topic-page {
+.flow-topic.page {
.flow-board {
max-width: 850px;
}
@@ -93,7 +93,7 @@
// This is to make sure there is enough space
// at the bottom to display the last post's menu.
-.bottom-spacer {
+.flow-bottom-spacer {
height: 50px;
}
@@ -115,7 +115,7 @@
}
@media all and (min-width: @medium) {
- .flow-component.board-page {
+ .flow-component.flow-board-page {
.flow-board-header {
padding-left: 10px;
float: right;
@@ -155,7 +155,7 @@
}
}
- .flow-component.board-page.full-height-side-rail {
+ .flow-component.flow-board-page.flow-full-height-side-rail {
overflow: hidden;
.flow-board-header {
// this is a hack to make sure the side rail always
@@ -165,7 +165,7 @@
}
}
- .flow-component.board-page.expanded {
+ .flow-component.flow-board-page.expanded {
padding-right: 30px;
.flow-board-header {
@@ -200,7 +200,7 @@
}
}
- .flow-component.topic-page {
+ .flow-component.flow-topic.page {
.flow-board {
float: left;
width: 66%;
--
To view, visit https://gerrit.wikimedia.org/r/248988
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f329665f3c2aad6eee9dba1dafd120536de677d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
