wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-15 02:23:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove media item styling moved to MW-core in I400336c12d.

Browse source 
Change-Id: I348e55ddea94f3b67f647c66ba53f7384d683584
This commit is contained in:
Moriel Schottlender 2014-02-25 18:55:33 -05:00 committed by James D. Forrester
parent a8501778dd
commit 963e133851
4 changed files with 4 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
View file

@ -31,10 +31,10 @@ ve.ce.MWBlockImageNode = function VeCeMWBlockImageNode( model, config ) {
// DOM Hierarchy for BlockImageNode:
// <div> this.$element
// <figure> this.$figure (ve-ce-mwBlockImageNode-type (thumb) (tright/tleft/etc))
// <figure> this.$figure (ve-ce-mwBlockImageNode-{type})
// <a> this.$a
// <img> this.$image (thumbimage)
// <figcaption> this.caption.view.$element (thumbcaption)
// <img> this.$image
// <figcaption> this.caption.view.$element
// Build DOM:
this.$a = this.$( '<a>' )
@ -206,15 +206,7 @@ ve.ce.MWBlockImageNode.prototype.updateSize = function ( dimensions ) {
}
this.$image.css( dimensions );
this.$figure.css( {
// If we have a border then the width is increased by 2
'width': dimensions.width + ( this.captionVisible ? 2 : 0 ),
'height': this.captionVisible ? 'auto' : dimensions.height
} );
this.$figure.toggleClass( 'mw-default-size', !!this.model.getAttribute( 'defaultSize' ) );
};
/**

3
modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js
View file

@ -19,9 +19,6 @@
ve.ce.MWImageCaptionNode = function VeCeMWImageCaptionNode( model, config ) {
// Parent constructor
ve.ce.BranchNode.call( this, model, config );
// DOM changes
this.$element.addClass( 'thumbcaption' );
};
/* Inheritance */

47
modules/ve-mw/ce/styles/nodes/ve.ce.MWBlockImageNode.css
View file

@ -6,52 +6,7 @@
*/
/*csslint regex-selectors:false, overqualified-elements:false */
figure[typeof*='mw:Image'] {
margin: 0;
}
figure[typeof*='mw:Image'] a {
border: 0;
}
/* TODO: Merge with div.tright styles */
/* Due to a weird cssjanus bug, noflip rules
are set as single-rules rather than for the
whole class */
figure[typeof*='mw:Image'].mw-halign-right {
/* @noflip */
clear: right;
/* @noflip */
float: right;
}
figure[typeof*='mw:Image'].mw-halign-center {
margin-left: auto;
margin-right: auto;
}
/* TODO: Merge with div.tleft styles */
/* Due to a weird cssjanus bug, noflip rules
are set as single-rules rather than for the
whole class */
figure[typeof*='mw:Image'].mw-halign-left {
/* @noflip */
clear: left;
/* @noflip */
float: left;
}
figure:not([typeof='mw:Image/Thumb']) figcaption .magnify {
display:none;
}
/* TODO: Merge with div.thumbinner styles */
figure[typeof='mw:Image/Thumb'], figure[typeof='mw:Image/Frame'] {
overflow: hidden;
text-align: center;
}
/* Hide outer shield for centered images */
figure[typeof*='mw:Image'].mw-halign-center + .ve-ce-protectedNode-shield {
figure[typeof~='mw:Image'].mw-halign-center + .ve-ce-protectedNode-shield {
display: none;
}

45
modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-shared.css
View file

@ -6,48 +6,3 @@
* @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
*/
/* ve.ce.MWBlockImageNode */
figure[typeof*='mw:Image'] {
margin: 0;
}
figure[typeof*='mw:Image'] a {
border: 0;
}
/* TODO: Merge with div.tright styles */
/* Due to a weird cssjanus bug, noflip rules
are set as single-rules rather than for the
whole class */
figure[typeof*='mw:Image'].mw-halign-right {
/* @noflip */
margin: .5em 0 1.3em 1.4em;
}
/* TODO: Merge with div.tleft styles */
/* Due to a weird cssjanus bug, noflip rules
are set as single-rules rather than for the
whole class */
figure[typeof*='mw:Image'].mw-halign-left {
/* @noflip */
margin: .5em 1.4em 1.3em 0;
}
/* TODO: Merge with div.thumbinner styles */
figure[typeof='mw:Image/Thumb'], figure[typeof='mw:Image/Frame'] {
background-color: #f9f9f9;
border: 1px solid #cccccc;
padding: 3px !important;
font-size: 94%;
}
/* TODO: Merge with .thumbimage styles */
figure[typeof*='mw:Image'] .ve-ce-mwBlockImageNode-thumbimage {
border: 1px solid #cccccc;
}
figure[typeof*='mw:Image'].mw-image-border img {
border: 1px solid #cccccc;
}