jenkins-bot has submitted this change and it was merged.
Change subject: Move 'x' button, shift arrows away from screen edges
......................................................................
Move 'x' button, shift arrows away from screen edges
Bug: 58653
Change-Id: I290bca497a56240890d64b234e960d04bd4a001c
---
M resources/ext.multimediaViewer/ext.multimediaViewer.css
M resources/ext.multimediaViewer/ext.multimediaViewer.js
M resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js
3 files changed, 5 insertions(+), 21 deletions(-)
Approvals:
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.multimediaViewer/ext.multimediaViewer.css
b/resources/ext.multimediaViewer/ext.multimediaViewer.css
index 3d2b1ac..a3fc8a4 100644
--- a/resources/ext.multimediaViewer/ext.multimediaViewer.css
+++ b/resources/ext.multimediaViewer/ext.multimediaViewer.css
@@ -20,12 +20,6 @@
background-color: #e4e2e1;
}
-.mw-mlb-controls-position {
- position: absolute;
- top: -999px;
- left: -999px;
-}
-
.mw-mlb-controls-wrapper {
width: 100%;
height: 100%;
@@ -35,7 +29,8 @@
.mw-mlb-controls {
border: none;
position: absolute;
- top: 0px;
+ top: 5px;
+ right: 5px;
z-index: 1003;
}
@@ -281,13 +276,13 @@
.mw-mlb-next-image {
/* @embed */
background-image: url(img/next-ltr.svg);
- right: 0;
+ right: 5px;
}
.mw-mlb-prev-image {
/* @embed */
background-image: url(img/prev-ltr.svg);
- left: 0;
+ left: 5px;
}
.mw-mlb-next-image.disabled,
diff --git a/resources/ext.multimediaViewer/ext.multimediaViewer.js
b/resources/ext.multimediaViewer/ext.multimediaViewer.js
index 1cd4b11..967852b 100755
--- a/resources/ext.multimediaViewer/ext.multimediaViewer.js
+++ b/resources/ext.multimediaViewer/ext.multimediaViewer.js
@@ -145,7 +145,6 @@
// Register various event hooks. TODO: Make this a function
that's only called once.
lightboxHooks.register( 'closeInterface', function () {
- this.$mwControls.css( { top: '-999px', left: '-999px' }
);
this.$nextButton.add( this.$prevButton ).css( 'top',
'-999px' );
$( document.body ).removeClass( 'mw-mlb-lightbox-open'
);
if ( comingFromPopstate === false ) {
@@ -295,7 +294,6 @@
var isOnButton = false,
isOnImage = false,
ui = this.ui,
- pos = ui.$image.offset(),
prevNextTop = ( ( ui.$imageWrapper.height() / 2 ) - 32
) + 'px';
function fadeIn() {
@@ -331,22 +329,14 @@
}, 500 );
}
- pos.top = ( ui.$imageWrapper.height() - ui.$image.height() ) /
2;
- pos.left += ui.$image.width() - ui.$closeButton.width();
-
- pos.top += 'px';
- pos.left += 'px';
-
ui.$mwControls
- .css( pos )
- .appendTo( ui.$main )
.fadeIn( 100 )
.delay( 500 )
.fadeOut( 100 );
ui.$postDiv.css( 'top', ui.$imageWrapper.height() );
- ui.$image
+ ui.$imageDiv
.off( 'mouseenter', fadeIn )
.off( 'mouseleave', fadeOutDelayed )
.one( 'click', fadeIn )
diff --git
a/resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js
b/resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js
index 2d7daf7..b03c73f 100644
--- a/resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js
+++ b/resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js
@@ -118,7 +118,6 @@
LIP.initializeHeader = function () {
var ui = this;
- this.$closeButton.detach();
this.$fullscreenButton.detach();
this.$dragBar = $( '<div>' )
--
To view, visit https://gerrit.wikimedia.org/r/104131
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I290bca497a56240890d64b234e960d04bd4a001c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur <[email protected]>
Gerrit-Reviewer: Gergő Tisza <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
