wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-25 23:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "MediaDialog: Use new icons"

Browse source
This commit is contained in:
jenkins-bot 2019-04-29 17:38:57 +00:00 committed by Gerrit Code Review
parent 90966ac74e 31dd73ae81
commit 33e157eb78
7 changed files with 4 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
View file

@ -282,22 +282,22 @@ ve.ui.MWMediaDialog.prototype.initialize = function () {
// TODO: Inline images require a bit of further work, will be coming soon
new OO.ui.MenuOptionWidget( {
data: 'thumb',
icon: 'image-thumbnail',
icon: 'imageLayoutThumbnail',
label: ve.msg( 'visualeditor-dialog-media-type-thumb' )
} ),
new OO.ui.MenuOptionWidget( {
data: 'frameless',
icon: 'image-frameless',
icon: 'imageLayoutFrameless',
label: ve.msg( 'visualeditor-dialog-media-type-frameless' )
} ),
new OO.ui.MenuOptionWidget( {
data: 'frame',
icon: 'image-frame',
icon: 'imageLayoutFrame',
label: ve.msg( 'visualeditor-dialog-media-type-frame' )
} ),
new OO.ui.MenuOptionWidget( {
data: 'none',
icon: 'image-none',
icon: 'imageLayoutBasic',
label: ve.msg( 'visualeditor-dialog-media-type-none' )
} )
] );

12
modules/ve-mw/ui/styles/apex/ve.ui.Icons.json
View file

@ -1,17 +1,5 @@
{
"images": {
"image-none": {
"file": "../images/icons/image-none.svg"
},
"image-frame": {
"file": "../images/icons/image-frame.svg"
},
"image-frameless": {
"file": "../images/icons/image-frameless.svg"
},
"image-thumbnail": {
"file": "../images/icons/image-thumbnail.svg"
},
"parameter": {
"file": "../images/icons/parameter-ltr.svg"
},

6
modules/ve-mw/ui/styles/images/icons/image-frame.svg
View file

@ -1,6 +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">
<path id="frame" d="M4 5v13h16v-13zm15 12h-14v-11h14z"/>
<path id="mountains" d="M9.5 10l2.328 2.312-1.312 1.094.875 1.032 4.109-3.438 2.5 2v3h-12v-2.5z"/>
<path id="sky" d="M9.516 7.844l3.046 3.172 2.938-2.016 2.5 2v-4h-12v5z"/>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 363 B

5
modules/ve-mw/ui/styles/images/icons/image-frameless.svg
View file

@ -1,5 +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">
<path id="mountains" d="M11.828 12.312l-1.312 1.094.875 1.032 4.109-3.438 2.5 2v3h-12v-2.5l3.5-3.5z"/>
<path id="sky" d="M12.562 11.016l2.938-2.016 2.5 2v-4h-12v5l3.516-4.156z"/>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 311 B

5
modules/ve-mw/ui/styles/images/icons/image-none.svg
View file

@ -1,5 +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">
<path id="mountains" d="M9.531 8.844l-3.531 4.156v1.5l3.5-3.5 2.313 2.313-1.281 1.094.875 1.031 4.094-3.438 2.5 2v-2l-2.5-2-2.938 2.031-3.031-3.188z"/>
<path id="frame" d="M5 7v11h14v-11zm13 10h-12v-9h12z"/>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 340 B

8
modules/ve-mw/ui/styles/images/icons/image-thumbnail.svg
View file

@ -1,8 +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">
<path id="frame" d="M4 4v15h16v-15zm15 14h-14v-13h14z"/>
<path id="mountains" d="M6 15v-2.5l3.5-3.5 2.328 2.312-1.312 1.094.875 1.032 4.109-3.438 2.5 2v3z"/>
<path id="sky" d="M9.516 6.844l3.046 3.172 2.938-2.016 2.5 2v-4h-12v5z"/>
<path id="text" d="M6 16h10v1h-10z"/>
<path id="zoom" d="M17 16h1v1h-1z"/>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 442 B

12
modules/ve-mw/ui/styles/wikimediaui/ve.ui.Icons.json
View file

@ -10,18 +10,6 @@
}
},
"images": {
"image-none": {
"file": "../images/icons/image-none.svg"
},
"image-frame": {
"file": "../images/icons/image-frame.svg"
},
"image-frameless": {
"file": "../images/icons/image-frameless.svg"
},
"image-thumbnail": {
"file": "../images/icons/image-thumbnail.svg"
},
"parameter": {
"file": "../images/icons/parameter-ltr.svg"
},