Catrope has uploaded a new change for review. https://gerrit.wikimedia.org/r/234435
Change subject: Use wikitext icon from VE for the VE->WT switch tool ...................................................................... Use wikitext icon from VE for the VE->WT switch tool Bug: T101316 Change-Id: I0624b6a0b7f69b709a37bb04cee5658497d7cab0 --- D modules/editor/editors/visualeditor/ui/images/icons/flow-switch-editor.svg M modules/editor/editors/visualeditor/ui/mw.flow.ve.ui.Icons.less M modules/editor/editors/visualeditor/ui/tools/mw.flow.ve.ui.SwitchEditorTool.js 3 files changed, 1 insertion(+), 74 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/35/234435/1 diff --git a/modules/editor/editors/visualeditor/ui/images/icons/flow-switch-editor.svg b/modules/editor/editors/visualeditor/ui/images/icons/flow-switch-editor.svg deleted file mode 100644 index 80561ac..0000000 --- a/modules/editor/editors/visualeditor/ui/images/icons/flow-switch-editor.svg +++ /dev/null @@ -1,69 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/"; - xmlns:cc="http://creativecommons.org/ns#"; - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - xmlns:svg="http://www.w3.org/2000/svg"; - xmlns="http://www.w3.org/2000/svg"; - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; - version="1.1" - width="24" - height="24" - id="svg2" - inkscape:version="0.48.4 r9939" - sodipodi:docname="flow-switch-editor.svg"> - <sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="640" - inkscape:window-height="480" - id="namedview3262" - showgrid="false" - inkscape:zoom="9.8333333" - inkscape:cx="12" - inkscape:cy="7.9322034" - inkscape:window-x="0" - inkscape:window-y="24" - inkscape:window-maximized="0" - inkscape:current-layer="svg2" /> - <defs - id="defs4" /> - <metadata - id="metadata7"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - transform="matrix(3.1730191,0,0,6.5378108,-0.51387626,-7.0405915)" - style="font-size:4px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans" - id="flowRoot3264"> - <path - d="m 2.8339844,2.2369966 -2.01562502,0.7167969 2.01562502,0.7128906 0,0.3554688 -2.50390627,-0.9082031 0,-0.3242188 2.50390627,-0.9082031 0,0.3554687" - style="" - id="path3277" /> - <path - d="m 4.2734375,1.289731 0.3320312,0 -1.0156249,3.2871094 -0.3320313,0 1.015625,-3.2871094" - style="" - id="path3279" /> - <path - d="m 5.0332031,2.2369966 0,-0.3554687 2.5039063,0.9082031 0,0.3242188 -2.5039063,0.9082031 0,-0.3554688 L 7.0449219,2.9537935 5.0332031,2.2369966" - style="" - id="path3281" /> - </g> -</svg> diff --git a/modules/editor/editors/visualeditor/ui/mw.flow.ve.ui.Icons.less b/modules/editor/editors/visualeditor/ui/mw.flow.ve.ui.Icons.less index 4e38f7c..7312a4c 100644 --- a/modules/editor/editors/visualeditor/ui/mw.flow.ve.ui.Icons.less +++ b/modules/editor/editors/visualeditor/ui/mw.flow.ve.ui.Icons.less @@ -3,7 +3,3 @@ .oo-ui-icon-flow-mention { .background-image('images/icons/flow-mention.svg'); } - -.oo-ui-icon-flow-switch-editor { - .background-image('images/icons/flow-switch-editor.svg'); -} diff --git a/modules/editor/editors/visualeditor/ui/tools/mw.flow.ve.ui.SwitchEditorTool.js b/modules/editor/editors/visualeditor/ui/tools/mw.flow.ve.ui.SwitchEditorTool.js index 4b16582..cb25abb 100644 --- a/modules/editor/editors/visualeditor/ui/tools/mw.flow.ve.ui.SwitchEditorTool.js +++ b/modules/editor/editors/visualeditor/ui/tools/mw.flow.ve.ui.SwitchEditorTool.js @@ -21,7 +21,7 @@ // Static mw.flow.ve.ui.SwitchEditorTool.static.commandName = 'flowSwitchEditor'; mw.flow.ve.ui.SwitchEditorTool.static.name = 'flowSwitchEditor'; - mw.flow.ve.ui.SwitchEditorTool.static.icon = 'flow-switch-editor'; + mw.flow.ve.ui.SwitchEditorTool.static.icon = 'source'; mw.flow.ve.ui.SwitchEditorTool.static.title = OO.ui.deferMsg( 'flow-ve-switch-editor-tool-title' ); ve.ui.toolFactory.register( mw.flow.ve.ui.SwitchEditorTool ); -- To view, visit https://gerrit.wikimedia.org/r/234435 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0624b6a0b7f69b709a37bb04cee5658497d7cab0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Catrope <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
