Jhernandez has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/394277 )
Change subject: Use the production version of the en-wordmark
......................................................................
Use the production version of the en-wordmark
Which is smaller (7.8K -> 5.3K) and doesn't use transforms or opacity in
the SVG, which may be causing blurriness in some devices.
Bug: T181702
Change-Id: I8c2cfc2dad07a28341d187507f548b560f1199ca
---
D src/common/components/wordmark/wordmark.css
M src/common/components/wordmark/wordmark.tsx
M src/public/wordmark-en.svg
3 files changed, 9 insertions(+), 75 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/77/394277/1
diff --git a/src/common/components/wordmark/wordmark.css
b/src/common/components/wordmark/wordmark.css
deleted file mode 100644
index cad31ee..0000000
--- a/src/common/components/wordmark/wordmark.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.Wordmark {
- width: 118px;
- height: 18px;
-}
diff --git a/src/common/components/wordmark/wordmark.tsx
b/src/common/components/wordmark/wordmark.tsx
index 33f78f0..61e8e18 100644
--- a/src/common/components/wordmark/wordmark.tsx
+++ b/src/common/components/wordmark/wordmark.tsx
@@ -1,7 +1,13 @@
import { h } from "preact";
-import "./wordmark.css";
import { asset } from "../../assets/manifest";
export default function Wordmark(): JSX.Element {
- return <img className="Wordmark" src={asset("wordmark-en", "svg")} />;
+ return (
+ <img
+ className="Wordmark"
+ src={asset("wordmark-en", "svg")}
+ height="18"
+ width="116"
+ />
+ );
}
diff --git a/src/public/wordmark-en.svg b/src/public/wordmark-en.svg
index 343ea2d..370cb15 100644
--- a/src/public/wordmark-en.svg
+++ b/src/public/wordmark-en.svg
@@ -1,69 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; width="118" height="18" viewBox="0 0
118 18">
- <defs>
- <path id="a" d="M14.379.286c.924.025 1.398.052 1.971.052.575 0
1.199-.026 1.823-.052.149.155.149.703 0 .86-1.298.208-1.84 1.2-2.454
2.42L13.894 7.19l3.193
6.899h.114l4.741-10.704c.592-1.41.55-2.11-1.073-2.239-.15-.156-.15-.703 0-.86
1.173.026 1.897.053 2.471.053.575 0 1.199-.026 2.197-.052.15.155.15.703 0
.86-1.648.208-1.934 1.202-2.453 2.42l-5.91
13.283c-.174.39-.324.599-.598.599-.25 0-.442-.211-.574-.6l-3.358-7.56-3.681
7.56c-.15.392-.325.6-.6.6-.248 0-.424-.208-.573-.6L2.36
3.517c-.761-1.85-.812-2.24-2.234-2.37C-.024.99-.05.443.1.286 1.274.313 1.698.34
2.696.34c.974 0 1.598-.026 2.772-.052.15.155.15.703 0
.86-1.573.18-1.64.593-1.013 2.082l4.57
10.86h.114l2.788-5.917-2.103-4.656c-.837-1.85-1.036-2.214-2.11-2.37-.15-.156-.175-.703-.025-.86C8.488.313
8.912.34 9.91.34c.974 0 1.374-.026 2.272-.052.15.155.15.703 0
.86-1.048.155-.949.597-.264 2.082l1.228 2.631.11.117
1.322-2.592c.771-1.51.874-2.083-.2-2.239-.15-.158-.15-.705 0-.86z"/>
- <path id="c" d="M4.006 8.969c0 2.161.274 2.266 1.796
2.37.15.156.15.703 0 .859-1.073-.025-1.697-.052-2.77-.052-1.099
0-1.747.026-2.796.052-.149-.156-.149-.703 0-.86 1.523-.13 1.798-.208
1.798-2.37V3.344c0-2.16-.275-2.265-1.798-2.37C.087.819.087.272.236.115 1.31.14
1.933.166 3.007.166c1.098 0 1.748-.025 2.796-.052.15.157.15.704 0
.86-1.522.13-1.796.208-1.796 2.37v5.625h-.001z"/>
- <path id="e" d="M.456.975C.307.818.307.27.456.115c1.049.026 1.697.052
2.796.052.924 0 1.323-.025 2.396-.052.15.156.15.703 0
.86-1.198.13-1.422.208-1.422 2.37v2.317c.823 0 1.554-.411 2.62-1.667C8.77 1.729
9.02 1.052 7.772.974c-.15-.156-.15-.703 0-.86 1.073.026 2.022.052 2.745.052.649
0 1.074-.025 1.748-.052.149.157.149.704 0 .86-.998.052-1.914.184-2.672
1.094L7.446 4.646c-.425.469-.575.755-.575.964 0 .156.1.286.225.442l3.695
4.532c.327.395.924.676 1.597.754.15.157.15.678 0 .834 0
0-1.223-.026-1.922-.026-.65
0-1.274.026-1.548.052v-.365c0-.338-.025-.624-.374-1.04l-2.77-3.595c-.375-.521-1-.652-1.548-.652V8.97c0
2.161.225 2.24 1.422 2.37.15.156.15.703 0
.859-1.073-.025-1.473-.052-2.396-.052-1.099
0-1.747.026-2.796.052-.149-.156-.149-.703 0-.86 1.522-.13 1.797-.208
1.797-2.37V3.344c0-2.16-.275-2.239-1.797-2.368z"/>
- <path id="g" d="M4.19 8.969c0 2.161.275 2.266 1.797 2.37.15.156.15.703
0 .859-1.073-.025-1.697-.052-2.77-.052-1.099
0-1.747.026-2.796.052-.149-.156-.149-.703 0-.86 1.522-.13 1.797-.208
1.797-2.37V3.344c0-2.16-.275-2.265-1.797-2.37C.272.819.272.272.421.115 1.494.14
2.118.166 3.192.166 4.29.166 4.94.141 5.988.114c.15.157.15.704 0
.86-1.522.13-1.797.208-1.797 2.37v5.625z"/>
- <path id="i" d="M5.783 11.338c.149.157.149.704 0
.86-1.074-.025-1.698-.052-2.771-.052-1.098
0-1.748.026-2.796.052-.15-.156-.15-.703 0-.86 1.522-.13 1.796-.208
1.796-2.37V3.344c0-2.16-.274-2.265-1.796-2.37-.15-.155-.15-.702 0-.859
1.073.026 1.697.052 2.77.052.674 0 1.723-.052 2.646-.052 3.544 0 4.294 1.824
4.294 3.177 0 1.563-1.023 4.063-4.37 4.063-.623 0-1.122-.103-1.571-.313V8.97c0
2.161.274 2.265 1.798 2.37zm-1.798-5.13c.499.208 1.123.286 1.622.286 1.499 0
2.147-1.013 2.147-2.89 0-1.827-.8-2.631-2.271-2.631-1.199 0-1.498.338-1.498
1.172v4.063z"/>
- <path id="k" d="M4.17 6.337v3.906c0 .495.349 1.146.798
1.146H7.04c1.572 0 2.296-1.302 2.695-2.838.274-.078.474-.025.698.104-.174
1.094-.449 2.526-.748 3.594 0
0-1.648-.052-2.646-.052H3.195s-1.748.026-2.796.052c-.15-.156-.15-.703 0-.86
1.523-.13 1.797-.208
1.797-2.369V3.394c0-2.16-.274-2.265-1.797-2.369-.15-.156-.15-.703
0-.86C1.473.191 3.17.217 3.17.217h5.167c.5 0 .674-.052 1.023-.103.05 0
.075.025.075.078.05.182.35 2.214.45
3.1-.2.102-.425.155-.675.13-.45-1.484-.774-2.345-2.322-2.345H4.966c-.474
0-.799.287-.799.73v3.697H5.59c1.747-.025 1.671-.286
1.722-1.458.125-.13.574-.13.699 0-.025.65-.05 1.12-.05 1.85 0 .728.024 1.145.05
1.9-.125.13-.574.13-.7 0-.05-.963.051-1.458-1.721-1.458H4.17v-.001z"/>
- <path id="m" d="M6.406.115c4.168 0 6.215 2.71 6.215 6.172 0
4.557-3.095 5.911-5.866 5.911-1.997 0-2.896-.052-3.644-.052-1.098
0-1.747.026-2.795.052-.15-.156-.15-.703 0-.86 1.523-.13 1.796-.208
1.796-2.37V3.344c0-2.16-.273-2.265-1.796-2.37-.15-.155-.15-.702 0-.859
1.073.026 1.697.052 2.77.052.475.001 2.67-.05 3.32-.05zm-.25 11.224c2.745 0
4.294-.963 4.294-4.608 0-2.71-.575-5.756-4.769-5.756-.973
0-1.596.156-1.596.807v8.385c0 .73.174 1.172 2.07 1.172z"/>
- <path id="o" d="M3.916 8.969c0 2.161.274 2.266 1.797
2.37.15.156.15.703 0 .859-1.074-.025-1.698-.052-2.771-.052-1.1
0-1.748.026-2.796.052-.15-.156-.15-.703 0-.86 1.523-.13 1.797-.208
1.797-2.37V3.344c0-2.16-.274-2.265-1.797-2.37-.15-.155-.15-.702 0-.859C1.22.14
1.843.166 2.917.166c1.098 0 1.748-.025 2.796-.052.15.157.15.704 0
.86-1.523.13-1.797.208-1.797 2.37v5.625z"/>
- <path id="q" d="M5.757 16.329c.15.156.15.703 0
.86-.924-.026-2.17-.053-3.194-.053-.973
0-1.298.026-2.222.052-.149-.156-.149-.703 0-.86 1.086-.077 1.838-.239
2.497-1.848L8.387.93C8.67.232 8.859 0 9.229 0c.35 0 .491.279.673.782l5.118
14.115c.462 1.341 1.279 1.341 2.246 1.432.15.156.15.703 0
.86-.924-.026-1.822-.053-2.846-.053-.973 0-2.346.026-3.27.052-.15-.156-.15-.703
0-.86 1.189-.088 2.218.007 1.847-1.066l-1.522-4.402H6.282c-.599
0-.749.104-.874.443l-1.373 3.775c-.388 1.07.785 1.182 1.722
1.25zm5.318-6.563l-2.42-6.953h-.051l-2.5
6.607c-.106.282.074.346.628.346h4.343z"/>
- </defs>
- <g fill="none" fill-rule="evenodd" opacity=".7">
- <g>
- <mask id="b" fill="#fff">
- <use xlink:href="#a"/>
- </mask>
- <path fill="#000" d="M-2.13-1.809h29.91v21.351H-2.13z"
mask="url(#b)"/>
- </g>
- <g transform="translate(24.717 5.026)">
- <mask id="d" fill="#fff">
- <use xlink:href="#c"/>
- </mask>
- <path fill="#000" d="M-2.006-1.98H8.047v16.272H-2.006z"
mask="url(#d)"/>
- </g>
- <g transform="translate(32.388 5.026)">
- <mask id="f" fill="#fff">
- <use xlink:href="#e"/>
- </mask>
- <path fill="#000" d="M-1.786-1.98H14.63v16.272H-1.786z"
mask="url(#f)"/>
- </g>
- <g transform="translate(46.45 5.026)">
- <mask id="h" fill="#fff">
- <use xlink:href="#g"/>
- </mask>
- <path fill="#000" d="M-1.822-1.98H8.232v16.272H-1.822z"
mask="url(#h)"/>
- </g>
- <g transform="translate(54.548 5.026)">
- <mask id="j" fill="#fff">
- <use xlink:href="#i"/>
- </mask>
- <path fill="#000" d="M-2.028-1.98h14.085v16.272H-2.028z"
mask="url(#j)"/>
- </g>
- <g transform="translate(66.054 5.026)">
- <mask id="l" fill="#fff">
- <use xlink:href="#k"/>
- </mask>
- <path fill="#000" d="M-1.844-1.98h14.41v16.323h-14.41z"
mask="url(#l)"/>
- </g>
- <g transform="translate(78.412 5.026)">
- <mask id="n" fill="#fff">
- <use xlink:href="#m"/>
- </mask>
- <path fill="#000" d="M-1.928-1.98h16.68v16.272h-16.68z"
mask="url(#n)"/>
- </g>
- <g transform="translate(92.901 5.026)">
- <mask id="p" fill="#fff">
- <use xlink:href="#o"/>
- </mask>
- <path fill="#000" d="M-2.097-1.98H7.956v16.272H-2.097z"
mask="url(#p)"/>
- </g>
- <g transform="translate(99.72)">
- <mask id="r" fill="#fff">
- <use xlink:href="#q"/>
- </mask>
- <path fill="#000" d="M-1.901-2.094h21.41v21.377H-1.9z"
mask="url(#r)"/>
- </g>
- </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg viewBox="0 0 116 18"
xmlns="http://www.w3.org/2000/svg";><g id="Wikipedia" fill-rule="evenodd"
fill="#54595D"><path d="M14.233.292c.914.026 1.383.053 1.951.053.569 0
1.186-.026 1.804-.053.147.158.147.715 0 .874-1.285.212-1.822 1.22-2.43
2.462L13.754 7.31l3.16
7.012h.113l4.693-10.88c.586-1.433.543-2.145-1.062-2.277-.149-.159-.149-.715
0-.874 1.16.026 1.877.053 2.446.053.569 0 1.186-.026 2.174-.053.149.158.149.715
0 .874-1.63.212-1.914 1.223-2.428 2.462L17
17.13c-.173.397-.321.609-.592.609-.247 0-.438-.215-.569-.61l-3.323-7.684L8.87
17.13c-.147.397-.321.609-.593.609-.246 0-.42-.212-.567-.61L2.336
3.577c-.754-1.88-.804-2.277-2.212-2.409C-.024 1.008-.049.452.1.293 1.26.32
1.68.346 2.669.346 3.633.346 4.25.32 5.412.293c.149.158.149.715 0
.874-1.557.184-1.623.603-1.002 2.118l4.523
11.039h.113l2.76-6.015-2.082-4.733c-.828-1.88-1.026-2.25-2.089-2.409-.147-.159-.173-.715-.024-.874.79.026
1.21.053 2.199.053.963 0 1.359-.026 2.248-.053.149.158.149.715 0
.874-1.038.16-.939.608-.262 2.118l1.216 2.674.109.119
1.309-2.635c.763-1.535.865-2.117-.197-2.276-.149-.16-.149-.717 0-.875z"/><path
d="M28.508 14.19c0 2.197.272 2.304 1.778 2.41.149.158.149.714 0
.873-1.062-.025-1.68-.053-2.742-.053-1.087
0-1.73.027-2.767.053-.148-.159-.148-.715 0-.874 1.507-.132 1.78-.212
1.78-2.408V8.47c0-2.196-.272-2.302-1.78-2.408-.148-.159-.148-.715 0-.874
1.062.027 1.68.053 2.743.053 1.087 0 1.73-.025 2.768-.053.148.159.148.715 0
.874-1.508.132-1.78.212-1.78 2.409v5.719z"/><path d="M32.633
6.063c-.148-.159-.148-.715 0-.874 1.038.027 1.68.053 2.767.053.915 0 1.31-.025
2.372-.053.148.159.148.715 0 .874-1.186.132-1.408.212-1.408 2.409v2.356c.815 0
1.539-.418 2.594-1.695 1.903-2.303 2.15-2.992.915-3.07-.149-.16-.149-.716
0-.875 1.062.027 2.001.053 2.718.053.642 0 1.062-.025 1.73-.053.147.16.147.715
0 .874-.988.053-1.895.187-2.645 1.112l-2.125 2.62c-.42.478-.568.769-.568.98 0
.16.099.292.223.45l3.656 4.608c.324.402.915.687 1.582.766.147.16.147.689 0 .848
0 0-1.211-.027-1.903-.027-.643
0-1.26.027-1.533.053v-.37c0-.345-.024-.635-.37-1.059l-2.742-3.654c-.37-.53-.989-.662-1.532-.662v2.462c0
2.198.223 2.277 1.408 2.41.148.158.148.714 0
.873-1.062-.025-1.458-.053-2.372-.053-1.087
0-1.73.027-2.767.053-.148-.159-.148-.715 0-.874 1.507-.132 1.778-.211
1.778-2.409V8.471c0-2.197-.271-2.276-1.778-2.408"/><path d="M50.049 14.19c0
2.197.271 2.304 1.778 2.41.149.158.149.714 0
.873-1.062-.025-1.68-.053-2.742-.053-1.087
0-1.73.027-2.767.053-.148-.159-.148-.715 0-.874 1.507-.132 1.778-.212
1.778-2.408V8.47c0-2.196-.271-2.302-1.778-2.408-.148-.159-.148-.715 0-.874
1.062.027 1.68.053 2.743.053 1.086 0 1.73-.025 2.767-.053.149.159.149.715 0
.874-1.506.132-1.778.212-1.778 2.409v5.719h-.001z"/><path d="M57.978
11.384c.494.212 1.111.29 1.606.29 1.483 0 2.125-1.029 2.125-2.937
0-1.857-.791-2.675-2.248-2.675-1.187 0-1.483.344-1.483 1.192v4.13zm1.78
5.215c.147.16.147.715 0 .874-1.064-.025-1.681-.053-2.744-.053-1.086
0-1.73.027-2.767.053-.148-.159-.148-.715 0-.874 1.507-.132 1.778-.212
1.778-2.408V8.47c0-2.196-.271-2.302-1.778-2.408-.148-.159-.148-.715 0-.874
1.062.027 1.68.053 2.742.053.668 0 1.705-.053 2.62-.053 3.507 0 4.25 1.854 4.25
3.23 0 1.589-1.013 4.13-4.325 4.13-.618 0-1.111-.105-1.556-.318v1.96c0
2.196.272 2.302 1.78 2.408z"/><path d="M69.464 11.463v3.971c0 .503.346
1.165.791 1.165h2.052c1.556 0 2.273-1.324
2.668-2.885.27-.08.469-.026.69.106-.172 1.112-.444 2.568-.74 3.653 0
0-1.63-.053-2.619-.053H68.5s-1.73.027-2.768.053c-.147-.159-.147-.715 0-.874
1.508-.132 1.779-.211
1.779-2.408V8.47c0-2.196-.27-2.302-1.779-2.408-.147-.159-.147-.715 0-.874
1.064.027 2.743.053 2.743.053h5.115c.495 0 .667-.053 1.013-.105.05 0
.074.026.074.08.049.184.346 2.25.444
3.15-.197.105-.42.159-.667.132-.444-1.508-.766-2.383-2.298-2.383h-1.903c-.469
0-.79.291-.79.741v3.76h1.408c1.73-.026 1.654-.292
1.704-1.483.124-.133.569-.133.692 0-.025.662-.049 1.138-.049 1.88 0 .741.023
1.165.049 1.933-.123.132-.568.132-.692
0-.05-.98.05-1.483-1.704-1.483h-1.407z"/><path d="M83.594 16.6c2.718 0
4.251-.98 4.251-4.686 0-2.754-.569-5.851-4.72-5.851-.963
0-1.58.159-1.58.821v8.524c0 .741.172 1.191 2.05 1.191m.247-11.41c4.126 0 6.152
2.754 6.152 6.274 0 4.633-3.064 6.01-5.806 6.01-1.977
0-2.867-.054-3.607-.054-1.087 0-1.73.027-2.767.053-.149-.159-.149-.715 0-.874
1.508-.132 1.778-.211
1.778-2.408V8.47c0-2.196-.27-2.302-1.778-2.408-.149-.159-.149-.715 0-.874
1.062.027 1.68.053 2.743.053.469 0 2.642-.052 3.285-.052"/><path d="M95.699
14.19c0 2.197.27 2.304 1.778 2.41.148.158.148.714 0
.873-1.063-.025-1.68-.053-2.742-.053-1.088
0-1.73.027-2.768.053-.148-.159-.148-.715 0-.874 1.508-.132 1.779-.212
1.779-2.408V8.47c0-2.196-.271-2.302-1.779-2.408-.148-.159-.148-.715 0-.874
1.063.027 1.68.053 2.743.053 1.087 0 1.73-.025 2.767-.053.148.159.148.715 0
.874-1.507.132-1.778.212-1.778 2.409v5.719z"/><path d="M109.755 9.928L107.36
2.86h-.05l-2.475 6.716c-.104.287.074.352.622.352h4.3zm-5.263
6.671c.149.16.149.715 0 .874a122.54 122.54 0 0 0-3.162-.053c-.963
0-1.284.027-2.199.053-.148-.159-.148-.715 0-.874 1.075-.079 1.819-.243
2.471-1.879L107.094.945c.282-.71.468-.945.834-.945.346 0 .487.283.667.796l5.065
14.348c.458 1.363 1.266 1.363 2.223 1.455.15.16.15.715 0
.874-.914-.025-1.803-.053-2.817-.053-.962
0-2.322.027-3.236.053-.148-.159-.148-.715 0-.874 1.176-.09 2.195.006
1.828-1.084l-1.507-4.475h-5.14c-.592 0-.74.105-.865.45l-1.36 3.838c-.383
1.088.778 1.202 1.706 1.271z"/></g></svg>
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/394277
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c2cfc2dad07a28341d187507f548b560f1199ca
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Jhernandez <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
