mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor
synced 2024-11-24 22:35:41 +00:00
Merge "Improve welcome dialog support for large fonts"
This commit is contained in:
commit
feff1fbc24
|
@ -45,12 +45,11 @@ ve.ui.MWBetaWelcomeDialog.prototype.initialize = function () {
|
|||
ve.ui.MWDialog.prototype.initialize.call( this );
|
||||
|
||||
// Properties
|
||||
this.$content = this.$$( '<div>' )
|
||||
.addClass( 've-ui-mwBetaWelcomeDialog-content' )
|
||||
.text(
|
||||
ve.msg( 'visualeditor-dialog-beta-welcome-content', $( '#ca-edit' ).text() )
|
||||
);
|
||||
|
||||
this.contentLayout = new ve.ui.PanelLayout( {
|
||||
'$$': this.frame.$$,
|
||||
'scrollable': true,
|
||||
'padded': true
|
||||
} );
|
||||
this.continueButton = new ve.ui.ButtonWidget( {
|
||||
'$$': this.$$,
|
||||
'label': ve.msg( 'visualeditor-dialog-beta-welcome-action-continue' ),
|
||||
|
@ -61,7 +60,10 @@ ve.ui.MWBetaWelcomeDialog.prototype.initialize = function () {
|
|||
this.continueButton.connect( this, { 'click': [ 'close', 'close' ] } );
|
||||
|
||||
// Initialization
|
||||
this.$body.append( this.$content );
|
||||
this.contentLayout.$
|
||||
.addClass( 've-ui-mwBetaWelcomeDialog-content' )
|
||||
.text( ve.msg( 'visualeditor-dialog-beta-welcome-content', $( '#ca-edit' ).text() ) );
|
||||
this.$body.append( this.contentLayout.$ );
|
||||
this.$foot.append( this.continueButton.$ );
|
||||
};
|
||||
|
||||
|
|
|
@ -75,7 +75,6 @@
|
|||
/* ve.ui.MWBetaWelcomeDialog */
|
||||
|
||||
.ve-ui-mwBetaWelcomeDialog-content {
|
||||
padding: 1.5em;
|
||||
line-height: 1.5em;
|
||||
font-size: 1.1em;
|
||||
}
|
||||
|
|
|
@ -53,9 +53,8 @@
|
|||
}
|
||||
|
||||
.ve-ui-dialog .ve-ui-window-frame.ve-ui-window-frame-small {
|
||||
width: 600px;
|
||||
min-height: 200px;
|
||||
height: 280px;
|
||||
max-width: 600px;
|
||||
max-height: 300px;
|
||||
}
|
||||
|
||||
.ve-ui-dialog-closing .ve-ui-window-frame {
|
||||
|
|
Loading…
Reference in a new issue