wikimedia/mediawiki-extensions-DiscussionTools
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/DiscussionTools synced 2024-11-15 03:44:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix interaction of "Add topic"/"Read as wiki page" buttons with categories"

Browse source
This commit is contained in:
jenkins-bot 2023-02-02 12:09:48 +00:00 committed by Gerrit Code Review
parent 1b3356ad33 52de4b0b1b
commit 2d7fd5cabc
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/dt.init.less
View file

@ -872,6 +872,11 @@ h1, h2, h3, h4, h5, h6 {
} }
} }
// Tweak to prevent our footer buttons from overlapping Minerva skin elements (T328452).
.ext-discussiontools-init-button-notFlush {
margin-bottom: 32px;
}
.ext-discussiontools-init-lede-button-container { .ext-discussiontools-init-lede-button-container {
margin: 0.5em 0; margin: 0.5em 0;

17
modules/mobile.js
View file

@ -142,13 +142,26 @@ function init( $container ) {
$( document.body ).removeClass( 'ext-discussiontools-visualenhancements-enabled ext-discussiontools-replytool-enabled' ); $( document.body ).removeClass( 'ext-discussiontools-visualenhancements-enabled ext-discussiontools-replytool-enabled' );
} ); } );
} }
/* eslint-disable no-jquery/no-global-selector */
if ( newTopicButton ) { if ( newTopicButton ) {
// eslint-disable-next-line no-jquery/no-global-selector
$( '.ext-discussiontools-init-new-topic' ).after( $readAsWikiPage ); $( '.ext-discussiontools-init-new-topic' ).after( $readAsWikiPage );
} else { } else {
// eslint-disable-next-line no-jquery/no-global-selector
$( '#mw-content-text' ).append( $readAsWikiPage ); $( '#mw-content-text' ).append( $readAsWikiPage );
} }
// Tweak to prevent our footer buttons from overlapping Minerva skin elements (T328452).
// TODO: It would be more elegant to do this in just CSS somehow.
// BEWARE: I have wasted 4 hours here trying to make that happen. The elements are not nested in a
// helpful way, and moving them around tends to break the stickiness of the "Add topic" button.
if (
$( '.catlinks[data-mw="interface"]' ).length ||
$( '#page-secondary-actions > *' ).length ||
$( '.return-link' ).length
) {
$readAsWikiPage.addClass( 'ext-discussiontools-init-button-notFlush' );
}
/* eslint-enable no-jquery/no-global-selector */
} }
module.exports = { module.exports = {