Andrew-WMDE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/343097 )
Change subject: Make edit merge screen responsive
......................................................................
Make edit merge screen responsive
Bug: T144610
Change-Id: Ie51417d1da2ba425a424d25378b6b40466a64e8c
---
M includes/TwoColConflictPage.php
M modules/ext.TwoColConflict.css
M modules/ext.TwoColConflict.init.js
3 files changed, 27 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict
refs/changes/97/343097/1
diff --git a/includes/TwoColConflictPage.php b/includes/TwoColConflictPage.php
index e26dd57..e870b5a 100644
--- a/includes/TwoColConflictPage.php
+++ b/includes/TwoColConflictPage.php
@@ -114,11 +114,13 @@
);
$out = '<div class="mw-twocolconflict-changes-col">';
+ $out .= '<div class="mw-twocolconflict-col-header">';
$out .= '<h3>' . $this->getContext()->msg(
'twoColConflict-changes-col-title' )->parse() .
'</h3>';
$out .= '<div class="mw-twocolconflict-col-desc">' .
$this->getContext()->msg(
'twoColConflict-changes-col-desc', $lastUser,
$lastChangeTime, $yourChangeTime
)->parse() . '</div>';
+ $out .= '</div>';
$out .= $this->buildFilterOptionsMenu();
@@ -277,10 +279,12 @@
$lastChangeTime, $this->context->getUser()
);
- $out = '<h3>' . $this->getContext()->msg(
'twoColConflict-editor-col-title' ) . '</h3>';
+ $out = '<div class="mw-twocolconflict-col-header">';
+ $out .= '<h3>' . $this->getContext()->msg(
'twoColConflict-editor-col-title' ) . '</h3>';
$out .= '<div class="mw-twocolconflict-col-desc">' .
$this->getContext()->msg(
'twoColConflict-editor-col-desc', $lastUser,
$lastChangeTime
) . '</div>';
+ $out .= '</div>';
return $out;
}
diff --git a/modules/ext.TwoColConflict.css b/modules/ext.TwoColConflict.css
index 4ba70ca..5cfe75d 100644
--- a/modules/ext.TwoColConflict.css
+++ b/modules/ext.TwoColConflict.css
@@ -1,8 +1,12 @@
+.mw-twocolconflict-form form {
+ display: flex;
+ flex-flow: row wrap;
+}
+
.mw-twocolconflict-changes-col,
.mw-twocolconflict-editor-col {
- box-sizing: border-box;
- width: 50%;
- float: left;
+ flex-grow: 1;
+ width: 300px;
}
.mw-twocolconflict-changes-col {
@@ -16,10 +20,6 @@
.mw-twocolconflict-col-desc {
font-size: 0.9em;
margin-bottom: 10px;
-}
-
-.mw-twocolconflict-editor-col.mw-twocolconflict-js .mw-twocolconflict-col-desc
{
- margin-bottom: 74px; /* diff-options height - editor-toolbar height */
}
.mw-twocolconflict-editor-col.mw-twocolconflict-js.mw-twocolconflict-wikieditor
.mw-twocolconflict-col-desc {
diff --git a/modules/ext.TwoColConflict.init.js
b/modules/ext.TwoColConflict.init.js
index 180ff03..a78cbf9 100644
--- a/modules/ext.TwoColConflict.init.js
+++ b/modules/ext.TwoColConflict.init.js
@@ -55,6 +55,19 @@
} );
}
+ function adjustHeaderMargins() {
+ var changesCol = $( '.mw-twocolconflict-changes-col' ),
+ editorCol = $( '.mw-twocolconflict-editor-col' ),
+ changesColHeader = $( '.mw-twocolconflict-changes-col
.mw-twocolconflict-col-header' ),
+ editorColHeader = $( '.mw-twocolconflict-editor-col
.mw-twocolconflict-col-header' ),
+ optionsContainer = $(
'.mw-twocolconflict-filter-options-container' );
+
+ editorColHeader.css( 'margin-bottom',
+ changesCol.position().left ===
editorCol.position().left ? '10px' :
+ optionsContainer.height() - ( editorColHeader.height()
- changesColHeader.height() ) + 'px'
+ );
+ }
+
$( function () {
$( '.mw-twocolconflict-changes-editor' ).keydown( function( e )
{
if ( e.ctrlKey && e.keyCode === 65 ) { // CTRL + A
@@ -68,8 +81,10 @@
$( window ).on( 'resize', function() {
autoScroll.setScrollBaseData();
+ adjustHeaderMargins();
} );
initHelpDialog();
+ adjustHeaderMargins();
} );
}( mediaWiki, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/343097
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie51417d1da2ba425a424d25378b6b40466a64e8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Andrew-WMDE <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
