jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/399536 )
Change subject: Move the popups to the overlay
......................................................................
Move the popups to the overlay
This will solve multiple issues with the design having to overcome
the theme-based design for the #p-tools.
Bug: T156080
Change-Id: Ibfcdfeea649e566059fd88485e146fbad2201016
---
M modules/styles/mw.echo.ui.NotificationBadgeWidget.less
M modules/styles/mw.echo.ui.NotificationBadgeWidget.monobook.less
M modules/styles/mw.echo.ui.overlay.monobook.less
M modules/ui/mw.echo.ui.NotificationBadgeWidget.js
4 files changed, 16 insertions(+), 15 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/styles/mw.echo.ui.NotificationBadgeWidget.less
b/modules/styles/mw.echo.ui.NotificationBadgeWidget.less
index 73092a7..6e638e7 100644
--- a/modules/styles/mw.echo.ui.NotificationBadgeWidget.less
+++ b/modules/styles/mw.echo.ui.NotificationBadgeWidget.less
@@ -4,12 +4,7 @@
.mw-echo-ui-notificationBadgeButtonPopupWidget {
position: relative;
- > .oo-ui-popupWidget {
- // #p-personal li has a font-size of 0.75em, but we want the
- // font size here to be exactly 0.875em, so we must override
- // the parent em sizing by dividing.
- font-size: 0.875em / 0.75em;
-
+ &-popup {
> .oo-ui-popupWidget-popup {
> .oo-ui-popupWidget-head {
height: 3.5em;
diff --git a/modules/styles/mw.echo.ui.NotificationBadgeWidget.monobook.less
b/modules/styles/mw.echo.ui.NotificationBadgeWidget.monobook.less
index 9f40892..3320c95 100644
--- a/modules/styles/mw.echo.ui.NotificationBadgeWidget.monobook.less
+++ b/modules/styles/mw.echo.ui.NotificationBadgeWidget.monobook.less
@@ -4,9 +4,15 @@
text-transform: none;
font-weight: normal;
- &,
- .oo-ui-popupWidget a.oo-ui-buttonElement-button {
- color: #333;
+ &-popup {
+ // #p-personal li has a font-size of 0.75em, but we want the
+ // font size here to be exactly 0.875em, so we must override
+ // the parent em sizing by dividing.
+ font-size: 0.875em / 0.75em;
+
+ a.oo-ui-buttonElement-button {
+ color: #333;
+ }
}
a {
diff --git a/modules/styles/mw.echo.ui.overlay.monobook.less
b/modules/styles/mw.echo.ui.overlay.monobook.less
index da3e7d3..280a225 100644
--- a/modules/styles/mw.echo.ui.overlay.monobook.less
+++ b/modules/styles/mw.echo.ui.overlay.monobook.less
@@ -2,7 +2,6 @@
// We need the overlay to be adjusted for:
// #globalWrapper 127%
// .pBody 95%
- // .portlet ul 95%
// .mw-echo-ui-notificationBadgeButtonPopupWidget > .oo-ui-popupWidget
0.875/0.75em
- font-size: 1.27 * 0.95 * 0.95 * 0.875 / 0.75 em;
+ font-size: 1.27 * 0.95 * 0.875 / 0.75em;
}
diff --git a/modules/ui/mw.echo.ui.NotificationBadgeWidget.js
b/modules/ui/mw.echo.ui.NotificationBadgeWidget.js
index 1bf9981..77ae15e 100644
--- a/modules/ui/mw.echo.ui.NotificationBadgeWidget.js
+++ b/modules/ui/mw.echo.ui.NotificationBadgeWidget.js
@@ -132,6 +132,7 @@
width: config.popupWidth || 500,
autoClose: true,
containerPadding: 20,
+ $floatableContainer: this.$element,
// Also ignore clicks from the nested action menu
items, that
// actually exist in the overlay
$autoCloseIgnore: this.$element.add( this.$menuOverlay
),
@@ -145,6 +146,9 @@
),
classes: [
'mw-echo-ui-notificationBadgeButtonPopupWidget-popup' ]
} );
+ // Append the popup to the overlay
+ this.$overlay.append( this.popup.$element );
+
// HACK: Add an icon to the popup head label
this.popupHeadIcon = new OO.ui.IconWidget( { icon:
config.badgeIcon } );
this.popup.$head.prepend( this.popupHeadIcon.$element );
@@ -186,10 +190,7 @@
'mw-echo-ui-notificationBadgeButtonPopupWidget
' +
'mw-echo-ui-notificationBadgeButtonPopupWidget-' + adjustedTypeString
)
- .append(
- this.badgeButton.$element,
- this.popup.$element
- );
+ .append( this.badgeButton.$element );
};
/* Initialization */
--
To view, visit https://gerrit.wikimedia.org/r/399536
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibfcdfeea649e566059fd88485e146fbad2201016
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
