Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222350
Change subject: Add svg logo for wikimedia
......................................................................
Add svg logo for wikimedia
* Also temporailey disable x2 image until updated would be confusing to show
desktop with the wikimedia logo and have phabricator on mobile.
* Svg should take care when x2 is being updated.
Change-Id: Id39605d2be3ecabd8380fafb52f5a8e2a2e04276
---
M resources/celerity/map.php
M webroot/rsrc/css/sprite-menu.css
M webroot/rsrc/image/sprite-menu.png
A webroot/rsrc/image/sprite-menu.svg
4 files changed, 156 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/phabricator/phabricator
refs/changes/50/222350/1
diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 0b9c9b1..ed0d2e2 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,11 +7,7 @@
*/
return array(
'names' => array(
-<<<<<<< HEAD (da55dd update celerity map)
- 'core.pkg.css' => '0e0de087',
-=======
- 'core.pkg.css' => '92a58b45',
->>>>>>> BRANCH (70d5e8 [Redesign] Clean up borders on ObjectItems)
+ 'core.pkg.css' => '75434d03',
'core.pkg.js' => 'a590b451',
'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => 'cf384ffa',
diff --git a/webroot/rsrc/css/sprite-menu.css b/webroot/rsrc/css/sprite-menu.css
index e016540..cca06e0 100644
--- a/webroot/rsrc/css/sprite-menu.css
+++ b/webroot/rsrc/css/sprite-menu.css
@@ -4,10 +4,14 @@
*/
.sprite-menu {
- background-image: url(/rsrc/image/sprite-menu.png);
+ background-image: url('/rsrc/image/sprite-menu.png');
+ /* @embed */
+ background-image: -webkit-linear-gradient(transparent, transparent),
url('/rsrc/image/sprite-menu.svg');
+ /* @embed */
+ background-image: linear-gradient(transparent, transparent),
url('/rsrc/image/sprite-menu.svg');
background-repeat: no-repeat;
}
-
+/* Temporarily disable this until the x2 image is updated
@media
only screen and (min-device-pixel-ratio: 1.5),
only screen and (-webkit-min-device-pixel-ratio: 1.5) {
@@ -16,7 +20,7 @@
background-size: 97px 123px;
}
}
-
+*/
.dark-logo {
background-position: 0px 0px;
diff --git a/webroot/rsrc/image/sprite-menu.png
b/webroot/rsrc/image/sprite-menu.png
index 749951c..6ee6d02 100644
--- a/webroot/rsrc/image/sprite-menu.png
+++ b/webroot/rsrc/image/sprite-menu.png
Binary files differ
diff --git a/webroot/rsrc/image/sprite-menu.svg
b/webroot/rsrc/image/sprite-menu.svg
new file mode 100644
index 0000000..322f346
--- /dev/null
+++ b/webroot/rsrc/image/sprite-menu.svg
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:osb="http://www.openswatchbook.org/uri/2009/osb";
+ 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="121.25"
+ height="153.75"
+ viewBox="0 0 744.09449 1052.3622"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="sprite-menu.svg">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient4552"
+ osb:paint="solid">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop4554" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4544"
+ osb:paint="solid">
+ <stop
+ style="stop-color:#3e485d;stop-opacity:1;"
+ offset="0"
+ id="stop4546" />
+ </linearGradient>
+ <clipPath
+ id="a">
+ <path
+ id="path3439"
+ d="m 178 176 v -364 l -165.8 165.8 l -0.01 132.2 h -24.38 v -132.2 l
-165.8 -165.8 v 364" />
+ </clipPath>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor=""
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.54"
+ inkscape:cx="231.89805"
+ inkscape:cy="38.413628"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1366"
+ inkscape:window-height="705"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
+ inkscape:window-maximized="1" />
+ <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></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <g
+ id="g3415"
+ transform="matrix(1.6043107,0,0,1.6057604,2.1033423,737.2283)"
+ style="fill-opacity:1;opacity:1;fill-rule:nonzero;fill:#3e485d">
+ <path
+ d="m 77.189,0 c 14.212,0 25.73,11.515 25.73,25.732 0,14.204
-11.519,25.729 -25.73,25.729 C 62.978,51.461 51.46,39.937 51.46,25.732
51.46,11.515 62.977,0 77.189,0 Z"
+ id="circle9_2_"
+ inkscape:connector-curvature="0"
+ style="fill-opacity:1;fill-rule:nonzero;fill:#3e485d" />
+ <path
+ d="M 129.139,20.094 114.55,34.681 c 11.796,10.375 19.252,25.576
19.252,42.508 0,31.264 -25.353,56.604 -56.614,56.604 -31.262,0 -56.601,-25.341
-56.601,-56.604 0,-16.929 7.437,-32.133 19.229,-42.508 L 25.251,20.094 C
9.731,34.215 0,54.566 0,77.19 c 0,42.639 34.561,77.189 77.189,77.189 42.641,0
77.191,-34.552 77.191,-77.189 0,-22.623 -9.736,-42.975 -25.241,-57.096 z"
+ id="path11_2_"
+ inkscape:connector-curvature="0"
+ style="fill-opacity:1;fill-rule:nonzero;fill:#3e485d" />
+ <g
+ id="g13_2_"
+ style="fill-opacity:1;fill-rule:nonzero;fill:#3e485d">
+ <path
+ d="m 107.255,41.979 -24.922,24.919 0,56.306 c 23.155,-2.559
41.176,-22.177 41.176,-46.024 0,-14.09 -6.318,-26.708 -16.254,-35.201 z"
+ id="path15_2_"
+ inkscape:connector-curvature="0"
+ style="fill-opacity:1;fill-rule:nonzero;fill:#3e485d" />
+ <path
+ d="M 72.041,66.898 47.113,41.979 c -9.929,8.493 -16.241,21.111
-16.241,35.202 0,23.847 18.011,43.475 41.169,46.024 l 0,-56.307 0,0 z"
+ id="path17_2_"
+ inkscape:connector-curvature="0"
+ style="fill-opacity:1;fill-rule:nonzero;fill:#3e485d" />
+ </g>
+ </g>
+ <path
+ id="path3441"
+ d="m 692.04194,62.988375 25.48618,0 37.46968,194.723715 -23.9671,0
-6.75131,-36.4651 -38.98873,0 -6.75127,36.4651 -24.13591,0 z m
-0.84392,123.616745 27.00521,0 -13.50259,-75.11813 z M 621.82848,66.2702 l
22.11049,0 0,191.44189 -22.11049,0 z m -104.81384,0 33.41889,0 c 18.05971,0
31.89989,8.022334 40.84535,23.702321 9.11424,16.044669 13.50258,39.746989
13.50258,71.471649 0,32.08932 -4.38834,56.15626 -12.99624,71.83632
-8.77668,16.0446 -21.77294,24.79628 -39.15753,24.4316 l -35.61305,0 z m
21.77293,156.07074 13.84012,0 c 9.7894,0 16.87825,-5.4698 21.77296,-15.31537
4.89466,-9.84558 7.25762,-24.79629 7.25762,-45.21672 0,-20.05583
-2.70051,-35.37121 -7.93276,-45.2168 -4.89471,-10.21019 -12.82747,-15.31532
-23.29198,-15.31532 l -11.64596,0 z m -103.96999,35.37115 0,-191.44189
65.31882,0 0,34.27725 -43.20831,0 0,41.20557 40.50777,0 0,34.27718 -40.50777,0
0,46.67536 43.20831,0 0,35.00653 z m -92.8303,0 -22.11046,0 0,-191.44189
19.91631,0 27.68031,68.91911 27.51153,-68.91911 19.91632,0 0,191.44189
-22.27931,0 0,-117.78232 -23.29194,58.70885 -3.88203,0 -23.46073,-58.70885 z M
277.34361,66.2702 l 22.27932,0 0,191.44189 -22.27932,0 z m -93.843,191.44189
0,-191.44189 21.9417,0 0,90.79818 28.35546,-90.79818 24.81099,0
-30.71837,91.52747 40.1702,99.91442 -28.18666,0 -34.43162,-91.52746 0,91.52746
z M 141.13624,66.2702 l 22.11049,0 0,191.44189 -22.11049,0 z M
17.587535,260.6293 -21.232425,65.905581 l 24.3046698,0 20.0851122,107.572079
22.954404,-107.572079 17.21579,0 22.785614,107.572079 20.085125,-107.572079
24.30466,0 -38.65117,194.723719 -9.620595,0 L 54.719657,139.56509
27.03934,260.6293 Z"
+ inkscape:connector-curvature="0"
+ style="opacity:1;fill:#3e485d;fill-opacity:1;fill-rule:nonzero" />
+ <g
+ id="g3415-3"
+ transform="matrix(1.6043107,0,0,1.6057604,387.88947,736.63091)"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero">
+ <path
+ d="m 77.189,0 c 14.212,0 25.73,11.515 25.73,25.732 0,14.204
-11.519,25.729 -25.73,25.729 C 62.978,51.461 51.46,39.937 51.46,25.732
51.46,11.515 62.977,0 77.189,0 Z"
+ id="circle9_2_-4"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero" />
+ <path
+ d="M 129.139,20.094 114.55,34.681 c 11.796,10.375 19.252,25.576
19.252,42.508 0,31.264 -25.353,56.604 -56.614,56.604 -31.262,0 -56.601,-25.341
-56.601,-56.604 0,-16.929 7.437,-32.133 19.229,-42.508 L 25.251,20.094 C
9.731,34.215 0,54.566 0,77.19 c 0,42.639 34.561,77.189 77.189,77.189 42.641,0
77.191,-34.552 77.191,-77.189 0,-22.623 -9.736,-42.975 -25.241,-57.096 z"
+ id="path11_2_-0"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero" />
+ <g
+ id="g13_2_-5"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero">
+ <path
+ d="m 107.255,41.979 -24.922,24.919 0,56.306 c 23.155,-2.559
41.176,-22.177 41.176,-46.024 0,-14.09 -6.318,-26.708 -16.254,-35.201 z"
+ id="path15_2_-3"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero" />
+ <path
+ d="M 72.041,66.898 47.113,41.979 c -9.929,8.493 -16.241,21.111
-16.241,35.202 0,23.847 18.011,43.475 41.169,46.024 l 0,-56.307 0,0 z"
+ id="path17_2_-5"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero" />
+ </g>
+ </g>
+ <path
+ id="path3441-3"
+ d="m 695.59538,326.85785 25.4862,0 37.4696,194.72372 -23.9671,0
-6.7512,-36.4651 -38.9888,0 -6.7513,36.4651 -24.1359,0 z m -0.8439,123.61675
27.0052,0 -13.5026,-75.11813 z m -69.3696,-120.33492 22.1105,0 0,191.44189
-22.1105,0 z m -104.8138,0 33.4189,0 c 18.0597,0 31.8999,8.02233
40.8453,23.70232 9.1143,16.04467 13.5026,39.74699 13.5026,71.47165 0,32.08932
-4.3883,56.15626 -12.9962,71.83632 -8.7767,16.0446 -21.773,24.79628
-39.1576,24.4316 l -35.613,0 z m 21.7729,156.07074 13.8401,0 c 9.7894,0
16.8783,-5.4698 21.773,-15.31537 4.8947,-9.84558 7.2576,-24.79629
7.2576,-45.21671 0,-20.05584 -2.7005,-35.37122 -7.9327,-45.21681
-4.8948,-10.21019 -12.8275,-15.31532 -23.292,-15.31532 l -11.646,0 z m
-103.97,35.37115 0,-191.44189 65.3188,0 0,34.27725 -43.2083,0 0,41.20557
40.5078,0 0,34.27718 -40.5078,0 0,46.67536 43.2083,0 0,35.00653 z m -92.8303,0
-22.1104,0 0,-191.44189 19.9163,0 27.6803,68.91911 27.5115,-68.91911 19.9163,0
0,191.44189 -22.2793,0 0,-117.78232 -23.2919,58.70885 -3.882,0
-23.4608,-58.70885 z m -64.6436,-191.44189 22.2793,0 0,191.44189 -22.2793,0 z m
-93.843,191.44189 0,-191.44189 21.9417,0 0,90.79818 28.3554,-90.79818 24.811,0
-30.7184,91.52747 40.1702,99.91442 -28.1866,0 -34.4316,-91.52746 0,91.52746 z m
-42.3644,-191.44189 22.1105,0 0,191.44189 -22.1105,0 z m -123.548698,194.3591
-38.82,-194.72372 24.3047003,0 20.0850997,107.57208 22.9544,-107.57208
17.2158,0 22.7856,107.57208 20.085098,-107.57208 24.3047,0 -38.651198,194.72372
-9.6206,0 -27.5115,-121.06421 -27.6803,121.06421 z"
+ inkscape:connector-curvature="0"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero" />
+ </g>
+</svg>
--
To view, visit https://gerrit.wikimedia.org/r/222350
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id39605d2be3ecabd8380fafb52f5a8e2a2e04276
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/phabricator
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
