jenkins-bot has submitted this change and it was merged.
Change subject: EducationPopup: Tidy up DOM and CSS
......................................................................
EducationPopup: Tidy up DOM and CSS
Change-Id: I4effa34a4d3ddfca0f6ee61fe169a726dc0ec3f6
---
M modules/ve-mw/ui/styles/tools/ve.ui.MWEducationPopupTool.css
M modules/ve-mw/ui/styles/tools/ve.ui.MWLinkInspectorTool.css
M modules/ve-mw/ui/tools/ve.ui.MWEducationPopupTool.js
3 files changed, 23 insertions(+), 22 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ui/styles/tools/ve.ui.MWEducationPopupTool.css
b/modules/ve-mw/ui/styles/tools/ve.ui.MWEducationPopupTool.css
index 81b5a3a..7ecd5eb 100644
--- a/modules/ve-mw/ui/styles/tools/ve.ui.MWEducationPopupTool.css
+++ b/modules/ve-mw/ui/styles/tools/ve.ui.MWEducationPopupTool.css
@@ -5,13 +5,12 @@
* @license The MIT License (MIT); see LICENSE.txt
*/
-.ve-ui-pulsatingdot {
- width: 10px;
- height: 10px;
- border-radius: 5px;
+.ve-ui-pulsatingDot {
+ width: 1em;
+ height: 1em;
+ border-radius: 0.5em;
background: #347bff;
position: absolute;
- border: 0px;
opacity: 1;
animation: pulse 3s ease-out;
animation-iteration-count: infinite;
@@ -21,15 +20,19 @@
display: none;
}
-.ve-ui-educationpopup-dismiss {
- margin-top: 1em;
+.ve-ui-educationPopup-dismiss {
+ margin-top: 0.5em;
}
-.ve-ui-educationpopup-header {
+.ve-ui-educationPopup-header {
margin-bottom: 1em;
}
-.ve-ui-educationpopup .oo-ui-popupWidget-body {
+.ve-ui-educationPopup .oo-ui-popupWidget-body {
+ padding: 1em;
+}
+
+.ve-ui-educationPopup .oo-ui-popupWidget-body p {
line-height: 1.2em;
}
diff --git a/modules/ve-mw/ui/styles/tools/ve.ui.MWLinkInspectorTool.css
b/modules/ve-mw/ui/styles/tools/ve.ui.MWLinkInspectorTool.css
index 235a2e1..bd7dc3f 100644
--- a/modules/ve-mw/ui/styles/tools/ve.ui.MWLinkInspectorTool.css
+++ b/modules/ve-mw/ui/styles/tools/ve.ui.MWLinkInspectorTool.css
@@ -5,7 +5,7 @@
* @license The MIT License (MIT); see LICENSE.txt
*/
-.oo-ui-tool-name-link .oo-ui-popupWidget-body .ve-ui-educationpopup-header {
+.oo-ui-tool-name-link .oo-ui-popupWidget-body .ve-ui-educationPopup-header {
background: url(images/link-ltr.png) no-repeat center/90%;
height: 150px;
}
\ No newline at end of file
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWEducationPopupTool.js
b/modules/ve-mw/ui/tools/ve.ui.MWEducationPopupTool.js
index 970de53..5197510 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWEducationPopupTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWEducationPopupTool.js
@@ -15,10 +15,10 @@
* @param {Object} [config] Configuration options
*/
ve.ui.MWEducationPopupTool = function VeUiMwEducationPopupTool( config ) {
- var usePrefs = !mw.user.isAnon(),
+ var popupCloseButton, $popupContent,
+ usePrefs = !mw.user.isAnon(),
prefSaysShow = usePrefs && !mw.user.options.get(
'visualeditor-hideusered' ),
- tool = this,
- popupCloseButton, $popupContent;
+ tool = this;
config = config || {};
@@ -39,15 +39,13 @@
popupCloseButton = new OO.ui.ButtonWidget( {
label: ve.msg( 'visualeditor-educationpopup-dismiss' ),
flags: [ 'progressive', 'primary' ],
- classes: [ 've-ui-educationpopup-dismiss' ]
+ classes: [ 've-ui-educationPopup-dismiss' ]
} );
popupCloseButton.connect( this, { click: 'onPopupCloseButtonClick' } );
- $popupContent = $( '<p>' ).append(
- $( '<div>' ).addClass( 've-ui-educationpopup-header' ),
- $( '<b>' ).text( config.title ),
- '<br>',
- $( '<span>' ).text( config.text ),
- '<br>',
+ $popupContent = $( '<div>' ).append(
+ $( '<div>' ).addClass( 've-ui-educationPopup-header' ),
+ $( '<h3>' ).text( config.title ),
+ $( '<p>' ).text( config.text ),
popupCloseButton.$element
);
@@ -57,9 +55,9 @@
width: 300
} );
- this.$pulsatingDot = $( '<div>' ).addClass( 've-ui-pulsatingdot' );
+ this.$pulsatingDot = $( '<div>' ).addClass( 've-ui-pulsatingDot' );
this.$element
- .addClass( 've-ui-educationpopup' )
+ .addClass( 've-ui-educationPopup' )
.append( this.popup.$element )
.append( this.$pulsatingDot );
--
To view, visit https://gerrit.wikimedia.org/r/246784
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4effa34a4d3ddfca0f6ee61fe169a726dc0ec3f6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
