golem
/
Math
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace extension icons with standard OOUI icons 

Replacing outdated 'chem' and 'math*' icons with standardized
OOUI icons from 'editing-advanced' pack.

Bug: T195480
Change-Id: Iefc02ca5c2f0c310fdc83fe26a17f7fcba5195b8
This commit is contained in:
Volker E 2019-01-23 14:36:14 -08:00 committed by Jforrester
parent e9dc89f4d2
commit c131018ad1
14 changed files with 14 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
extension.json
View File

@ -168,8 +168,8 @@
],
"dependencies": [
"ext.visualEditor.mwcore",
"ext.math.visualEditor.icons",
"ext.math.styles"
"ext.math.styles",
"oojs-ui.styles.icons-editing-advanced"
],
"messages": [
"math-visualeditor-mwchemdialog-title",
@ -247,41 +247,6 @@
"dependencies": [
"ext.math.visualEditor.chemSymbolsData"
]
},
"ext.math.visualEditor.icons": {
"class": "ResourceLoaderImageModule",
"selectorWithoutVariant": ".oo-ui-icon-{name}",
"selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
"variants": {
"progressive": {
"color": "#36c"
},
"invert": {
"color": "#fff"
}
},
"images": {
"math": {
"file": "ve-math/math.svg",
"variants": [ "progressive" ]
},
"math-display-block": {
"file": "ve-math/math-display-block.svg",
"variants": [ "invert" ]
},
"math-display-default": {
"file": "ve-math/math-display-default.svg",
"variants": [ "invert" ]
},
"math-display-inline": {
"file": "ve-math/math-display-inline.svg",
"variants": [ "invert" ]
},
"chem": {
"file": "ve-math/chem.svg",
"variants": [ "progressive" ]
}
}
}
},
"ResourceFileModulePaths": {

9
modules/ve-math/chem.svg
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
<title>chem</title>
<path d="M5 3v2l1-.002v2.36l-4.61 7.877c-.38.614-.37 1.338-.046 1.875.324.538.943.89 1.656.89h14c.713 0 1.33-.353 1.654-.89.324-.536.335-1.258-.043-1.873L14 7.357V4.999h1V3h-2.5a.5.5 0 0 0-.5.5v4c0 .092.025.402.074.48l3.94 6.783c.202.33.174.606.037.834-.137.227-.402.404-.797.404H4.746c-.395 0-.66-.179-.8-.407-.136-.228-.165-.503.038-.83.001 0 .002 0 .002-.002l3.94-6.782C7.974 7.9 8 7.591 8 7.5v-4a.5.5 0 0 0-.5-.5z" id="flask"/>
<path d="M7.3 11.056L5 15h10l-1.67-2.918c-1.296.227-4.48-.89-6.03-1.026zm1.181 1.399a1 1 0 1 1 0 2 1 1 0 0 1 0-2z" id="liquid"/>
<circle r="1.154" cy="2.424" cx="10.617" id="bubble1" stroke-width="1.13"/>
<ellipse ry=".654" rx=".643" cy="5.589" cx="9.469" id="bubble2" stroke-width=".824"/>
<circle r="1.095" cy="9.673" cx="10.734" id="bubble3"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 950 B

7
modules/ve-math/math-display-block.svg
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="2 2 20 20">
<g id="math-display-default">
<path id="sigma" d="M 12.609,11.391 10.275186,16.004 15,16 l 0,-1 1,0 0,3 L 7.2711863,18 11,12 7.2711863,7 16,7 l 0,3 -1,0 0,-2 -4.728814,0" />
<path id="text" d="m 3.5,19 17,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 l -17,0 C 3.223,20 3,19.777 3,19.5 3,19.223 3.223,19 3.5,19 z m 0,-14 17,0 C 20.777,5 21,5.223 21,5.5 21,5.777 20.777,6 20.5,6 L 3.5,6 C 3.223,6 3,5.777 3,5.5 3,5.223 3.223,5 3.5,5 z" />
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 609 B

10
modules/ve-math/math-display-default.svg
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="2 2 20 20">
<g id="math-display-default">
<path id="sigma" d="M 12.609,11.391 10.275186,16.004 15,16 l 0,-1 1,0 0,3 L 7.2711866,18 11,12 7.2711866,7 16,7 l 0,3 -1,0 0,-2 -4.728814,0" />
<path id="sum-to" d="m 13,20 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" />
<path id="sum-from" d="m 13,5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z" />
<path id="text-before" d="M 3,11.5 C 3,11.223 3.223,11 3.5,11 l 3,0 C 6.777,11 7,11.223 7,11.5 l 0,2 C 7,13.777 6.777,14 6.5,14 l -3,0 C 3.223,14 3,13.777 3,13.5 z" />
<path id="text-after" d="M 17,11.5 C 17,11.223 17.223,11 17.5,11 l 3,0 c 0.277,0 0.5,0.223 0.5,0.5 l 0,2 c 0,0.277 -0.223,0.5 -0.5,0.5 l -3,0 C 17.223,14 17,13.777 17,13.5 z" />
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1010 B

10
modules/ve-math/math-display-inline.svg
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="2 2 20 20">
<g id="math-display-inline">
<path id="sigma" d="M 11.609,11.391 9.8551551,15.004 13,15 l 0,-1 1,0 0,3 L 7.2710001,17 10,12 7.2710001,8 14,8 l 0,3 -1,0 0,-2 -3.1488449,0" />
<path id="sum-to" d="m 17,16 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" />
<path id="sum-from" d="m 17,9 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z" />
<path id="text-before" d="M 3,11.5 C 3,11.223 3.223,11 3.5,11 l 3,0 c 0.277,0 0.5,0.223 0.5,0.5 l 0,2 C 7,13.777 6.777,14 6.5,14 l -3,0 C 3.223,14 3,13.777 3,13.5 z" />
<path id="text-after" d="M 17,11.5 C 17,11.223 17.223,11 17.5,11 l 3,0 c 0.277,0 0.5,0.223 0.5,0.5 l 0,2 c 0,0.277 -0.223,0.5 -0.5,0.5 l -3,0 C 17.223,14 17,13.777 17,13.5 z" />
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1011 B

5
modules/ve-math/math.svg
View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" height="20" width="20">
<title>math</title>
<path d="M12.643 8.829L7.495 15H14.5v-1.5H16V18H3l6.666-8L3 2h13v4h-1.5V3.5H8.112" id="sigma"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 254 B

2
modules/ve-math/ve.ce.MWChemNode.js
View File

@ -30,7 +30,7 @@ ve.ce.MWChemNode.static.name = 'mwChem';
ve.ce.MWChemNode.static.primaryCommandName = 'chemDialog';
ve.ce.MWChemNode.static.iconWhenInvisible = 'chem';
ve.ce.MWChemNode.static.iconWhenInvisible = 'beaker';
/* Registration */

2
modules/ve-math/ve.ce.MWMathNode.js
View File

@ -30,7 +30,7 @@ ve.ce.MWMathNode.static.name = 'mwMath';
ve.ce.MWMathNode.static.primaryCommandName = 'mathDialog';
ve.ce.MWMathNode.static.iconWhenInvisible = 'math';
ve.ce.MWMathNode.static.iconWhenInvisible = 'mathematics';
/* Registration */

2
modules/ve-math/ve.ui.MWChemContextItem.js
View File

@ -27,7 +27,7 @@ OO.inheritClass( ve.ui.MWChemContextItem, ve.ui.MWLatexContextItem );
ve.ui.MWChemContextItem.static.name = 'chem';
ve.ui.MWChemContextItem.static.icon = 'chem';
ve.ui.MWChemContextItem.static.icon = 'beaker';
ve.ui.MWChemContextItem.static.label = OO.ui.deferMsg( 'math-visualeditor-mwchemdialog-title' );

2
modules/ve-math/ve.ui.MWChemDialogTool.js
View File

@ -20,7 +20,7 @@ ve.ui.MWChemDialogTool = function VeUiMWChemDialogTool( toolGroup, config ) {
OO.inheritClass( ve.ui.MWChemDialogTool, ve.ui.FragmentWindowTool );
ve.ui.MWChemDialogTool.static.name = 'chem';
ve.ui.MWChemDialogTool.static.group = 'object';
ve.ui.MWChemDialogTool.static.icon = 'chem';
ve.ui.MWChemDialogTool.static.icon = 'beaker';
ve.ui.MWChemDialogTool.static.title = OO.ui.deferMsg(
'math-visualeditor-mwchemdialog-title' );
ve.ui.MWChemDialogTool.static.modelClasses = [ ve.dm.MWChemNode ];

6
modules/ve-math/ve.ui.MWLatexDialog.js
View File

@ -98,17 +98,17 @@ ve.ui.MWLatexDialog.prototype.initialize = function () {
items: [
new OO.ui.ButtonOptionWidget( {
data: 'default',
icon: 'math-display-default',
icon: 'mathematicsDisplayDefault',
label: ve.msg( 'math-visualeditor-mwlatexinspector-display-default' )
} ),
new OO.ui.ButtonOptionWidget( {
data: 'inline',
icon: 'math-display-inline',
icon: 'mathematicsDisplayInline',
label: ve.msg( 'math-visualeditor-mwlatexinspector-display-inline' )
} ),
new OO.ui.ButtonOptionWidget( {
data: 'block',
icon: 'math-display-block',
icon: 'mathematicsDisplayBlock',
label: ve.msg( 'math-visualeditor-mwlatexinspector-display-block' )
} )
]

6
modules/ve-math/ve.ui.MWLatexInspector.js
View File

@ -44,17 +44,17 @@ ve.ui.MWLatexInspector.prototype.initialize = function () {
items: [
new OO.ui.ButtonOptionWidget( {
data: 'default',
icon: 'math-display-default',
icon: 'mathematicsDisplayDefault',
label: ve.msg( 'math-visualeditor-mwlatexinspector-display-default' )
} ),
new OO.ui.ButtonOptionWidget( {
data: 'inline',
icon: 'math-display-inline',
icon: 'mathematicsDisplayInline',
label: ve.msg( 'math-visualeditor-mwlatexinspector-display-inline' )
} ),
new OO.ui.ButtonOptionWidget( {
data: 'block',
icon: 'math-display-block',
icon: 'mathematicsDisplayBlock',
label: ve.msg( 'math-visualeditor-mwlatexinspector-display-block' )
} )
]

2
modules/ve-math/ve.ui.MWMathContextItem.js
View File

@ -27,7 +27,7 @@ OO.inheritClass( ve.ui.MWMathContextItem, ve.ui.MWLatexContextItem );
ve.ui.MWMathContextItem.static.name = 'math';
ve.ui.MWMathContextItem.static.icon = 'math';
ve.ui.MWMathContextItem.static.icon = 'mathematics';
ve.ui.MWMathContextItem.static.label = OO.ui.deferMsg( 'math-visualeditor-mwmathdialog-title' );

2
modules/ve-math/ve.ui.MWMathDialogTool.js
View File

@ -20,7 +20,7 @@ ve.ui.MWMathDialogTool = function VeUiMWMathDialogTool( toolGroup, config ) {
OO.inheritClass( ve.ui.MWMathDialogTool, ve.ui.FragmentWindowTool );
ve.ui.MWMathDialogTool.static.name = 'math';
ve.ui.MWMathDialogTool.static.group = 'object';
ve.ui.MWMathDialogTool.static.icon = 'math';
ve.ui.MWMathDialogTool.static.icon = 'mathematics';
ve.ui.MWMathDialogTool.static.title = OO.ui.deferMsg(
'math-visualeditor-mwmathdialog-title' );
ve.ui.MWMathDialogTool.static.modelClasses = [ ve.dm.MWMathNode ];