Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/342763 )
Change subject: [BREAKING CHANGE] MessageDialog: Drop the deprecated 'verbose'
flag
......................................................................
[BREAKING CHANGE] MessageDialog: Drop the deprecated 'verbose' flag
This was deprecated in v0.18.4.
Change-Id: Ie48bfde92f1d02e08dc8eb75e17821d1479c70a0
---
M demos/pages/dialogs.js
M src/dialogs/MessageDialog.js
M src/themes/apex/windows.less
M src/themes/mediawiki/common.less
M src/themes/mediawiki/layouts.less
M src/themes/mediawiki/windows.less
6 files changed, 10 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/63/342763/1
diff --git a/demos/pages/dialogs.js b/demos/pages/dialogs.js
index 979c28a..ad1cc53 100644
--- a/demos/pages/dialogs.js
+++ b/demos/pages/dialogs.js
@@ -127,12 +127,11 @@
}
},
{
- name: 'Message dialog (verbose)',
+ name: 'Message dialog (lengthy)',
dialogClass: OO.ui.MessageDialog,
data: {
title: 'Continue?',
- message: 'Lorem ipsum dolor sit
amet, consectetur adipiscing elit. Pellentesque quis laoreet elit. Nam eu velit
ullamcorper, volutpat elit sed, viverra massa. Aenean congue aliquam lorem, et
laoreet risus condimentum vel. Praesent nec imperdiet mauris. Nunc eros magna,
iaculis sit amet ante id, dapibus tristique lorem. Praesent in feugiat lorem,
sit amet porttitor eros. Donec sapien turpis, pretium eget ligula id,
scelerisque tincidunt diam. Pellentesque a venenatis tortor, at luctus nisl.
Quisque vel urna a enim mattis rutrum. Morbi eget consequat nisl. Nam tristique
molestie diam ac consequat. Nam varius adipiscing mattis. Praesent sodales
volutpat nulla lobortis iaculis. Quisque vel odio eget diam posuere imperdiet.
Fusce et iaculis odio. Donec in nibh ut dui accumsan vehicula quis et massa.',
- verbose: true
+ message: 'Lorem ipsum dolor sit
amet, consectetur adipiscing elit. Pellentesque quis laoreet elit. Nam eu velit
ullamcorper, volutpat elit sed, viverra massa. Aenean congue aliquam lorem, et
laoreet risus condimentum vel. Praesent nec imperdiet mauris. Nunc eros magna,
iaculis sit amet ante id, dapibus tristique lorem. Praesent in feugiat lorem,
sit amet porttitor eros. Donec sapien turpis, pretium eget ligula id,
scelerisque tincidunt diam. Pellentesque a venenatis tortor, at luctus nisl.
Quisque vel urna a enim mattis rutrum. Morbi eget consequat nisl. Nam tristique
molestie diam ac consequat. Nam varius adipiscing mattis. Praesent sodales
volutpat nulla lobortis iaculis. Quisque vel odio eget diam posuere imperdiet.
Fusce et iaculis odio. Donec in nibh ut dui accumsan vehicula quis et massa.'
}
},
{
diff --git a/src/dialogs/MessageDialog.js b/src/dialogs/MessageDialog.js
index 110d10b..19078a8 100644
--- a/src/dialogs/MessageDialog.js
+++ b/src/dialogs/MessageDialog.js
@@ -69,12 +69,6 @@
OO.ui.MessageDialog.static.size = 'small';
/**
- * @static
- * @deprecated since v0.18.4 as default; TODO: Remove
- */
-OO.ui.MessageDialog.static.verbose = true;
-
-/**
* Dialog title.
*
* The title of a confirmation dialog describes what a progressive action will
do. The
@@ -190,11 +184,6 @@
);
this.message.setLabel(
data.message !== undefined ? data.message :
this.constructor.static.message
- );
- // @deprecated since v0.18.4 as default; TODO: Remove
and make default instead.
- this.message.$element.toggleClass(
- 'oo-ui-messageDialog-message-verbose',
- data.verbose !== undefined ? data.verbose :
this.constructor.static.verbose
);
}, this );
};
diff --git a/src/themes/apex/windows.less b/src/themes/apex/windows.less
index 80778c7..533bbab 100644
--- a/src/themes/apex/windows.less
+++ b/src/themes/apex/windows.less
@@ -35,15 +35,10 @@
}
&-message {
- font-size: 0.9em;
- line-height: 1.25em;
+ font-size: 1.1em;
+ line-height: 1.5em;
color: #666;
-
- &-verbose {
- font-size: 1.1em;
- line-height: 1.5em;
- text-align: left;
- }
+ text-align: left;
}
&-actions {
diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index d653379..e12a96f 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -127,7 +127,7 @@
@box-shadow-disabled-filled: inset 0 0 0 1px @color-disabled-filled;
@line-height-default: 1.6; // same as Vector
-@line-height-message-verbose: 1.4;
+@line-height-message: 1.4;
@line-height-form-element: 1.4;
@line-height-input-binary-label: 1.5; // Checkboxes, Radios and
ToggleSwitchWidget labels need a tad more for increased vertical click area
diff --git a/src/themes/mediawiki/layouts.less
b/src/themes/mediawiki/layouts.less
index bab2160..770e29d 100644
--- a/src/themes/mediawiki/layouts.less
+++ b/src/themes/mediawiki/layouts.less
@@ -124,7 +124,7 @@
.oo-ui-labelWidget {
display: table-cell;
padding: 0.1em 0 0.1em 0.3125em;
- line-height: @line-height-message-verbose;
+ line-height: @line-height-message;
vertical-align: middle;
}
}
diff --git a/src/themes/mediawiki/windows.less
b/src/themes/mediawiki/windows.less
index 85ab7c5..e47ddb3 100644
--- a/src/themes/mediawiki/windows.less
+++ b/src/themes/mediawiki/windows.less
@@ -29,15 +29,10 @@
}
&-message {
- font-size: 0.9em;
- line-height: 1.25;
+ font-size: 1.1em;
+ line-height: @line-height-message;
color: @color-default;
-
- &-verbose {
- font-size: 1.1em;
- line-height: @line-height-message-verbose;
- text-align: left;
- }
+ text-align: left;
}
&-actions {
--
To view, visit https://gerrit.wikimedia.org/r/342763
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie48bfde92f1d02e08dc8eb75e17821d1479c70a0
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
