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

Merge "Add arrow-up as indicator for the pinned menu"

Browse source
This commit is contained in:
jenkins-bot 2019-07-11 22:56:59 +00:00 committed by Gerrit Code Review
parent bc3c7cb634 d2e683f230
commit 145379966b
4 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
modules/images/toolbar/arrow-up.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 145 B

1
modules/images/toolbar/arrow-up.svg Normal file
View file

@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M13 11l-5-5-5 5z" fill="#797979"/></svg>
Side by side

After

Width:  |  Height:  |  Size: 151 B

4
modules/jquery.wikiEditor.toolbar.js
View file

@ -378,7 +378,7 @@
$( this ).data( 'context' ), $( this ).data( 'action' ), $( this )
);
// Hide the dropdown
$( this ).parent().removeClass( 'options-shown' );
$( this ).closest( '.tool-select' ).removeClass( 'options-shown' );
e.preventDefault();
return false;
} )
@ -399,7 +399,7 @@
return false;
} )
.on( 'click', function ( e ) {
$( this ).data( 'options' ).toggleClass( 'options-shown' );
$( this ).data( 'options' ).closest( '.tool-select' ).toggleClass( 'options-shown' );
e.preventDefault();
return false;
} )

18
modules/jquery.wikiEditor.toolbar.less
View file

@ -135,7 +135,10 @@
color: #222;
}
.menu {
&.options-shown .label {
.background-image-svg( 'images/toolbar/arrow-up.svg', 'images/toolbar/arrow-up.png' );
}
.options {
position: absolute;
display: none;
@ -143,15 +146,7 @@
margin-top: 22px;
border: 1px solid #c8ccd1;
background-color: #fff;
}
}
&:hover .options,
.menu .options-shown {
display: block;
}
.options {
.option {
display: block;
padding: 0.5em;
@ -184,6 +179,11 @@
}
}
}
&:hover .options,
&.options-shown .options {
display: block;
}
}
&:last-of-type {