jenkins-bot has submitted this change and it was merged.
Change subject: CommentNode: Change icon from orange to grey
......................................................................
CommentNode: Change icon from orange to grey
We have no other bright solid colours in Apex or Vector so it looks quite
out of place. Also it conflicts with the selection colour in FF/Linux.
Also swapped implementation to use the file from OOjs UI instead since
they're now equal. Made sure dimeneions and alignment stay the same. Couldn't
append an instance of OO.ui.IndicatorElement as it doesn't allow invisible
content (the em space for selection), using the underlying mixin instead.
Also removed top/bottom margin around the inline block which
previously caused the line height of the containing paragraph to
increase by 0.15em in both directions.
Change-Id: Ic2133b9a588050f5fc159cadf0e6f315ae701a10
---
M modules/ve/ce/nodes/ve.ce.CommentNode.js
M modules/ve/ce/styles/nodes/ve.ce.CommentNode.css
D modules/ve/ui/styles/images/comment.svg
3 files changed, 6 insertions(+), 9 deletions(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/ce/nodes/ve.ce.CommentNode.js
b/modules/ve/ce/nodes/ve.ce.CommentNode.js
index d043cd2..db297d6 100644
--- a/modules/ve/ce/nodes/ve.ce.CommentNode.js
+++ b/modules/ve/ce/nodes/ve.ce.CommentNode.js
@@ -11,6 +11,7 @@
* @class
* @extends ve.ce.LeafNode
* @mixins ve.ce.FocusableNode
+* @mixins OO.ui.IndicatedElement
*
* @constructor
* @param {ve.dm.CommentNode} model Model to observe
@@ -28,12 +29,14 @@
// Mixin constructors
ve.ce.FocusableNode.call( this, this.$element, config );
+ OO.ui.IndicatedElement.call( this, this.$element, { $: this.$,
indicator: 'alert' } );
};
/* Inheritance */
OO.inheritClass( ve.ce.CommentNode, ve.ce.LeafNode );
OO.mixinClass( ve.ce.CommentNode, ve.ce.FocusableNode );
+OO.mixinClass( ve.ce.CommentNode, OO.ui.IndicatedElement );
/* Static Properties */
diff --git a/modules/ve/ce/styles/nodes/ve.ce.CommentNode.css
b/modules/ve/ce/styles/nodes/ve.ce.CommentNode.css
index 5412152..de0bd4d 100644
--- a/modules/ve/ce/styles/nodes/ve.ce.CommentNode.css
+++ b/modules/ve/ce/styles/nodes/ve.ce.CommentNode.css
@@ -7,11 +7,11 @@
.ve-ce-commentNode {
display: inline-block;
- margin: 0.15em;
+ margin: 0 0.15em;
+
width: 1em;
height: 1em;
background-repeat: no-repeat;
background-position: center center;
- /* @embed */
- background-image: url(../../../../ve/ui/styles/images/comment.svg);
+ opacity: 0.5;
}
diff --git a/modules/ve/ui/styles/images/comment.svg
b/modules/ve/ui/styles/images/comment.svg
deleted file mode 100644
index 6028b19..0000000
--- a/modules/ve/ui/styles/images/comment.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg"; width="12" height="12" viewBox="0 0 12
12">
- <g id="comment" opacity=".75">
- <path fill="#ff5d00" d="M6 12c-3.314 0-6-2.686-6-6s2.686-6 6-6 6 2.686
6 6-2.686 6-6 6zm-1-5h2v-5h-2zm0 3h2v-2h-2z"/>
- </g>
-</svg>
--
To view, visit https://gerrit.wikimedia.org/r/149354
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2133b9a588050f5fc159cadf0e6f315ae701a10
Gerrit-PatchSet: 6
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Trevor Parscal <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
