wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-28 01:30:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Docking overley to notifications link rather than side of window"

Browse source
This commit is contained in:
Bsitu 2013-01-11 19:35:41 +00:00 committed by Gerrit Code Review
parent bdb43f0a71 17cbe366c1
commit 571edaafc5
3 changed files with 40 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
modules/overlay/PokeyNorth.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 207 B

50
modules/overlay/ext.echo.overlay.css
View file

@ -1,7 +1,7 @@
.mw-echo-overlay {
position: absolute;
top: 2.6em;
right: 0;
left: -200px;
border: 1px solid silver;
background-color: #fff;
width: 450px;
@ -11,15 +11,38 @@
z-index: 60;
box-shadow: 0px 3px 8px rgba(50, 50, 50, 0.35);
}
.mw-echo-overlay-pokey {
/* @embed */
background-image: url('PokeyNorth.png');
background-repeat: no-repeat;
width: 21px;
height: 11px;
position: absolute;
z-index: 61;
top: 21px;
left: -9px;
}
.mw-echo-overlay ul {
#p-personal .mw-echo-overlay ul {
margin: 0;
padding: 0;
overflow: auto;
}
.mw-echo-overlay li {
/* border-bottom: 1px solid #A7D7F9;*/
#p-personal .mw-echo-overlay li.mw-echo-notification {
display: block;
float: none;
border-bottom: 1px solid #DDDDDD;
padding: 15px 15px 10px 15px;
margin: 0;
white-space: normal;
font-size: 13px;
line-height: 16px;
filter: alpha(opacity=50);
opacity: 0.5;
}
#p-personal .mw-echo-overlay li.mw-echo-notification:last-child {
border-bottom: none;
}
.mw-echo-overlay-title {
@ -41,7 +64,7 @@
padding: 15px 0px 15px 30px;
width: 150px;
min-height: 14px;
font-size: 0.8em;
font-size: 13px;
/* @embed */
background-image: url(../icons/NotificationsPage.png);
background-repeat: no-repeat;
@ -52,7 +75,7 @@
float: left;
width: 150px;
min-height: 14px;
font-size: 0.8em;
font-size: 13px;
padding: 15px 0 15px 30px;
border-left: 1px solid #DDDDDD;
/* @embed */
@ -61,21 +84,14 @@
background-position: 12px 15px;
}
#pt-notifications {
position: relative;
}
#pt-notifications .mw-badge {
margin-left: 3px;
}
.mw-echo-overlay .mw-echo-notification {
border-bottom: 1px solid #DDDDDD;
padding: 15px 15px 10px 15px;
filter: alpha(opacity=50);
opacity: 0.5;
}
.mw-echo-overlay .mw-echo-notification:last-child {
border-bottom: none;
}
.mw-echo-overlay .mw-echo-unread {
filter: alpha(opacity=100);
opacity: 1.0;

11
modules/overlay/ext.echo.overlay.js
View file

@ -174,7 +174,7 @@
function( $overlay ) {
$overlay
.hide()
.appendTo( $( 'body' ) );
.appendTo( $( '#pt-notifications' ) );
// Figure out which footer link is first and pad it appropriately
// (Sometimes the 'All notifications' link doesn't exist)
if ( $( '#mw-echo-overlay-link' ).length ) {
@ -184,13 +184,16 @@
$( '#mw-echo-overlay-pref-link' )
.addClass( 'mw-echo-overlay-first-footer-link' );
}
$overlay.slideDown( 'fast' );
// Create the pokey (aka chevron)
$( '.mw-echo-overlay' ).before( $( '<div/>' ).addClass( 'mw-echo-overlay-pokey' ) );
// Show the notifications overlay
$overlay.show();
} );
} );
$( 'body' ).click( function( e ) {
if ( ! $( e.target ).is( '.mw-echo-overlay,.mw-echo-overlay *' ) ) {
$( '.mw-echo-overlay' ).fadeOut( 'fast',
if ( ! $( e.target ).is( '.mw-echo-overlay, .mw-echo-overlay *, .mw-echo-overlay-pokey' ) ) {
$( '.mw-echo-overlay, .mw-echo-overlay-pokey' ).fadeOut( 'fast',
function() { $( this ).remove(); }
);
}