BryanDavis has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/371645 )
Change subject: Use new Toolforge logo and favicon ...................................................................... Use new Toolforge logo and favicon Bug: T168480 Change-Id: Id4fca06c723ecaa75bea800622b5c87f0625485c --- A static/img/android-chrome-192x192.png A static/img/android-chrome-512x512.png A static/img/apple-touch-icon.png A static/img/favicon-16x16.png A static/img/favicon-32x32.png D static/img/favicon-apple-touch-114.png D static/img/favicon-apple-touch-144.png D static/img/favicon.icns M static/img/favicon.ico D static/img/favicon.png D static/img/logo.png A static/img/mstile-150x150.png A static/img/safari-pinned-tab.svg M striker/templates/base.html M striker/templates/labsauth/base.html 15 files changed, 10 insertions(+), 6 deletions(-) Approvals: BryanDavis: Looks good to me, approved jenkins-bot: Verified diff --git a/static/img/android-chrome-192x192.png b/static/img/android-chrome-192x192.png new file mode 100644 index 0000000..372b447 --- /dev/null +++ b/static/img/android-chrome-192x192.png Binary files differ diff --git a/static/img/android-chrome-512x512.png b/static/img/android-chrome-512x512.png new file mode 100644 index 0000000..3138110 --- /dev/null +++ b/static/img/android-chrome-512x512.png Binary files differ diff --git a/static/img/apple-touch-icon.png b/static/img/apple-touch-icon.png new file mode 100644 index 0000000..1a9007c --- /dev/null +++ b/static/img/apple-touch-icon.png Binary files differ diff --git a/static/img/favicon-16x16.png b/static/img/favicon-16x16.png new file mode 100644 index 0000000..2fb0524 --- /dev/null +++ b/static/img/favicon-16x16.png Binary files differ diff --git a/static/img/favicon-32x32.png b/static/img/favicon-32x32.png new file mode 100644 index 0000000..1b923f4 --- /dev/null +++ b/static/img/favicon-32x32.png Binary files differ diff --git a/static/img/favicon-apple-touch-114.png b/static/img/favicon-apple-touch-114.png deleted file mode 100644 index 0a24b32..0000000 --- a/static/img/favicon-apple-touch-114.png +++ /dev/null Binary files differ diff --git a/static/img/favicon-apple-touch-144.png b/static/img/favicon-apple-touch-144.png deleted file mode 100644 index e06812b..0000000 --- a/static/img/favicon-apple-touch-144.png +++ /dev/null Binary files differ diff --git a/static/img/favicon.icns b/static/img/favicon.icns deleted file mode 100644 index c51437d..0000000 --- a/static/img/favicon.icns +++ /dev/null Binary files differ diff --git a/static/img/favicon.ico b/static/img/favicon.ico index 962750c..98d83d2 100644 --- a/static/img/favicon.ico +++ b/static/img/favicon.ico Binary files differ diff --git a/static/img/favicon.png b/static/img/favicon.png deleted file mode 100644 index 849a047..0000000 --- a/static/img/favicon.png +++ /dev/null Binary files differ diff --git a/static/img/logo.png b/static/img/logo.png deleted file mode 100644 index aa5ede8..0000000 --- a/static/img/logo.png +++ /dev/null Binary files differ diff --git a/static/img/mstile-150x150.png b/static/img/mstile-150x150.png new file mode 100644 index 0000000..abbfdf7 --- /dev/null +++ b/static/img/mstile-150x150.png Binary files differ diff --git a/static/img/safari-pinned-tab.svg b/static/img/safari-pinned-tab.svg new file mode 100644 index 0000000..f3fa0db --- /dev/null +++ b/static/img/safari-pinned-tab.svg @@ -0,0 +1 @@ +<svg version="1" xmlns="http://www.w3.org/2000/svg"; width="778.667" height="778.667" viewBox="0 0 584.000000 584.000000"><path d="M30.9 17.7c1.6 2.1 4 5 5.3 6.5 1.3 1.4 3.4 4.1 4.8 5.8 2.5 3.1 4.6 5.6 7.8 9.5.9 1.1 4.6 5.6 8.1 10 3.6 4.4 7.3 8.8 8.3 9.8 1 1 1.8 2.2 1.8 2.7 0 2.1 14 3.5 16.8 1.6.7-.5 1.2-.5 1.2 0s2.3.9 5 .9c2.8 0 5-.1 5-.3 0-.1-5.5-9.3-12.2-20.5-6.7-11.1-12.6-21.1-13.2-22.2-.6-1.1-2-3.2-3-4.8L64.8 14h-37l3.1 3.7zM288.5 18.6c-6 1.3-12.1 2.5-13.5 2.8-1.4.3-3.6.7-5 1.1-1.4.3-4.1.8-6 1.1-1.9.3-5.1.9-7 1.4-1.9.5-4.6 1.1-6 1.3-1.4.3-7 1.4-12.5 2.6-5.5 1.1-11.1 2.3-12.5 2.5-8.3 1.6-13.3 2.7-15 3.1-.8.2-2.1.4-2.8.4-.8.1-1.1.8-.8 1.8.3 1 .8 5.4 1.2 9.8.3 4.4.8 8.7.9 9.5.1.8.6 4.9 1 9s.9 8.2 1 9c.2.8.6 4.9.9 9 .4 4.1.9 8.6 1.1 10 .3 1.4.7 5.2 1 8.5.7 7.5 1.5 15.1 2 19 .2 1.6 2.9 11.3 6.1 21.5 3.1 10.2 6.2 20.6 7 23.2.8 2.7 2.1 7.2 3 10 .8 2.9 1.9 6.6 2.4 8.3.5 1.6 1.8 6.1 3 10 1.2 3.8 2.4 8.1 2.7 9.3.5 2.1.9 2.3 4.2 1.7 2-.4 4.7-.9 6.1-1.2 1.4-.2 5.4-1.1 8.9-1.9 3.5-.8 6.6-1.2 6.9-1 .2.3 1.2.1 2.1-.3.9-.5 3-1.1 4.6-1.4 1.7-.3 4.2-.8 5.8-1.1 1.5-.4 3.7-.8 5-1 1.2-.2 3.3-.7 4.7-1 1.4-.3 3.6-.8 5-1 1.4-.2 4.5-.9 7-1.5 4.4-1 7.3-1.5 13.5-2.7 1.7-.3 6.8-1.3 11.5-2.3l8.5-1.7-.2-3.9c-.7-14.3-1.7-29.3-2.8-40.5-.3-3.9-.7-13.7-.6-16 .1-.9 1-1.6 2.2-1.7 1.1-.1 5.5-.7 9.7-1.4 4.2-.7 8.4-1.3 9.2-1.4.8-.1 3.5-.5 6-.9s5.9-.9 7.5-1.1c1.7-.2 3-.4 3-.5 0-.1 4.1-.8 9-1.4 5.3-.7 33.6-5.3 34.5-5.6.3-.2.9-.2 1.3-.1.5.1 4.7-.5 9.5-1.4 4.8-.8 10.5-1.7 12.7-2 2.2-.2 5.1-.7 6.5-.9 1.4-.3 4.3-.7 6.5-1.1 2.2-.3 6.5-1 9.5-1.5s7.3-1.2 9.5-1.5c2.2-.3 5.1-.8 6.5-1 1.4-.2 4.3-.7 6.5-1 2.3-.3 5-.7 6.2-.9 1.2-.3 4.3-.8 7-1.2 2.6-.3 5.7-.8 6.8-1 1.1-.3 3.8-.7 6-1 2.1-.2 4.1-.6 4.3-.8.3-.4-.7-5.7-4.8-24.6-1.1-5.2-2.3-10.9-2.6-12.5-.3-1.7-.9-4.6-1.4-6.5-.5-1.9-1.1-4.6-1.4-6-.3-1.4-1.2-5.9-2.1-10-2.2-10.4-2.5-12.3-2.7-13.8-.1-.7-.9-1-2-.6-1 .3-3 .7-4.5 1-1.5.3-3 .7-3.5 1-.5.3-6.4 2.1-13.1 3.9-6.7 1.8-21.2 5.9-32.1 9-11 3.1-21 5.9-22.4 6.1-1.4.3-3.2.9-4.1 1.3-.9.5-4.1 1.4-7.1 2.2-3 .7-5.7 1.4-6 1.4-.3.1-1.2.4-2 .8-1.3.5-36.1 10.3-40 11.2-.8.2-1.5.4-1.5.5 0 .1-.7.3-1.5.5-.8.1-8.8 2.4-17.8 4.9-8.9 2.5-16.8 4.6-17.5 4.6-.7 0-2.6-4-4.4-9.3-7.1-20.9-15.4-44.2-16.1-44.8-.4-.3-5.6.4-11.7 1.7zM149.7 28.6c-.1.1-8.3.5-18.2 1-9.9.4-20 .8-22.5.9-2.5.1-6.4.3-8.8.4-4 .1-4.3.3-3.6 2.3.4 1.3.9 2.5 1.3 2.8.3.3 1.5 2.3 2.6 4.5s2.7 5.1 3.6 6.5c.9 1.4 3.9 6.5 6.6 11.5 2.8 4.9 7.9 14.2 11.5 20.5 9.8 17.4 14 25.2 13.6 25.5-.2.2-3.7.6-7.7.9-4.1.4-7.7.8-7.9 1.1-.3.3 2.9 5.1 6.3 9.2 2.1 2.5 3.3 4.2 15.5 20.2 6.9 9 15.2 19.8 18.5 24.1 3.3 4.3 6.9 9.1 8 10.6 1.1 1.5 2.5 3.2 3 3.8.6.6 3.3 4.2 6 7.9 2.8 3.7 5.7 7.6 6.5 8.6 1.7 2.1 5.3 6.8 7.3 9.5 1.3 1.7 2.8 2 12.6 2.1 6.1.1 11.1-.2 11.1-.7 0-.4-2.6-5.8-5.9-12-10.2-19.7-35.1-68.6-35.1-69 0-.2 3.8-.2 8.5 0 5.4.2 8.5 0 8.5-.7 0-1-3-9.2-4.9-13.6-.5-1.1-4.3-10.8-8.5-21.5-22.8-58.4-21.9-56.5-24.9-56.5-1.5-.1-2.9 0-3 .1zM70.8 84.6c-.2.2-7.3.5-15.8.8-8.5.2-16.2.5-17 .5-1.6.1-1.4.3 11 11.1 3.5 3 8.6 7.5 11.4 10 2.8 2.4 5.9 5.1 6.9 6 4.5 3.7 5.7 4.7 9.9 8.5 2.5 2.2 6.9 6 9.8 8.5 3 2.5 6.1 5.2 7 6 1.6 1.5 13 11.4 18 15.6 3.4 2.9 11.3 9.8 19.1 16.5 3.5 3.1 8 6.9 9.9 8.5 1.9 1.6 4.2 3.6 5 4.4.9.8 4.2 3.7 7.5 6.5 3.2 2.7 6.9 6 8.2 7.3 1.2 1.3 2.3 1.9 2.3 1.5 0-.7-2-3.2-7.2-9.3-.7-.8-2.6-3-4.1-5-5.3-6.5-9.2-11.3-10.2-12.4-.5-.6-2.2-2.7-3.6-4.6-1.5-1.9-3.6-4.6-4.8-6-1.1-1.4-2.4-3-2.8-3.5-2.9-3.7-9.8-12.2-10.7-13-.6-.6-3-3.5-5.3-6.5s-5-6.4-6-7.5c-1-1.1-3-3.6-4.4-5.5-1.5-1.9-3.5-4.5-4.5-5.7-2.4-2.7-3.1-3.6-13.4-16.3-4.7-5.8-9.3-11.4-10.2-12.4-1-1.1-1.8-2.3-1.8-2.7 0-.7-3.7-1.9-4.2-1.3zM74.3 172.2c-.4.7-.8 1.7-.9 2.3-.1.5-1.3 3.5-2.7 6.5-3.7 8.2-8.7 20.1-8.7 20.9 0 .8 62.6.8 63.4 0 .3-.3-.6-1.2-2.2-2-1.5-.8-2.9-1.6-3.2-1.9-.3-.3-1.7-1.2-3.3-2-1.5-.8-11.2-6.6-21.5-12.9-10.3-6.3-19-11.6-19.4-11.8-.4-.2-1 .2-1.5.9zM120.5 246.9v18.6l-60.4.3-60.3.2.6 12.8c.3 7 .7 13.6 1 14.7.2 1.1.7 4.2 1 7 .4 2.7.9 5.8 1.2 6.7.6 1.9 1.4 5.7 1.8 7.8.1.8.5 2.2.9 3 .4.8.9 2.6 1.1 4 .3 1.4.5 2.6.7 2.7.1.2.2.6.4 1 .4 1.6 1.8 5 4.6 11.1 7.8 17.3 19.6 29.2 43.9 44.7 9.5 6 35.7 19.5 37.8 19.5.5 0 2.3.7 4 1.6 1.7.8 7.3 3 12.4 4.7l9.2 3.2.2 11c0 6 .2 11.4.2 12 .1.6 11.9 1 33.3.9 31.9-.1 33.1-.1 34.9 1.9 3.5 3.6 5.3 9.1 5.8 16.7.7 12.3-3.8 20.4-14.3 25.4-4.4 2.2-5.6 2.3-32.1 2.2-23.6-.1-27.5.1-27.8 1.4-.2.8-.3 20.8-.2 44.5l.1 43h381v-44.2c0-28.8-.3-44.4-1-44.6-.5-.1-14.8-.2-31.7-.1l-30.8.1-.1-2.6c-.2-8.9 0-15.5.6-22.1 1-10.4 1.4-13.5 1.5-13.5.1 0 .3-1.1.6-2.5 3.4-20.4 13.3-47.1 22.3-60.6 1.7-2.5 3.1-4.7 3.1-5 0-.3.6-1.1 1.3-1.9.6-.7 2.1-2.5 3.1-3.9 5.5-7.6 15.4-17.9 23.3-24.3 2.7-2.1 5-4 5.3-4.3 1.1-1.1 12-8 12.7-8 .3 0 1.4-.6 2.2-1.4 4.5-3.8 43.4-17.9 55.3-20 1.5-.2 3.2-.7 3.7-1 .5-.3 2.8-.8 5.1-1.1 2.4-.3 4.7-.8 5.1-1.1.5-.3.9-9.7.9-20.9V266l-41.2-.2-41.3-.3v-18.3c0-17.5 0-18.3-2-18.7-1.1-.2-86.8-.3-190.5-.3l-188.6.1.1 18.6z"/></svg> \ No newline at end of file diff --git a/striker/templates/base.html b/striker/templates/base.html index e6dd50e..f622a53 100644 --- a/striker/templates/base.html +++ b/striker/templates/base.html @@ -10,11 +10,14 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <meta http-equiv="imagetoolbar" content="no"> <title>{% block title %}{% endblock title %}</title> - <link rel="apple-touch-icon-precomposed" sizes="144x144 72x72" href="{% static "img/favicon-apple-touch-144.png" %}"> - <link rel="apple-touch-icon-precomposed" sizes="114x114 57x57" href="{% static "img/favicon-apple-touch-114.png" %}"> - <link rel="icon" type="image/icns" sizes="128x128" href="{% static "img/favicon.icns" %}"> + <link rel="apple-touch-icon" sizes="180x180" href="{% static "img/apple-touch-icon.png" %}"> + <link rel="icon" type="image/png" sizes="16x16" href="{% static "img/favicon-16x16.png" %}"> + <link rel="icon" type="image/png" sizes="32x32" href="{% static "img/favicon-32x32.png" %}"> <link rel="icon" type="image/x-icon" sizes="48x48" href="{% static "img/favicon.ico" %}"> - <link rel="icon" type="image/png" sizes="32x32" href="{% static "img/favicon.png" %}"> + <link rel="mask-icon" href="{% static "img/safari-pinned-tab.svg" %}" color="#339966"> + <meta name="apple-mobile-web-app-title" content="Toolforge admin console"> + <meta name="application-name" content="Toolforge admin console"> + <meta name="theme-color" content="#ffffff"> <link rel="stylesheet" href="{% static "css/bootstrap.min.css" %}"> <link rel="stylesheet" href="{% static "css/bootstrap-theme.min.css" %}"> <link rel="stylesheet" href="{% static "css/font-awesome.min.css" %}"> @@ -33,7 +36,7 @@ <span class="icon-bar"></span> </button> <a class="navbar-brand" href="{% url 'index' %}"> - <img alt="{% trans "Toolforge admin console" %}" src="{% static "img/logo.png" %}"> + <img alt="{% trans "Toolforge admin console" %}" src="{% static "img/favicon-32x32.png" %}"> </a> </div> <div id="navbar" class="collapse navbar-collapse"> diff --git a/striker/templates/labsauth/base.html b/striker/templates/labsauth/base.html index 146173c..8143cfa 100644 --- a/striker/templates/labsauth/base.html +++ b/striker/templates/labsauth/base.html @@ -12,7 +12,7 @@ <div class="panel panel-default login-panel"> <div class="panel-heading"> <h3 class="panel-title"> - <img alt="{% trans "Toolforge admin console" %}" src="{% static "img/logo.png" %}"> + <img alt="{% trans "Toolforge admin console" %}" src="{% static "img/favicon-32x32.png" %}"> {% trans "Toolforge admin console" %} </h3> </div> -- To view, visit https://gerrit.wikimedia.org/r/371645 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id4fca06c723ecaa75bea800622b5c87f0625485c Gerrit-PatchSet: 2 Gerrit-Project: labs/striker Gerrit-Branch: master Gerrit-Owner: BryanDavis <bda...@wikimedia.org> Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
