jenkins-bot has submitted this change and it was merged.
Change subject: Add check icon for Apply button in ActionDialog
......................................................................
Add check icon for Apply button in ActionDialog
Required for Agora theme where the label is hidden.
Hide it on desktop to maintain previous appearance.
Change-Id: Ia0eccec08c5b6c221a8bcea2fedf0c7b0fb62652
---
M .docs/eg-iframe.html
M build/modules.json
M demos/ve/desktop.html
M modules/ve/ui/dialogs/ve.ui.ActionDialog.js
M modules/ve/ui/styles/dialogs/ve.ui.ActionDialog.css
A modules/ve/ui/themes/apex/dialogs/ve.ui.ActionDialog.css
6 files changed, 16 insertions(+), 3 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.docs/eg-iframe.html b/.docs/eg-iframe.html
index 40388b0..bc539f0 100644
--- a/.docs/eg-iframe.html
+++ b/.docs/eg-iframe.html
@@ -42,6 +42,7 @@
<!-- visualEditor.desktop -->
<link rel=stylesheet
href="../modules/ve/ui/themes/apex/ve.ui.Inspector.css">
+ <link rel=stylesheet
href="../modules/ve/ui/themes/apex/dialogs/ve.ui.ActionDialog.css">
<!-- example styles -->
<style>
diff --git a/build/modules.json b/build/modules.json
index fb76d2a..b943b17 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -399,7 +399,8 @@
},
"visualEditor.desktop": {
"styles": [
- "modules/ve/ui/themes/apex/ve.ui.Inspector.css"
+ "modules/ve/ui/themes/apex/ve.ui.Inspector.css",
+
"modules/ve/ui/themes/apex/dialogs/ve.ui.ActionDialog.css"
],
"dependencies": [
"oojs-ui-apex",
diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html
index 2754978..9936bee 100644
--- a/demos/ve/desktop.html
+++ b/demos/ve/desktop.html
@@ -52,6 +52,7 @@
<!-- visualEditor.desktop -->
<link rel=stylesheet
href="../../modules/ve/ui/themes/apex/ve.ui.Inspector.css">
+ <link rel=stylesheet
href="../../modules/ve/ui/themes/apex/dialogs/ve.ui.ActionDialog.css">
<!-- visualEditor.standalone.demo -->
<link rel=stylesheet href="../../demos/ve/demo.css">
diff --git a/modules/ve/ui/dialogs/ve.ui.ActionDialog.js
b/modules/ve/ui/dialogs/ve.ui.ActionDialog.js
index dd676be..b51ab79 100644
--- a/modules/ve/ui/dialogs/ve.ui.ActionDialog.js
+++ b/modules/ve/ui/dialogs/ve.ui.ActionDialog.js
@@ -178,7 +178,7 @@
ve.ui.ActionDialog.super.prototype.initialize.call( this );
// Properties
- this.applyButton = new OO.ui.ButtonWidget( { '$': this.$ } );
+ this.applyButton = new OO.ui.ButtonWidget( { '$': this.$, 'icon':
'check' } );
this.dismissErrorsButton = new OO.ui.ButtonWidget( {
'$': this.$, 'label': ve.msg(
'visualeditor-dialog-error-dismiss' )
} );
diff --git a/modules/ve/ui/styles/dialogs/ve.ui.ActionDialog.css
b/modules/ve/ui/styles/dialogs/ve.ui.ActionDialog.css
index f7a30f8..7cf8e8f 100644
--- a/modules/ve/ui/styles/dialogs/ve.ui.ActionDialog.css
+++ b/modules/ve/ui/styles/dialogs/ve.ui.ActionDialog.css
@@ -1,5 +1,5 @@
/*!
- * VisualEditor UserInterface CommandHelpDialog styles.
+ * VisualEditor UserInterface ActionDialog styles.
*
* @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
diff --git a/modules/ve/ui/themes/apex/dialogs/ve.ui.ActionDialog.css
b/modules/ve/ui/themes/apex/dialogs/ve.ui.ActionDialog.css
new file mode 100644
index 0000000..15c2bfc
--- /dev/null
+++ b/modules/ve/ui/themes/apex/dialogs/ve.ui.ActionDialog.css
@@ -0,0 +1,10 @@
+/*!
+ * VisualEditor UserInterface ActionDialog styles.
+ *
+ * @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+.ve-ui-actionDialog .oo-ui-window-foot .oo-ui-buttonedElement-button >
.oo-ui-iconedElement-icon {
+ display: none;
+}
--
To view, visit https://gerrit.wikimedia.org/r/132353
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0eccec08c5b6c221a8bcea2fedf0c7b0fb62652
Gerrit-PatchSet: 3
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: JGonera <jgon...@wikimedia.org>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: JGonera <jgon...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Trevor Parscal <tpars...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
