mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor
synced 2024-09-25 11:16:51 +00:00
Merge "ve.init.mw.DesktopArticleTarget.init: Update for Minerva changes again"
This commit is contained in:
commit
24c577be7c
|
@ -11,19 +11,13 @@
|
||||||
.ve-edit-visual .mw-ui-icon {
|
.ve-edit-visual .mw-ui-icon {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
opacity: 0.65;
|
opacity: 0.65;
|
||||||
transform: scale( 0.6 );
|
/* Center within the parent element (pencil icon) */
|
||||||
right: 0;
|
left: 50%;
|
||||||
bottom: 0;
|
top: 50%;
|
||||||
transform-origin: bottom right;
|
margin-left: -12px;
|
||||||
}
|
margin-top: -12px;
|
||||||
|
/* Position relative to the center, easier this way because dimensions differ */
|
||||||
.ve-edit-source .mw-ui-icon:before,
|
transform: scale( 0.6 ) translate( 12px, 12px );
|
||||||
.ve-edit-source.mw-ui-icon:before,
|
|
||||||
.ve-edit-visual .mw-ui-icon:before,
|
|
||||||
.ve-edit-visual.mw-ui-icon:before {
|
|
||||||
/* Override weird styles from MW-UI */
|
|
||||||
margin-right: 0;
|
|
||||||
background-size: contain;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.mw-editsection-divider {
|
.mw-editsection-divider {
|
||||||
|
@ -34,8 +28,3 @@
|
||||||
.mw-editsection .ve-edit-visual {
|
.mw-editsection .ve-edit-visual {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
|
|
||||||
#page-actions .ve-edit-source,
|
|
||||||
#page-actions .ve-edit-visual {
|
|
||||||
padding-right: 0.5em;
|
|
||||||
}
|
|
||||||
|
|
|
@ -614,7 +614,7 @@
|
||||||
action = pageExists ? 'edit' : 'create',
|
action = pageExists ? 'edit' : 'create',
|
||||||
isMinerva = mw.config.get( 'skin' ) === 'minerva',
|
isMinerva = mw.config.get( 'skin' ) === 'minerva',
|
||||||
// HACK: Minerva doesn't have a normal tabs container, this only kind of works
|
// HACK: Minerva doesn't have a normal tabs container, this only kind of works
|
||||||
pTabsId = isMinerva ? 'mw-mf-page-center' :
|
pTabsId = isMinerva ? 'content' :
|
||||||
$( '#p-views' ).length ? 'p-views' : 'p-cactions',
|
$( '#p-views' ).length ? 'p-views' : 'p-cactions',
|
||||||
// Minerva puts the '#ca-...' ids on <a> nodes
|
// Minerva puts the '#ca-...' ids on <a> nodes
|
||||||
$caSource = $( 'li#ca-viewsource' ),
|
$caSource = $( 'li#ca-viewsource' ),
|
||||||
|
@ -652,7 +652,7 @@
|
||||||
|
|
||||||
$caVeEdit = $( caVeEdit );
|
$caVeEdit = $( caVeEdit );
|
||||||
$caVeEditLink = $caVeEdit.find( 'a' );
|
$caVeEditLink = $caVeEdit.find( 'a' );
|
||||||
// HACK: Copy the 'class' attribute, otherwise the link is invisible on Minerva
|
// HACK: Copy the 'class' attribute, otherwise the link has no icon on Minerva
|
||||||
if ( isMinerva ) {
|
if ( isMinerva ) {
|
||||||
$caVeEdit.attr( 'class', $caEdit.attr( 'class' ) );
|
$caVeEdit.attr( 'class', $caEdit.attr( 'class' ) );
|
||||||
$caVeEditLink.attr( 'class', $caEditLink.attr( 'class' ) );
|
$caVeEditLink.attr( 'class', $caEditLink.attr( 'class' ) );
|
||||||
|
|
Loading…
Reference in a new issue