jenkins-bot has submitted this change and it was merged.
Change subject: Replace 'source' icon with OOUI's 'wikiText' one
......................................................................
Replace 'source' icon with OOUI's 'wikiText' one
Change-Id: Id66d436b9140604ace7ebfbec1f80dc8f3830a20
---
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
M modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
M modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js
D modules/ve-mw/ui/styles/images/icons/source.svg
M modules/ve-mw/ui/styles/ve.ui.Icons.css
M modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js
6 files changed, 4 insertions(+), 18 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index ff04a0b..d77b87a 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -169,7 +169,7 @@
a(:subheading3, text: /Sub-heading 3/)
a(:subheading4, text: /Sub-heading 4/)
div(:suggestion_list, class: 'mw-widget-titleInputWidget-menu')
- span(:switch_to_source_editing, class: 'oo-ui-iconElement-icon
oo-ui-icon-source')
+ span(:switch_to_source_editing, class: 'oo-ui-iconElement-icon
oo-ui-icon-wikiText')
table(:table, class: 've-ce-tableNode')
div(:table_of_contents, class: 've-test-page-settings-table-of-contents')
span(:template_insert_menu, class: 'oo-ui-tool-name-transclusion')
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
index bede4f0..a6de7c7 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
@@ -331,7 +331,7 @@
} );
this.addContentButton = new OO.ui.ButtonWidget( {
framed: false,
- icon: 'source',
+ icon: 'wikiText',
title: ve.msg( 'visualeditor-dialog-transclusion-add-content' )
} );
this.addParameterButton = new OO.ui.ButtonWidget( {
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js
index fcecd1b..b44909b 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js
@@ -44,7 +44,7 @@
.connect( this, { click: 'onRemoveButtonClick' } );
this.valueFieldset = new OO.ui.FieldsetLayout( {
label: ve.msg( 'visualeditor-dialog-transclusion-content' ),
- icon: 'source',
+ icon: 'wikiText',
$content: this.textInput.$element
} );
diff --git a/modules/ve-mw/ui/styles/images/icons/source.svg
b/modules/ve-mw/ui/styles/images/icons/source.svg
deleted file mode 100644
index 0aef5b9..0000000
--- a/modules/ve-mw/ui/styles/images/icons/source.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
- <g id="source">
- <path id="opening-bracket-inner" d="M7 19h3v-2H9V7h1V5H7z"/>
- <path id="closing-bracket-inner" d="M17 19h-3v-2h1V7h-1V5h3z"/>
- <path id="closing-bracket-outer" d="M21 19h-3v-2h1V7h-1V5h3z"/>
- <path id="opening-bracket-outer" d="M3 19h3v-2H5V7h1V5H3z"/>
- </g>
-</svg>
diff --git a/modules/ve-mw/ui/styles/ve.ui.Icons.css
b/modules/ve-mw/ui/styles/ve.ui.Icons.css
index b59be6d..2cba38a 100644
--- a/modules/ve-mw/ui/styles/ve.ui.Icons.css
+++ b/modules/ve-mw/ui/styles/ve.ui.Icons.css
@@ -147,11 +147,6 @@
background-image: url( images/icons/ref-cite-web.svg );
}
-.oo-ui-icon-source {
- /* @embed */
- background-image: url( images/icons/source.svg );
-}
-
.oo-ui-icon-template {
/* @embed */
background-image: url( images/icons/template.svg );
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js
b/modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js
index 2f8e197..a4c74ce 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js
@@ -56,7 +56,7 @@
};
OO.inheritClass( ve.ui.MWEditModeSourceTool, ve.ui.MWEditModeTool );
ve.ui.MWEditModeSourceTool.static.name = 'editModeSource';
-ve.ui.MWEditModeSourceTool.static.icon = 'source';
+ve.ui.MWEditModeSourceTool.static.icon = 'wikiText';
ve.ui.MWEditModeSourceTool.static.title =
OO.ui.deferMsg( 'visualeditor-mweditmodesource-tool' );
/**
--
To view, visit https://gerrit.wikimedia.org/r/250962
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id66d436b9140604ace7ebfbec1f80dc8f3830a20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
