Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/179005
Change subject: Use ResourceLoaderImage module in MobileFrontend
......................................................................
Use ResourceLoaderImage module in MobileFrontend
Change-Id: Id483df25946a65351fd3dcec56fa34f7d89b1767
---
M Gruntfile.js
A images/icons/arrow-down.svg
A images/icons/arrow-up.svg
A images/icons/bell.svg
A images/icons/blue-triangle.svg
A images/icons/cite.svg
A images/icons/contents-ltr.svg
A images/icons/edit.svg
A images/icons/editLocked.svg
A images/icons/editSourceNormal.svg
A images/icons/editToggle.svg
A images/icons/editVeNormal.svg
A images/icons/gray-triangle.svg
A images/icons/hamburger.svg
R images/icons/magnifying-glass.svg
A images/icons/talk.svg
A images/icons/upload.svg
A images/icons/uploadLocked.svg
A images/icons/userAnonymous.svg
A images/icons/userNormal.svg
A images/icons/watch.svg
A images/icons/watched.svg
M includes/Resources.php
M includes/skins/SkinMinervaAlpha.php
M less/iconsNew.less
D less/images/icons/FIXME.txt
D less/images/icons/arrow-down.png
D less/images/icons/arrow-down.svg
D less/images/icons/arrow-up.png
D less/images/icons/arrow-up.svg
D less/images/icons/bell.png
D less/images/icons/bell.svg
D less/images/icons/blue-triangle.png
D less/images/icons/blue-triangle.svg
D less/images/icons/cite.png
D less/images/icons/cite.svg
D less/images/icons/contents-ltr.png
D less/images/icons/contents-ltr.svg
D less/images/icons/edit.png
D less/images/icons/edit.svg
D less/images/icons/editLocked.png
D less/images/icons/editLocked.svg
D less/images/icons/editSourceNormal.png
D less/images/icons/editSourceNormal.svg
D less/images/icons/editToggle.png
D less/images/icons/editToggle.svg
D less/images/icons/editVeNormal.png
D less/images/icons/editVeNormal.svg
D less/images/icons/gray-triangle.png
D less/images/icons/gray-triangle.svg
D less/images/icons/hamburger.png
D less/images/icons/hamburger.svg
D less/images/icons/magnifying-glass.png
D less/images/icons/talk.png
D less/images/icons/talk.svg
D less/images/icons/upload.png
D less/images/icons/upload.svg
D less/images/icons/uploadLocked.png
D less/images/icons/uploadLocked.svg
D less/images/icons/userAnonymous.png
D less/images/icons/userAnonymous.svg
D less/images/icons/userNormal.png
D less/images/icons/userNormal.svg
D less/images/icons/watch.png
D less/images/icons/watch.svg
D less/images/icons/watched.png
D less/images/icons/watched.svg
67 files changed, 166 insertions(+), 531 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/05/179005/1
diff --git a/Gruntfile.js b/Gruntfile.js
index a0fcaef..fbe3fb8 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -30,11 +30,6 @@
jsExternals: 'javascripts/externals/**/*.js',
mantleJs: MW_INSTALL_PATH +
'/extensions/Mantle/javascripts/**/*.js'
},
- svg2png: {
- dist: {
- src: 'less/images/icons/*.svg'
- }
- },
jshint: {
options: {
jshintrc: true
@@ -140,5 +135,4 @@
grunt.registerTask( 'test', [ 'lint' ] );
grunt.registerTask( 'default', [ 'test' ] );
- grunt.registerTask( 'build-icons', [ 'svg2png' ] );
};
diff --git a/images/icons/arrow-down.svg b/images/icons/arrow-down.svg
new file mode 100644
index 0000000..dd2754d
--- /dev/null
+++ b/images/icons/arrow-down.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 -410 24 24">
+ <g id="g4">
+ <path d="M21.348-401.268q.94 0 1.61.668l.92.922-11.858
11.86L.198-399.66l.922-.94q.65-.686 1.59-.686.94 0 1.61.668l7.718 7.7
7.7-7.682q.67-.668 1.61-.668z" id="path6" fill="currentColor"/>
+ </g>
+</svg>
diff --git a/images/icons/arrow-up.svg b/images/icons/arrow-up.svg
new file mode 100644
index 0000000..c761d9a
--- /dev/null
+++ b/images/icons/arrow-up.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 -410 24 24">
+ <g id="g4">
+ <path d="M21.348-387.837q.94 0 1.61-.67l.92-.92-11.858-11.86-11.822
11.84.922.94q.65.688 1.59.688.94 0 1.61-.668l7.718-7.7 7.7 7.682q.67.67
1.61.67z" id="path6" fill="currentColor"/>
+ </g>
+</svg>
diff --git a/images/icons/bell.svg b/images/icons/bell.svg
new file mode 100644
index 0000000..6de867c
--- /dev/null
+++ b/images/icons/bell.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="48" height="48"
viewBox="-282.375 419.5 48 48" enable-background="new -282.375 419.5 48 48">
+ <path d="M-249.122 464.146h11.915c1.095 0 2.192-.728
2.554-1.703.486-.97.242-2.187-.61-3.04-3.89-4.01-4.74-9.972-5.47-15.683-1.215-8.51-2.553-18.116-14.71-19.334v-1.58c0-1.58-1.214-2.797-2.795-2.797-1.582
0-2.797 1.215-2.797 2.795v1.58c-12.037 1.22-13.375 10.824-14.59 19.335-.85
5.712-1.58 11.673-5.47 15.682-.73.853-.974 1.947-.608 3.04.486.977 1.458 1.704
2.552 1.704h11.67m9.24 3.405c-1.947 0-3.407-1.46-3.528-3.404h7.05c-.118
1.823-1.702 3.405-3.522 3.405zm0-9h-15.443c2.31-4.496 3.04-9.483 3.65-14.104
1.336-9.847 2.43-14.59 11.793-14.59 9.484 0 10.574 4.744 11.915 14.59.605 4.62
1.337 9.606 3.646 14.105h-15.56z" id="path4" fill="#555"/>
+</svg>
diff --git a/images/icons/blue-triangle.svg b/images/icons/blue-triangle.svg
new file mode 100644
index 0000000..030f510
--- /dev/null
+++ b/images/icons/blue-triangle.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="80" height="80" viewBox="0 0 80
80">
+ <path fill="#36b" d="M1.112 73.678L39.997 6.322 78.89 73.678z"/>
+ <path fill="#fff" d="M43.525
57.7v7.103h-6.823V57.7h6.823zm-2.03-5.905h-3.27L36.47
39.55v-7.854h6.825v7.854l-1.8 12.245z"/>
+</svg>
diff --git a/images/icons/cite.svg b/images/icons/cite.svg
new file mode 100644
index 0000000..e0c16a4
--- /dev/null
+++ b/images/icons/cite.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="29.143" viewBox="0
0 12 14.571428" enable-background="new 0 0 24 24">
+ <g id="g3">
+ <path d="M7.714 6.857L6 5.143 4.286 6.857V1.714H2.57v11.143h6.86s.856
0 .856-.857V1.714H7.714v5.143z" id="path5" fill="none"/>
+ <path d="M0 0v14.57h10.286c.857 0 1.714-.856 1.714-1.713V0H0zm10.286
12c0 .857-.857.857-.857.857H2.57V1.714h1.716v5.143L6 5.143l1.714
1.714V1.714h2.572V12z" id="path7" fill="#575757"/>
+ </g>
+</svg>
diff --git a/images/icons/contents-ltr.svg b/images/icons/contents-ltr.svg
new file mode 100644
index 0000000..8e1efea
--- /dev/null
+++ b/images/icons/contents-ltr.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="40" height="40" viewBox="0 0 40
40">
+ <g fill="#ABABAB">
+ <path d="M2.176 37.586v-6.202c0-.17.113-.298.243-.298h35.16c.135 0
.244.133.244.298v6.202c0 .164-.11.296-.243.296H2.42c-.13
0-.244-.132-.244-.296z"/>
+ <path d="M37.824 16.602v6.207c0 .165-.11.297-.243.297H2.42c-.13
0-.244-.135-.244-.298V16.6c0-.16.113-.296.243-.296h35.16c.135 0
.244.136.244.296z"/>
+ <path d="M2.176 2.355c0-.132.108-.237.236-.237h21.94c.134 0
.236.105.236.237v6.677c0 .133-.103.237-.236.237H2.412c-.13
0-.236-.105-.236-.238V2.355z"/>
+ </g>
+</svg>
diff --git a/images/icons/edit.svg b/images/icons/edit.svg
new file mode 100644
index 0000000..66f0fce
--- /dev/null
+++ b/images/icons/edit.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 -410 2048 2048" width="24"
height="24">
+ <g id="g4">
+ <path d="M307.05 1073.838q32.507 22.505 97.522 87.52L1659.846
26.107q-33.757-60.013-101.272-82.518zm-135.03-51.26L1563.576-225.197q156.284
26.256 276.31 155.034Q1959.91 58.616 1968.663 217.4L575.858 1470.177l-515.112
55.012z" id="path6" fill="#777"/>
+ </g>
+</svg>
diff --git a/images/icons/editLocked.svg b/images/icons/editLocked.svg
new file mode 100644
index 0000000..74c750c
--- /dev/null
+++ b/images/icons/editLocked.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 -410 2048 2048" width="24"
height="24" fill="#777">
+ <g id="g4">
+ <path d="M1670.264-159.32q-108.757 0-108.757 124.825l1.236
109.993h216.278l-1.235-109.993q1.236-124.824-107.52-124.824zm0-144.596q102.577
0 171.787 77.86 69.21 77.86 69.21
190.324v111.23h108.757v484.46h-699.504V75.5h109.993V-36.968q0-112.464
69.21-189.09 69.208-76.623 170.55-77.86zm-469.632 984.992h170.55l-795.9
716.807-510.417 55.614L173.622 955.44l1027.01-918.254v164.37l-892.3
805.79q32.132 22.245 96.398 86.51l795.902-719.277v306.495z" id="path6"
fill="#777"/>
+ </g>
+</svg>
diff --git a/images/icons/editSourceNormal.svg
b/images/icons/editSourceNormal.svg
new file mode 100644
index 0000000..e4d3c9b
--- /dev/null
+++ b/images/icons/editSourceNormal.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 32 32"
enable-background="new 0 0 40 40">
+ <g fill="#575757">
+ <path d="M22.496
11.403c-.057-1.1-.57-2.167-1.328-3.01-.776-.865-1.84-1.53-2.99-1.717l-14.825
13.3.01.006-.008-.004-1.188 5.346
5.48-.604.002.003.003-.003h.006l-.003-.004c2.963-2.657 11.472-10.293
14.84-13.313zM6.056 21.528c-.42-.423-.778-.683-1.27-1.02l13.316-12.04c.45.14
1.073.502 1.264 1.022L6.056 21.528zM21.61
17.58v1.317h-1.435v8.09h1.435V28.3h-3.104v-10.72h3.104zm5.12
10.72v-1.315h1.434v-8.09H26.73V17.58h3.103V28.3H26.73z"/>
+ </g>
+</svg>
diff --git a/images/icons/editToggle.svg b/images/icons/editToggle.svg
new file mode 100644
index 0000000..d2a0350
--- /dev/null
+++ b/images/icons/editToggle.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="639.614" height="415.001"
viewBox="2.5 791.5 639.61402 415.00101" enable-background="new 2.5 791.5
606.667 606.667">
+ <path d="M417.5
1037.04v-76.08l-46.687-7.783c-3.46-12.536-8.646-24.64-14.7-35.447l27.236-38.474-53.605-54.037-38.475
27.234c-11.238-6.053-22.91-11.24-35.447-14.7L248.04 791.5h-76.08l-7.783
46.688c-12.536 3.458-24.64 8.646-35.447 14.698l-38.474-27.234-54.037 53.604
27.234 38.474c-6.053 11.24-11.24 22.91-14.7 35.88L2.5 960.96v76.082l46.255
7.782c3.458 12.536 8.646 24.64 14.7 35.88l-27.236 38.474 53.603 53.605
38.474-27.235c11.24 6.052 22.91 11.24 35.88 14.697l7.782
46.256h76.08l7.783-46.686c12.536-3.46 24.64-8.646 35.447-14.7l38.475 27.236
53.604-53.604-27.236-38.475c6.053-11.237 11.24-22.91
14.7-35.88l46.686-7.35zm-207.5 41.5c-44.094 0-79.54-35.878-79.54-79.54 0-44.094
35.878-79.54 79.54-79.54 43.662 0 79.54 35.446 79.54 79.54 0 44.095-35.445
79.54-79.54 79.54z" id="path4" fill="#555"/>
+ <path d="M574.97 1059.195L642.114 944.6H507.807z" id="path6"
fill="#414141" fill-rule="evenodd"/>
+</svg>
diff --git a/images/icons/editVeNormal.svg b/images/icons/editVeNormal.svg
new file mode 100644
index 0000000..5f7d6fc
--- /dev/null
+++ b/images/icons/editVeNormal.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 32 32"
enable-background="new 0 0 40 40">
+ <path d="M26.164
11.403c-.057-1.1-.57-2.167-1.328-3.01-.776-.865-1.84-1.53-2.99-1.717l-14.825
13.3.01.006-.007-.004-1.188 5.346
5.48-.604.002.003.004-.003h.007l-.002-.004c2.963-2.657 11.472-10.293
14.84-13.313zM9.724 21.528c-.42-.423-.778-.683-1.27-1.02L21.77 8.468c.45.14
1.073.502 1.264 1.022L9.724 21.528z" fill="#575757"/>
+</svg>
diff --git a/images/icons/gray-triangle.svg b/images/icons/gray-triangle.svg
new file mode 100644
index 0000000..0c304ff
--- /dev/null
+++ b/images/icons/gray-triangle.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="80" height="80" viewBox="0 0 80
80">
+ <path fill="#ccc" d="M1.092 73.695l38.906-67.39 38.91 67.39z"/>
+ <path fill="#fff" d="M43.528
57.71v7.104h-6.83V57.71h6.83zm-2.03-5.908h-3.275L36.47
39.55v-7.86h6.827v7.858l-1.8 12.254z"/>
+</svg>
diff --git a/images/icons/hamburger.svg b/images/icons/hamburger.svg
new file mode 100644
index 0000000..60e068a
--- /dev/null
+++ b/images/icons/hamburger.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"; width="48" height="48" viewBox="0 0 48
48">
+ <path d="M46 5.432v7.133c0 .242-.148.435-.328.435H2.328C2.153 13 2 12.803
2 12.565V5.432C2 5.198 2.153 5 2.328 5h43.344c.18 0 .328.198.328.432zm0
30v7.133c0 .242-.148.435-.328.435H2.328C2.153 43 2 42.803 2
42.565v-7.133c0-.234.153-.432.328-.432h43.344c.18 0
.328.198.328.432zm0-15v7.133c0 .242-.148.435-.328.435H2.328C2.153 28 2 27.803 2
27.565v-7.133c0-.234.153-.432.328-.432h43.344c.18 0 .328.198.328.432z"
fill="#565656"/>
+</svg>
diff --git a/less/images/icons/magnifying-glass.svg
b/images/icons/magnifying-glass.svg
similarity index 71%
rename from less/images/icons/magnifying-glass.svg
rename to images/icons/magnifying-glass.svg
index 9c982b2..edc0656 100644
--- a/less/images/icons/magnifying-glass.svg
+++ b/images/icons/magnifying-glass.svg
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24 24"
enable-background="new 0 0 612 792">
- <path d="M3.065 16.536c1.765 1.766 4.073 2.732 6.583 2.732 2.187 0
4.25-.744 5.913-2.112l6.76 6.112s1.517-.398 1.89-2.086l-6.78-6.135c2.384-3.63
1.963-8.498-1.194-11.655C14.47 1.626 12.162.66 9.676.66c-2.487 0-4.822.97-6.584
2.71-3.656 3.647-3.63 9.537-.027
13.166zm1.54-11.11c.073-.1.175-.198.272-.272C6.17 3.887 7.86 3.166 9.672
3.166c1.812 0 3.504.72 4.794 1.988 2.635 2.635 2.66 6.934-.023 9.593-1.29
1.29-2.982 1.988-4.795 1.988-1.812
0-3.504-.72-4.794-1.988-2.534-2.534-2.66-6.634-.25-9.32z" id="path4"
fill="#555"/>
+ <path d="M3.065 16.536c1.765 1.766 4.073 2.732 6.583 2.732 2.187 0
4.25-.744 5.913-2.112l6.76 6.112s1.518-.398 1.89-2.086l-6.78-6.135c2.385-3.63
1.964-8.498-1.193-11.655C14.47 1.626 12.162.66 9.677.66c-2.488 0-4.823.97-6.585
2.71-3.656 3.647-3.63 9.537-.027
13.166zm1.54-11.11c.073-.1.175-.198.272-.272C6.17 3.887 7.86 3.166 9.672
3.166c1.812 0 3.504.72 4.794 1.988 2.635 2.635 2.66 6.934-.023 9.593-1.29
1.29-2.982 1.988-4.795 1.988-1.812
0-3.504-.72-4.794-1.988-2.534-2.534-2.66-6.634-.25-9.32z" id="path4"
fill="#555"/>
</svg>
diff --git a/images/icons/talk.svg b/images/icons/talk.svg
new file mode 100644
index 0000000..2d62924
--- /dev/null
+++ b/images/icons/talk.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 -410 2389.3333 2048"
width="28" height="24">
+ <g id="g4">
+ <path d="M810.916 313.59H2156.2v921.255l234.732
262.495h-1431.1q-103.484
0-137.558-93.388-11.358-31.55-11.358-55.528V313.59zM244.28-189.945h1347.81v384.908H691.027v798.842H8.287l235.994-263.757v-919.993z"
id="path6" fill="#777"/>
+ </g>
+</svg>
diff --git a/images/icons/upload.svg b/images/icons/upload.svg
new file mode 100644
index 0000000..7759a39
--- /dev/null
+++ b/images/icons/upload.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 -410 2389.3333 2048"
width="28" height="24">
+ <g id="g4">
+ <path
d="M1848.16-352.484h209.285V-24.48h331.674v200.717h-331.675v341.466H1848.16V176.237h-329.226V-24.48h329.226v-328.004zm-630.303
1506.608l-450.39-472.42-72.21 30.596-476.093 621.736
1611.863-1.224-368.39-324.33zM17.22
1539.65V-22.035H1389.2v326.78h329.227V633.97h330.45v905.68H17.22z" id="path6"
fill="#777"/>
+ </g>
+</svg>
diff --git a/images/icons/uploadLocked.svg b/images/icons/uploadLocked.svg
new file mode 100644
index 0000000..8a05b4f
--- /dev/null
+++ b/images/icons/uploadLocked.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 -410 2390.5 2047.9999"
width="28" height="24">
+ <g id="g4">
+ <path
d="M2157.676-3.692q0-123.588-106.458-123.588T1944.76-3.692v108.905h212.915V-3.692zm-106.458-265.533q77.09-1.223
138.273 47.722 107.682 85.656 100.34
291.23v35.485h106.46v477.224h-690.142V105.212h102.787q-1.223-138.273
20.802-208.02 22.026-69.75 83.208-118.695 61.183-48.946
138.273-47.722zm-215.363 1509.987v-1.223l-368.32-323.045-244.73 144.39L772.5
589.78l-73.42 29.367-476 621.615h1612.773zM21.178
1447.56V-113.82h1687.417q-18.355 45.275-19.578
94.22h-107.68v725.627h472.33v741.534H21.178z" id="path6" fill="#777"/>
+ </g>
+</svg>
diff --git a/images/icons/userAnonymous.svg b/images/icons/userAnonymous.svg
new file mode 100644
index 0000000..2312309
--- /dev/null
+++ b/images/icons/userAnonymous.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 16 16"
enable-background="new 0 0 960 560">
+ <path enable-background="new" d="M2.112 0C.117 0 0 1.932 0
1.994V16h13.888C15.883 16 16 14.068 16 14.006V0H2.112zm.426 4.89s.726.726
2.295.726l2.233-.726c0 1.026-1.027 1.81-2.295 1.81S2.54 5.918 2.54 4.89zm8.935
6.517c-.543.3-1.148.542-1.81.726-.544.12-1.15.18-1.754.18-.727
0-1.39-.122-2.054-.3-.605-.18-1.206-.422-1.69-.727-.3-.18-.42-.605-.18-.905.18-.3.606-.42.907-.178.363.242.847.42
1.327.542 1.027.3 2.174.3 3.2.058.544-.12 1.028-.3
1.45-.542.3-.18.725-.058.905.242.125.305.004.726-.3.905zM11.415 6.7c-1.27
0-2.295-.846-2.295-1.81 0 0 .726.726 2.295.726l2.233-.726c.063 1.026-.964
1.81-2.233 1.81z" fill="#e7beba"/>
+</svg>
diff --git a/images/icons/userNormal.svg b/images/icons/userNormal.svg
new file mode 100644
index 0000000..7fc6aa9
--- /dev/null
+++ b/images/icons/userNormal.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="271.5 72.8 16 16"
enable-background="new 271.5 72.8 437.1 431.8">
+ <g>
+ <path d="M273.59 72.8c-2.03 0-2.09 1.907-2.09 2.032V88.8h13.91c2.03 0
2.09-1.907 2.09-2.032V72.8h-13.91z" fill="#d0d0d0"/>
+ <g fill="#fff" transform="matrix(.042 0 0 .042 259.047 68.752)">
+ <circle cx="437" cy="234.1" r="28"/>
+ <circle cx="553.5" cy="234.1" r="28"/>
+ </g>
+ <path d="M279.88 85.338c-1.8
0-3.533-.617-4.583-1.61-.248-.247-.248-.68 0-.927s.68-.247.928 0c.806.807 2.167
1.24 3.654 1.24 1.423 0 2.788-.433 3.59-1.24.248-.247.68-.247.928 0s.248.68 0
.93c-1.113.986-2.722 1.608-4.52 1.608z" fill="#fff"/>
+ </g>
+</svg>
diff --git a/images/icons/watch.svg b/images/icons/watch.svg
new file mode 100644
index 0000000..67e5a72
--- /dev/null
+++ b/images/icons/watch.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24.000001 22.909092"
enable-background="new 0 0 24 24">
+ <g id="g3">
+ <path d="M13.91 10.09L12 6.274l-1.91 3.818-4.226.683 3 3L8.182 18 12
15.955 15.818 18l-.682-4.227 3-3-4.227-.682zM8.317 7.5L12 0l3.682 7.5L24
8.727l-6 5.864 1.364 8.32L12 18.954l-7.364 3.818L6 14.455 0 8.59 8.318 7.5z"
id="path5" fill="#777"/>
+ </g>
+</svg>
diff --git a/images/icons/watched.svg b/images/icons/watched.svg
new file mode 100644
index 0000000..c2fa585
--- /dev/null
+++ b/images/icons/watched.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24 22.915254"
enable-background="new 0 0 24 24">
+ <g id="g3">
+ <path d="M8.407 7.593L12.067 0l3.662 7.593L24 8.813l-5.966 5.83 1.49
8.272-7.456-3.932L4.61 22.78l1.356-8.272L0 8.678l8.407-1.085z" id="path5"
fill="#00af89"/>
+ </g>
+</svg>
diff --git a/includes/Resources.php b/includes/Resources.php
index e370c25..0b57563 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -77,6 +77,53 @@
'less/iconsNew.less',
),
),
+
+ 'skins.minerva.icons.images' => $wgMFResourceFileModuleBoilerplate +
array(
+ 'class' => 'ResourceLoaderImageModule',
+ 'prefix' => 'mw-ui',
+ 'images' => array(
+ // FIXME: ':before' suffix should be configurable in
image module.
+ 'icon' => array(
+ // chrome
+ 'notifications:before' =>
'images/icons/bell.svg',
+ 'mainmenu:before' =>
'images/icons/hamburger.svg',
+ 'search:before' =>
'images/icons/magnifying-glass.svg',
+
+ // toggling
+ 'arrow-down:before' =>
'images/icons/arrow-down.svg',
+ 'arrow-up:before' =>
'images/icons/arrow-up.svg',
+
+ // page actions
+ 'talk:before' => 'images/icons/talk.svg',
+ 'watch:before' => 'images/icons/watch.svg',
+ 'watched:before' => 'images/icons/watched.svg',
+ 'edit:before' => 'images/icons/editLocked.svg',
+ 'edit-enabled:before' =>
'images/icons/edit.svg',
+ 'addimage:before' =>
'images/icons/uploadLocked.svg',
+ 'addimage-enabled:before' =>
'images/icons/upload.svg',
+
+ // Editor
+ 'edit-source:before' =>
'images/icons/editSourceNormal.svg',
+ 'edit-ve:before' =>
'images/icons/editVeNormal.svg',
+ 'edit-switch:before' =>
'images/icons/editToggle.svg',
+
+ // TOC
+ 'toc:before' => 'images/icons/contents-ltr.svg',
+
+ // Issues
+ 'cleanup:before' =>
'images/icons/blue-triangle.svg',
+ // FIXME: make this a variant of cleanup
+ 'cleanup-gray:before' =>
'images/icons/gray-triangle.svg',
+
+ // User
+ 'user:before' => 'images/icons/userNormal.svg',
+ 'anonymous:before' =>
'images/icons/userAnonymous.svg',
+
+ // cite
+ 'citation:before' => 'images/icons/cite.svg',
+ ),
+ ),
+ ),
);
$wgResourceModules = array_merge( $wgResourceModules, array(
diff --git a/includes/skins/SkinMinervaAlpha.php
b/includes/skins/SkinMinervaAlpha.php
index 9e79271..293e6a0 100644
--- a/includes/skins/SkinMinervaAlpha.php
+++ b/includes/skins/SkinMinervaAlpha.php
@@ -20,6 +20,7 @@
$styles = parent::getSkinStyles();
$styles[] = 'mediawiki.ui.icon';
$styles[] = 'skins.minerva.icons.styles';
+ $styles[] = 'skins.minerva.icons.images';
return $styles;
}
diff --git a/less/iconsNew.less b/less/iconsNew.less
index 3190029..a8a447b 100644
--- a/less/iconsNew.less
+++ b/less/iconsNew.less
@@ -88,96 +88,8 @@
}
// FIXME: END
-.mw-ui-icon-toc {
- .m-background-image-svg-quick( 'images/icons/contents-ltr' );
-}
-
-.mw-ui-icon-cleanup {
- .m-background-image-svg-quick( 'images/icons/blue-triangle' );
-}
-
-.mw-ui-icon-cleanup-gray {
- .m-background-image-svg-quick( 'images/icons/gray-triangle' );
-}
-
-.mw-ui-icon-mainmenu {
- .m-background-image-svg-quick( 'images/icons/hamburger' );
-}
-
-.mw-ui-icon-notifications {
- .m-background-image-svg-quick( 'images/icons/bell' );
-}
-
-.mw-ui-icon-user {
- .m-background-image-svg-quick('images/icons/userNormal');
-}
-
-.mw-ui-icon-anonymous {
- .m-background-image-svg-quick('images/icons/userAnonymous');
-}
-
-// no fallback mixin for those SVGs (VE doesn't work on browsers without SVG
-// support anyway)
-.mw-ui-icon-edit-source {
- .m-background-image-svg-quick( 'images/icons/editSourceNormal' );
-}
-
-.mw-ui-icon-edit-ve {
- .m-background-image-svg-quick( 'images/icons/editVeNormal' );
-}
-
-.mw-ui-icon-edit-switch {
- .m-background-image-svg-quick( 'images/icons/editToggle' );
-}
-
-.mw-ui-icon-citation {
- .m-background-image-svg-quick( 'images/icons/cite' );
-}
-
.mw-ui-icon-spinner {
.m-background-image('images/ajax-loader.gif');
-}
-
-// Page action set
-.mw-ui-icon-talk {
- .m-background-image-svg-quick('images/icons/talk');
-}
-
-.mw-ui-icon-watch {
- .m-background-image-svg-quick('images/icons/watch');
-}
-
-.mw-ui-icon-edit {
- .m-background-image-svg-quick('images/icons/editLocked');
-}
-
-.mw-ui-icon-edit-enabled {
- .m-background-image-svg-quick('images/icons/edit');
-}
-
-.mw-ui-icon-watched {
- .m-background-image-svg-quick('images/icons/watched');
-}
-
-.mw-ui-icon-addimage {
- .m-background-image-svg-quick('images/icons/uploadLocked');
-}
-
-.mw-ui-icon-addimage-enabled {
- .m-background-image-svg-quick('images/icons/upload');
-}
-
-// UI set
-.mw-ui-icon-arrow-down {
- .m-background-image-svg-quick('images/icons/arrow-down');
-}
-
-.mw-ui-icon-arrow-up {
- .m-background-image-svg-quick('images/icons/arrow-up');
-}
-
-.mw-ui-icon-search {
- .m-background-image-svg-quick('images/icons/magnifying-glass');
}
// FIXME: Find better workaround for this
diff --git a/less/images/icons/FIXME.txt b/less/images/icons/FIXME.txt
deleted file mode 100644
index 1cd25d8..0000000
--- a/less/images/icons/FIXME.txt
+++ /dev/null
@@ -1 +0,0 @@
-This folder should be generated from a canonical source and shared across all
projects. PNGs should be generated from SVGs.
diff --git a/less/images/icons/arrow-down.png b/less/images/icons/arrow-down.png
deleted file mode 100644
index c24565d..0000000
--- a/less/images/icons/arrow-down.png
+++ /dev/null
Binary files differ
diff --git a/less/images/icons/arrow-down.svg b/less/images/icons/arrow-down.svg
deleted file mode 100644
index 9ff6e43..0000000
--- a/less/images/icons/arrow-down.svg
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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";
- viewBox="0 -410 24 24"
- id="svg2"
- version="1.1"
- inkscape:version="0.48.2 r9819"
- width="100%"
- height="100%"
- sodipodi:docname="arrow-up.svg">
- <metadata
- id="metadata12">
- <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></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs10" />
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1226"
- inkscape:window-height="777"
- id="namedview8"
- showgrid="false"
- inkscape:zoom="7.375"
- inkscape:cx="40.179421"
- inkscape:cy="0.51184962"
- inkscape:window-x="552"
- inkscape:window-y="0"
- inkscape:window-maximized="0"
- inkscape:current-layer="svg2" />
- <g
- transform="matrix(0.01807698,0,0,-0.01807698,-6.4727724,-383.0287)"
- id="g4">
- <path
- d="m 1539,1009 q 52,0 89,-37 l 51,-51 -656,-656 -654,655 51,52 q 36,38
88,38 52,0 89,-37 l 427,-426 426,425 q 37,37 89,37 z"
- id="path6"
- inkscape:connector-curvature="0"
- style="fill:currentColor" />
- </g>
-</svg>
diff --git a/less/images/icons/arrow-up.png b/less/images/icons/arrow-up.png
deleted file mode 100644
index c24565d..0000000
--- a/less/images/icons/arrow-up.png
+++ /dev/null
Binary files differ
diff --git a/less/images/icons/arrow-up.svg b/less/images/icons/arrow-up.svg
deleted file mode 100644
index 30e06a6..0000000
--- a/less/images/icons/arrow-up.svg
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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";
- viewBox="0 -410 24 24"
- id="svg2"
- version="1.1"
- inkscape:version="0.48.2 r9819"
- width="100%"
- height="100%"
- sodipodi:docname="arrow-down.svg">
- <metadata
- id="metadata12">
- <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></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs10" />
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1226"
- inkscape:window-height="777"
- id="namedview8"
- showgrid="false"
- inkscape:zoom="7.375"
- inkscape:cx="40.179421"
- inkscape:cy="0.51184962"
- inkscape:window-x="552"
- inkscape:window-y="0"
- inkscape:window-maximized="0"
- inkscape:current-layer="svg2" />
- <g
- transform="matrix(0.01807698,0,0,0.01807698,-6.4727724,-406.07685)"
- id="g4">
- <path
- d="m 1539,1009 q 52,0 89,-37 l 51,-51 -656,-656 -654,655 51,52 q 36,38
88,38 52,0 89,-37 l 427,-426 426,425 q 37,37 89,37 z"
- id="path6"
- inkscape:connector-curvature="0"
- style="fill:currentColor" />
- </g>
-</svg>
diff --git a/less/images/icons/bell.png b/less/images/icons/bell.png
deleted file mode 100644
index f630986..0000000
--- a/less/images/icons/bell.png
+++ /dev/null
Binary files differ
diff --git a/less/images/icons/bell.svg b/less/images/icons/bell.svg
deleted file mode 100644
index 819f13f..0000000
--- a/less/images/icons/bell.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg"; width="48" height="48"
viewBox="-282.375 419.5 48 48" enable-background="new -282.375 419.5 48 48">
- <path d="M-249.122 464.146h11.915c1.095 0 2.192-.728
2.554-1.703.486-.971.242-2.187-.61-3.041-3.891-4.01-4.739-9.971-5.469-15.682-1.216-8.511-2.554-18.116-14.712-19.334v-1.581c0-1.579-1.213-2.796-2.794-2.796-1.582
0-2.797 1.216-2.797 2.796v1.581c-12.037 1.218-13.375 10.823-14.591 19.334-.85
5.712-1.579 11.673-5.47 15.682-.729.853-.973 1.947-.607 3.041.486.976 1.458
1.703 2.552 1.703h11.671m9.24 3.405c-1.947 0-3.407-1.46-3.528-3.405h7.051c-.119
1.823-1.703 3.405-3.523 3.405zm0-9h-15.443c2.31-4.497 3.041-9.484 3.649-14.105
1.337-9.847 2.431-14.589 11.794-14.589 9.484 0 10.574 4.743 11.915 14.589.605
4.62 1.337 9.606 3.646 14.105h-15.561z" id="path4" fill="#555"/>
-</svg>
diff --git a/less/images/icons/blue-triangle.png
b/less/images/icons/blue-triangle.png
deleted file mode 100644
index 30853ef..0000000
--- a/less/images/icons/blue-triangle.png
+++ /dev/null
Binary files differ
diff --git a/less/images/icons/blue-triangle.svg
b/less/images/icons/blue-triangle.svg
deleted file mode 100644
index c454ee1..0000000
--- a/less/images/icons/blue-triangle.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg"; width="80" height="80" viewBox="0 0 80
80">
- <path fill="#36b" d="M1.112 73.678l38.885-67.356 38.892 67.356z"/>
- <path fill="#fff" d="M43.525
57.7v7.103h-6.823v-7.103h6.823zm-2.029-5.905h-3.272l-1.753-12.245v-7.854h6.824v7.854l-1.799
12.245z"/>
-</svg>
diff --git a/less/images/icons/cite.png b/less/images/icons/cite.png
deleted file mode 100644
index 1e174ec..0000000
--- a/less/images/icons/cite.png
+++ /dev/null
Binary files differ
diff --git a/less/images/icons/cite.svg b/less/images/icons/cite.svg
deleted file mode 100644
index ab3fedb..0000000
--- a/less/images/icons/cite.svg
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
-
-<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"
- id="Layer_1"
- x="0px"
- y="0px"
- width="24"
- height="29.142857"
- viewBox="0 0 12 14.571428"
- enable-background="new 0 0 24 24"
- xml:space="preserve"
- inkscape:version="0.48.5 r10040"
- sodipodi:docname="cite.svg"><metadata
- id="metadata13"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage";
/></cc:Work></rdf:RDF></metadata><defs
- id="defs11" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="751"
- id="namedview9"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:zoom="4.9166667"
- inkscape:cx="14.20339"
- inkscape:cy="17.59322"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="1"
- inkscape:current-layer="Layer_1" /><g
- id="g3"
- transform="matrix(0.85714286,0,0,0.85714286,-4.2857143,-3.4285714)"><path
- d="m 14,12 -2,-2 -2,2 V 6 H 8 v 13 h 8 c 0,0 1,0 1,-1 V 6 h -3 v 6 z"
- id="path5"
- inkscape:connector-curvature="0"
- style="fill:none" /><path
- d="m 5,4 v 17 h 12 c 1,0 2,-1 2,-2 V 4 H 5 z m 12,14 c 0,1 -1,1 -1,1 H
8 V 6 h 2 v 6 l 2,-2 2,2 V 6 h 3 v 12 z"
- id="path7"
- inkscape:connector-curvature="0"
- style="fill:#575757" /></g></svg>
\ No newline at end of file
diff --git a/less/images/icons/contents-ltr.png
b/less/images/icons/contents-ltr.png
deleted file mode 100644
index 43538cf..0000000
--- a/less/images/icons/contents-ltr.png
+++ /dev/null
Binary files differ
diff --git a/less/images/icons/contents-ltr.svg
b/less/images/icons/contents-ltr.svg
deleted file mode 100644
index 69e2b55..0000000
--- a/less/images/icons/contents-ltr.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg"; width="40" height="40" viewBox="0 0 40
40">
- <g fill="#ABABAB">
- <path d="M2.176 37.586v-6.202c0-.171.113-.298.243-.298h35.162c.134 0
.243.133.243.298v6.202c0 .164-.11.296-.243.296h-35.162c-.13
0-.243-.132-.243-.296z"/>
- <path d="M37.824 16.602v6.207c0 .166-.11.298-.243.298h-35.162c-.13
0-.243-.135-.243-.298v-6.207c0-.16.113-.296.243-.296h35.162c.134 0
.243.136.243.296z"/>
- <path d="M2.176 2.355c0-.132.108-.237.236-.237h21.94c.134 0
.236.105.236.237v6.677c0 .133-.103.237-.236.237h-21.94c-.13
0-.236-.104-.236-.237v-6.677z"/>
- </g>
-</svg>
diff --git a/less/images/icons/edit.png b/less/images/icons/edit.png
deleted file mode 100644
index fc59f1e..0000000
--- a/less/images/icons/edit.png
+++ /dev/null
Binary files differ
diff --git a/less/images/icons/edit.svg b/less/images/icons/edit.svg
deleted file mode 100644
index b041b1e..0000000
--- a/less/images/icons/edit.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 -410 2048 2048" width="24"
height="24">
- <g id="g4">
- <path d="M307.05 1073.838q32.507 22.505 97.522
87.519l1255.274-1135.249q-33.757-60.013-101.272-82.518zm-135.029-51.261l1391.554-1247.773q156.284
26.256 276.31 155.034 120.026 128.778 128.778 287.563l-1392.805
1252.775-515.112 55.012z" id="path6" fill="#777"/>
- </g>
-</svg>
diff --git a/less/images/icons/editLocked.png b/less/images/icons/editLocked.png
deleted file mode 100644
index 3e6183c..0000000
--- a/less/images/icons/editLocked.png
+++ /dev/null
Binary files differ
diff --git a/less/images/icons/editLocked.svg b/less/images/icons/editLocked.svg
deleted file mode 100644
index 511f4af..0000000
--- a/less/images/icons/editLocked.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 -410 2048 2048" width="24"
height="24" fill="#777">
- <g id="g4">
- <path d="M1670.264-159.319q-108.757 0-108.757 124.824l1.236
109.993h216.278l-1.236-109.993q1.236-124.824-107.521-124.824zm0-144.597q102.577
0 171.787 77.86 69.209 77.86 69.209
190.324v111.229h108.757v484.462h-699.504v-484.462h109.993v-112.464q0-112.464
69.209-189.089 69.209-76.624 170.551-77.86zm-469.632 984.992h170.551l-795.902
716.807-510.416 55.614 108.757-498.057 1027.011-918.254v164.371l-892.301
805.789q32.132 22.245 96.398 86.511l795.902-719.278v306.496z" id="path6"
fill="#777"/>
- </g>
-</svg>
diff --git a/less/images/icons/editSourceNormal.png
b/less/images/icons/editSourceNormal.png
deleted file mode 100644
index c9ce1d9..0000000
--- a/less/images/icons/editSourceNormal.png
+++ /dev/null
Binary files differ
diff --git a/less/images/icons/editSourceNormal.svg
b/less/images/icons/editSourceNormal.svg
deleted file mode 100644
index 163b45a..0000000
--- a/less/images/icons/editSourceNormal.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 32 32"
enable-background="new 0 0 40 40">
- <g fill="#575757">
- <path d="M22.496
11.403c-.057-1.1-.571-2.167-1.328-3.01-.776-.865-1.841-1.529-2.989-1.717l-14.826
13.3.01.006-.008-.004-1.188 5.346
5.481-.604.001.003.004-.003.006-.001-.002-.003c2.963-2.657 11.472-10.293
14.839-13.313zm-16.439
10.125c-.422-.423-.779-.683-1.271-1.02l13.316-12.04c.45.139 1.073.502 1.264
1.022l-13.309
12.038zm15.553-3.947v1.316h-1.435v8.089h1.435v1.316h-3.104v-10.72h3.104zm5.119
10.72v-1.316h1.435v-8.089h-1.435v-1.316h3.104v10.72h-3.104z"/>
- </g>
-</svg>
diff --git a/less/images/icons/editToggle.png b/less/images/icons/editToggle.png
deleted file mode 100644
index 764a545..0000000
--- a/less/images/icons/editToggle.png
+++ /dev/null
Binary files differ
diff --git a/less/images/icons/editToggle.svg b/less/images/icons/editToggle.svg
deleted file mode 100644
index de1344e..0000000
--- a/less/images/icons/editToggle.svg
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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";
- width="639.61401"
- height="415.00101"
- viewBox="2.5 791.5 639.61402 415.00101"
- enable-background="new 2.5 791.5 606.667 606.667"
- id="svg2"
- version="1.1"
- inkscape:version="0.48.5 r10040"
- sodipodi:docname="editToggle.svg">
- <metadata
- id="metadata12">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs10" />
- <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="namedview8"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:zoom="0.38588235"
- inkscape:cx="329"
- inkscape:cy="209.6675"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="0"
- inkscape:current-layer="svg2" />
- <path
- d="m 417.5,1037.041 v -76.082 l -46.687,-7.782 c -3.46,-12.536
-8.646,-24.64 -14.699,-35.447 l 27.235,-38.474 -53.604,-54.037 -38.475,27.235 c
-11.238,-6.053 -22.911,-11.24 -35.447,-14.699 L 248.041,791.5 h -76.082 l
-7.782,46.688 c -12.536,3.458 -24.64,8.646 -35.447,14.698 L 90.256,825.652
36.219,879.256 63.454,917.73 c -6.053,11.239 -11.24,22.911 -14.699,35.88 l
-46.2550005,7.35 v 76.082 L 48.755,1044.824 c 3.458,12.536 8.646,24.64
14.699,35.88 l -27.235,38.474 53.604,53.605 38.474,-27.235 c 11.24,6.052
22.911,11.239 35.88,14.697 l 7.782,46.256 h 76.082 l 7.782,-46.687 c
12.536,-3.46 24.64,-8.646 35.447,-14.699 l 38.475,27.235 53.604,-53.604
-27.235,-38.475 c 6.053,-11.238 11.239,-22.911 14.699,-35.88 l 46.687,-7.35 z m
-207.5,41.5 c -44.094,0 -79.541,-35.879 -79.541,-79.541 0,-44.094
35.879,-79.541 79.541,-79.541 43.662,0 79.541,35.447 79.541,79.541 0,44.095
-35.446,79.541 -79.541,79.541 z"
- id="path4"
- inkscape:connector-curvature="0"
- style="fill:#555555" />
- <path
- d="M 574.97,1059.195 642.114,944.6 H 507.807 z"
- id="path6"
- inkscape:connector-curvature="0"
- style="fill:#414141;fill-rule:evenodd" />
-</svg>
diff --git a/less/images/icons/editVeNormal.png
b/less/images/icons/editVeNormal.png
deleted file mode 100644
index 56282f6..0000000
--- a/less/images/icons/editVeNormal.png
+++ /dev/null
Binary files differ
diff --git a/less/images/icons/editVeNormal.svg
b/less/images/icons/editVeNormal.svg
deleted file mode 100644
index e33aaa8..0000000
--- a/less/images/icons/editVeNormal.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 32 32"
enable-background="new 0 0 40 40">
- <path d="M26.164
11.403c-.057-1.1-.571-2.167-1.328-3.01-.776-.865-1.841-1.529-2.989-1.717l-14.826
13.3.01.006-.008-.004-1.188 5.346
5.481-.604.001.003.004-.003.006-.001-.002-.003c2.963-2.657 11.472-10.293
14.839-13.313zm-16.439
10.125c-.422-.423-.779-.683-1.271-1.02l13.316-12.04c.45.139 1.073.502 1.264
1.022l-13.309 12.038z" fill="#575757"/>
-</svg>
diff --git a/less/images/icons/gray-triangle.png
b/less/images/icons/gray-triangle.png
deleted file mode 100644
index 93edb39..0000000
--- a/less/images/icons/gray-triangle.png
+++ /dev/null
Binary files differ
diff --git a/less/images/icons/gray-triangle.svg
b/less/images/icons/gray-triangle.svg
deleted file mode 100644
index 6494ae9..0000000
--- a/less/images/icons/gray-triangle.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg"; width="80" height="80" viewBox="0 0 80
80">
- <path fill="#ccc" d="M1.092 73.695l38.906-67.39 38.91 67.39z"/>
- <path fill="#fff" d="M43.528
57.71v7.104h-6.829v-7.104h6.829zm-2.03-5.908h-3.275l-1.754-12.253v-7.859h6.828v7.858l-1.799
12.254z"/>
-</svg>
diff --git a/less/images/icons/hamburger.png b/less/images/icons/hamburger.png
deleted file mode 100644
index a3fcf4f..0000000
--- a/less/images/icons/hamburger.png
+++ /dev/null
Binary files differ
diff --git a/less/images/icons/hamburger.svg b/less/images/icons/hamburger.svg
deleted file mode 100644
index b1477b6..0000000
--- a/less/images/icons/hamburger.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg"; width="48" height="48" viewBox="0 0 48
48">
- <path d="M46 5.432v7.133c0 .242-.148.435-.328.435h-43.344c-.175
0-.328-.197-.328-.435v-7.133c0-.234.153-.432.328-.432h43.344c.18 0
.328.198.328.432zm0 30v7.133c0 .242-.148.435-.328.435h-43.344c-.175
0-.328-.197-.328-.435v-7.133c0-.234.153-.432.328-.432h43.344c.18 0
.328.198.328.432zm0-15v7.133c0 .242-.148.435-.328.435h-43.344c-.175
0-.328-.197-.328-.435v-7.133c0-.234.153-.432.328-.432h43.344c.18 0
.328.198.328.432z" fill="#565656"/>
-</svg>
diff --git a/less/images/icons/magnifying-glass.png
b/less/images/icons/magnifying-glass.png
deleted file mode 100644
index 46dd94b..0000000
--- a/less/images/icons/magnifying-glass.png
+++ /dev/null
Binary files differ
diff --git a/less/images/icons/talk.png b/less/images/icons/talk.png
deleted file mode 100644
index 0d6a600..0000000
--- a/less/images/icons/talk.png
+++ /dev/null
Binary files differ
diff --git a/less/images/icons/talk.svg b/less/images/icons/talk.svg
deleted file mode 100644
index 71a2f0f..0000000
--- a/less/images/icons/talk.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 -410 2389.3333 2048"
width="28" height="24">
- <g id="g4">
- <path d="M810.916 313.59h1345.285v921.255l234.731
262.495h-1431.101q-103.483
0-137.557-93.388-11.358-31.55-11.358-55.528v-1034.835zm-566.635-503.535h1347.809v384.908h-901.063v798.842h-682.739l235.993-263.757v-919.993z"
id="path6" fill="#777"/>
- </g>
-</svg>
diff --git a/less/images/icons/upload.png b/less/images/icons/upload.png
deleted file mode 100644
index 8367009..0000000
--- a/less/images/icons/upload.png
+++ /dev/null
Binary files differ
diff --git a/less/images/icons/upload.svg b/less/images/icons/upload.svg
deleted file mode 100644
index 50df291..0000000
--- a/less/images/icons/upload.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 -410 2389.3333 2048"
width="28" height="24">
- <g id="g4">
- <path
d="M1848.16-352.484h209.285v328.003h331.674v200.718h-331.674v341.466h-209.285v-341.466h-329.226v-200.718h329.226v-328.003zm-630.303
1506.608l-450.391-472.421-72.209 30.597-476.093 621.736
1611.863-1.224-368.391-324.33zm-1200.636
385.525v-1561.683h1371.98v326.779h329.226v329.226h330.45v905.679h-2031.657z"
id="path6" fill="#777"/>
- </g>
-</svg>
diff --git a/less/images/icons/uploadLocked.png
b/less/images/icons/uploadLocked.png
deleted file mode 100644
index 02337b2..0000000
--- a/less/images/icons/uploadLocked.png
+++ /dev/null
Binary files differ
diff --git a/less/images/icons/uploadLocked.svg
b/less/images/icons/uploadLocked.svg
deleted file mode 100644
index 3917e63..0000000
--- a/less/images/icons/uploadLocked.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 -410 2390.5 2047.9999"
width="28" height="24">
- <g id="g4">
- <path d="M2157.676-3.692q0-123.588-106.458-123.588t-106.458
123.588v108.905h212.915v-108.905zm-106.458-265.533q77.091-1.223 138.273 47.722
107.681 85.656 100.34
291.229v35.486h106.458v477.224h-690.141v-477.224h102.787q-1.223-138.273
20.802-208.021 22.026-69.749 83.208-118.694 61.183-48.946
138.273-47.722zm-215.363 1509.987v-1.223l-368.32-323.044-244.73
144.391-450.305-471.106-73.42 29.367-476.001 621.615h1612.774zm-1814.677
206.798v-1561.381h1687.417q-18.355 45.276-19.578
94.221h-107.681v725.627h472.33v741.534h-2032.487z" id="path6" fill="#777"/>
- </g>
-</svg>
diff --git a/less/images/icons/userAnonymous.png
b/less/images/icons/userAnonymous.png
deleted file mode 100644
index ce67f88..0000000
--- a/less/images/icons/userAnonymous.png
+++ /dev/null
Binary files differ
diff --git a/less/images/icons/userAnonymous.svg
b/less/images/icons/userAnonymous.svg
deleted file mode 100644
index ade9e0e..0000000
--- a/less/images/icons/userAnonymous.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 16 16"
enable-background="new 0 0 960 560">
- <path enable-background="new" d="M2.112 0c-1.995 0-2.112 1.932-2.112
1.994v14.006h13.888c1.995 0 2.112-1.932 2.112-1.994v-14.006h-13.888zm.426
4.89s.726.726 2.295.726l2.233-.726c0 1.026-1.027 1.811-2.295 1.811-1.269
0-2.233-.784-2.233-1.811zm8.935
6.517c-.543.3-1.148.542-1.811.726-.543.121-1.148.179-1.753.179-.726
0-1.39-.121-2.053-.3-.605-.179-1.206-.421-1.69-.726-.3-.179-.421-.605-.179-.905.179-.3.605-.421.906-.179.363.242.847.421
1.327.542 1.027.3 2.174.3 3.201.058.543-.121 1.027-.3
1.448-.542.3-.179.726-.058.906.242.125.305.004.726-.3.905zm-.058-4.706c-1.269
0-2.295-.847-2.295-1.811 0 0 .726.726 2.295.726l2.233-.726c.063 1.026-.964
1.811-2.233 1.811z" fill="#e7beba"/>
-</svg>
diff --git a/less/images/icons/userNormal.png b/less/images/icons/userNormal.png
deleted file mode 100644
index 7f0b0e4..0000000
--- a/less/images/icons/userNormal.png
+++ /dev/null
Binary files differ
diff --git a/less/images/icons/userNormal.svg b/less/images/icons/userNormal.svg
deleted file mode 100644
index 252a47e..0000000
--- a/less/images/icons/userNormal.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg"; viewBox="271.5 72.8 16 16"
enable-background="new 271.5 72.8 437.1 431.8">
- <g>
- <path d="M273.591 72.8c-2.032 0-2.091 1.907-2.091
2.032v13.968h13.909c2.032 0 2.091-1.907 2.091-2.032v-13.968h-13.909z"
fill="#d0d0d0"/>
- <g fill="#fff" transform="matrix(.042 0 0 .042 259.047 68.752)">
- <circle cx="437" cy="234.1" r="28"/>
- <circle cx="553.5" cy="234.1" r="28"/>
- </g>
- <path d="M279.879 85.338c-1.798
0-3.532-.617-4.582-1.609-.248-.248-.248-.68 0-.928s.68-.248.928 0c.806.806
2.167 1.239 3.654 1.239 1.424 0 2.789-.433 3.591-1.239.248-.248.68-.248.928
0s.248.68 0 .928c-1.113.987-2.722 1.609-4.519 1.609z" fill="#fff"/>
- </g>
-</svg>
diff --git a/less/images/icons/watch.png b/less/images/icons/watch.png
deleted file mode 100644
index e10a36d..0000000
--- a/less/images/icons/watch.png
+++ /dev/null
Binary files differ
diff --git a/less/images/icons/watch.svg b/less/images/icons/watch.svg
deleted file mode 100644
index 3ec63fb..0000000
--- a/less/images/icons/watch.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
-
-<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"
- id="Layer_1"
- x="0px"
- y="0px"
- viewBox="0 0 24.000001 22.909092"
- enable-background="new 0 0 24 24"
- xml:space="preserve"
- inkscape:version="0.48.5 r10040"
- width="100%"
- height="100%"
- sodipodi:docname="watch.svg"><metadata
- id="metadata11"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage";
/></cc:Work></rdf:RDF></metadata><defs
- id="defs9" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="751"
- id="namedview7"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:zoom="9.8333333"
- inkscape:cx="8.7999999"
- inkscape:cy="7.1998957"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="1"
- inkscape:current-layer="Layer_1" /><g
- transform="matrix(1.3636364,0,0,-1.3636364,-4.3636365,2230.3637)"
- id="g3"><path
- d="m 13.4,1628.2 -1.4,2.8 -1.4,-2.8 -3.1,-0.5 2.2,-2.2 -0.5,-3.1
2.8,1.5 2.8,-1.5 -0.5,3.1 2.2,2.2 -3.1,0.5 z m -4.1,1.9 2.7,5.5 2.7,-5.5
6.1,-0.9 -4.4,-4.3 1,-6.1 -5.4,2.9 -5.4,-2.8 1,6.1 -4.4,4.3 6.1,0.8 z"
- id="path5"
- inkscape:connector-curvature="0"
- style="fill:#777777" /></g></svg>
\ No newline at end of file
diff --git a/less/images/icons/watched.png b/less/images/icons/watched.png
deleted file mode 100644
index 4e5fc7c..0000000
--- a/less/images/icons/watched.png
+++ /dev/null
Binary files differ
diff --git a/less/images/icons/watched.svg b/less/images/icons/watched.svg
deleted file mode 100644
index 91c98e8..0000000
--- a/less/images/icons/watched.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
-
-<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"
- id="Layer_1"
- x="0px"
- y="0px"
- viewBox="0 0 24 22.915254"
- enable-background="new 0 0 24 24"
- xml:space="preserve"
- inkscape:version="0.48.5 r10040"
- width="100%"
- height="100%"
- sodipodi:docname="watched.svg"><metadata
- id="metadata11"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage";
/></cc:Work></rdf:RDF></metadata><defs
- id="defs9" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1280"
- inkscape:window-height="751"
- id="namedview7"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:zoom="13.906433"
- inkscape:cx="5.3816677"
- inkscape:cy="10.064073"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="1"
- inkscape:current-layer="Layer_1" /><g
- transform="matrix(1.3559322,0,0,-1.3559322,-4.2033898,2217.8983)"
- id="g3"><path
- d="m 9.3,1630.1 2.7,5.6 2.7,-5.6 6.1,-0.9 -4.4,-4.3 1.1,-6.1 -5.5,2.9
-5.5,-2.8 1,6.1 -4.4,4.3 6.2,0.8 z"
- id="path5"
- inkscape:connector-curvature="0"
- style="fill:#00af89" /></g></svg>
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/179005
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id483df25946a65351fd3dcec56fa34f7d89b1767
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
