jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/361058 )
Change subject: Fix button formatting
......................................................................
Fix button formatting
Bug: T161615
Change-Id: I90482bc5fa163b117c9aeedbe2e6701960074ddb
---
M modules/ext.FileImporter.Special.css
M src/Html/ImportPreviewPage.php
2 files changed, 43 insertions(+), 13 deletions(-)
Approvals:
WMDE-Fisch: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.FileImporter.Special.css
b/modules/ext.FileImporter.Special.css
index b645ea0..6100f93 100644
--- a/modules/ext.FileImporter.Special.css
+++ b/modules/ext.FileImporter.Special.css
@@ -22,11 +22,27 @@
padding: 1em 1em 1.5em 1em;
}
-.mw-importfile-rightAlign {
- float: right;
+.mw-importfile-header {
+ margin: 1em 0 0.25em 0;
+ padding-bottom: 0.2em;
+ border-bottom: 1px solid #a2a9b1;
+ overflow: auto;
+ position: relative;
}
-.mw-importfile-edit-button span.oo-ui-labelElement-label {
- font-family: sans-serif;
- font-size: 0.875em;
-}
\ No newline at end of file
+.mw-importfile-header-title {
+ display: inline-block;
+ position: absolute;
+ border: none;
+ bottom: 0;
+}
+
+#mw-importfile-header-title {
+ margin: 0;
+}
+
+.mw-importfile-rightAlign {
+ position: relative;
+ bottom: 0;
+ float: right;
+}
diff --git a/src/Html/ImportPreviewPage.php b/src/Html/ImportPreviewPage.php
index 1942420..d5b36d3 100644
--- a/src/Html/ImportPreviewPage.php
+++ b/src/Html/ImportPreviewPage.php
@@ -65,9 +65,16 @@
( new Message( 'fileimporter-previewnote' ) )->parse()
) .
Html::rawElement(
- 'h2',
- [],
- $this->title->getPrefixedText() .
+ 'div',
+ [ 'class' => 'mw-importfile-header' ],
+ Html::element(
+ 'h2',
+ [
+ 'class' => 'mw-importfile-header-title',
+ 'id' => 'mw-importfile-header-title'
+ ],
+ $this->title->getPrefixedText()
+ ) .
Html::openElement(
'form',
[
@@ -100,9 +107,16 @@
$this->title->getPrefixedText()
) .
Html::rawElement(
- 'h2',
- [],
- ( new Message( 'fileimporter-heading-fileinfo' )
)->plain() .
+ 'div',
+ [ 'class' => 'mw-importfile-header' ],
+ Html::element(
+ 'h2',
+ [
+ 'class' => 'mw-importfile-header-title',
+ 'id' => 'mw-importfile-header-title'
+ ],
+ ( new Message( 'fileimporter-heading-fileinfo'
) )->plain()
+ ).
Html::openElement(
'form',
[
@@ -129,7 +143,7 @@
]
) .
Html::closeElement( 'form' )
- ) .
+ ).
Html::rawElement(
'div',
[ 'class' => 'mw-importfile-parsedContent' ],
--
To view, visit https://gerrit.wikimedia.org/r/361058
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I90482bc5fa163b117c9aeedbe2e6701960074ddb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/FileImporter
Gerrit-Branch: master
Gerrit-Owner: Andrew-WMDE <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: WMDE-Fisch <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
