wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-27 12:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes Ic189011e,I7617a35b

Browse source 
* changes:
  Make references dialog scroll
  Make fieldset layout icons optional
This commit is contained in:
jenkins-bot 2013-06-13 17:04:19 +00:00 committed by Gerrit Code Review
parent 628fd18930 caa16737d5
commit 03127491b2
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/ve/ui/layouts/ve.ui.FieldsetLayout.js
View file

@ -14,11 +14,11 @@
* *
* @constructor * @constructor
* @param {Object} [config] Config options * @param {Object} [config] Config options
* @cfg {string} [icon=''] Symbolic icon name * @cfg {string} [icon] Symbolic icon name
*/ */
ve.ui.FieldsetLayout = function VeUiFieldsetLayout( config ) { ve.ui.FieldsetLayout = function VeUiFieldsetLayout( config ) {
// Config initialization // Config initialization
config = ve.extendObject( { 'icon': 'window' }, config ); config = config || {};
// Parent constructor // Parent constructor
ve.ui.Layout.call( this, config ); ve.ui.Layout.call( this, config );
@ -27,8 +27,13 @@ ve.ui.FieldsetLayout = function VeUiFieldsetLayout( config ) {
ve.ui.LabeledElement.call( this, this.$$( '<legend>' ), config ); ve.ui.LabeledElement.call( this, this.$$( '<legend>' ), config );
// Initialization // Initialization
if ( config.icon ) {
this.$.addClass( 've-ui-fieldsetLayout-decorated' );
this.$label.addClass( 've-ui-icon-' + config.icon ); this.$label.addClass( 've-ui-icon-' + config.icon );
this.$.append( this.$label ).addClass( 've-ui-fieldsetLayout' ); }
this.$
.addClass( 've-ui-fieldsetLayout' )
.append( this.$label );
}; };
/* Inheritance */ /* Inheritance */

1
modules/ve/ui/styles/ve.ui.Dialog.css
View file

@ -133,6 +133,7 @@
.ve-ui-mwReferenceDialog-body { .ve-ui-mwReferenceDialog-body {
padding: 2em; padding: 2em;
overflow-y: auto;
} }
.ve-ui-mwReferenceDialog-toolbar { .ve-ui-mwReferenceDialog-toolbar {

5
modules/ve/ui/styles/ve.ui.Layout.css
View file

@ -31,8 +31,11 @@
.ve-ui-fieldsetLayout > legend.ve-ui-labeledElement-label { .ve-ui-fieldsetLayout > legend.ve-ui-labeledElement-label {
font-size: 1.5em; font-size: 1.5em;
padding-left: 1.75em;
margin-bottom: 1em; margin-bottom: 1em;
}
.ve-ui-fieldsetLayout-decorated > legend.ve-ui-labeledElement-label {
padding-left: 1.75em;
background-position: left center; background-position: left center;
background-repeat: no-repeat; background-repeat: no-repeat;
} }