jenkins-bot has submitted this change and it was merged. Change subject: Add logo! ......................................................................
Add logo! Change-Id: I57f0d9a55c313313785e89be8a1c264cd3ec50f8 Source: https://github.com/wikimedia/analytics-quarry-web/pull/1 --- M quarry/web/static/css/base.css A quarry/web/static/img/quarry-logo-icon.svg A quarry/web/static/img/quarry-logo-white.svg A quarry/web/static/img/quarry-logo.svg M quarry/web/templates/base.html 5 files changed, 155 insertions(+), 1 deletion(-) Approvals: Yuvipanda: Looks good to me, approved jenkins-bot: Verified diff --git a/quarry/web/static/css/base.css b/quarry/web/static/css/base.css index 0a8650e..0e220d3 100644 --- a/quarry/web/static/css/base.css +++ b/quarry/web/static/css/base.css @@ -22,3 +22,7 @@ .right { text-align: right; } + +.navbar-brand { + margin-top: -14px; +} diff --git a/quarry/web/static/img/quarry-logo-icon.svg b/quarry/web/static/img/quarry-logo-icon.svg new file mode 100644 index 0000000..b111165 --- /dev/null +++ b/quarry/web/static/img/quarry-logo-icon.svg @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Icon by Hay Kranen < http://www.haykranen.nl > + Uses elements designed by Michael Rowe < http://www.thenounproject.com/Mikhail1986 > + from the Noun Project < http://www.thenounproject.com >, licensed under CC-BY 3.0 +--> + +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px" + width="55px" height="56px" viewBox="0 0 55 56" enable-background="new 0 0 55 56" xml:space="preserve"> +<g> + <rect fill="#008CBB" width="55" height="56"/> + <g> + <path fill="#FFFFFF" d="M27.076,39.828c0,1.136,0.926,2.061,2.061,2.061c1.137,0,2.062-0.925,2.062-2.061 + c0-1.137-0.926-2.062-2.062-2.062C28.002,37.767,27.076,38.691,27.076,39.828z"/> + <path fill="#FFFFFF" d="M19.947,39.828c0,1.136,0.925,2.061,2.061,2.061c1.137,0,2.061-0.925,2.061-2.061 + c0-1.137-0.924-2.062-2.061-2.062C20.871,37.767,19.947,38.691,19.947,39.828z"/> + <path fill="#FFFFFF" d="M12.817,39.828c0,1.136,0.925,2.061,2.06,2.061c1.137,0,2.061-0.925,2.061-2.061 + c0-1.137-0.924-2.062-2.061-2.062C13.742,37.767,12.817,38.691,12.817,39.828z"/> + <polygon fill="#FFFFFF" points="35.283,18.582 36.695,16.285 34.48,14.923 32.685,17.844 32.684,17.844 32.684,23.322 + 35.283,23.322 "/> + <path fill="#FFFFFF" d="M9.251,39.718c0,3.1,2.524,5.624,5.626,5.624h14.26c3.102,0,5.627-2.524,5.627-5.624 + c0-3.104-2.525-5.626-5.627-5.626h-14.26C11.775,34.092,9.251,36.614,9.251,39.718z M11.034,39.718 + c0-2.122,1.726-3.845,3.843-3.845h14.26c2.121,0,3.844,1.724,3.844,3.845c0,2.118-1.723,3.842-3.844,3.842h-14.26 + C12.759,43.56,11.034,41.836,11.034,39.718z"/> + <path fill="#FFFFFF" d="M5.576,23.953v16.041h2.798c-0.003-0.093-0.014-0.186-0.014-0.276c0-3.595,2.924-6.519,6.518-6.519h14.261 + c3.594,0,6.516,2.924,6.516,6.519c0,0.091-0.009,0.184-0.013,0.276h4.47v-6.812h1.813c0.593,3.854,3.899,6.822,7.916,6.822v-2.547 + c-3.026,0-5.491-2.463-5.491-5.491c0-3.027,2.465-5.49,5.491-5.49v-2.547c-4.017,0-7.323,2.968-7.916,6.822h-1.813v-6.796h-9.585 + l-4.453-12.478h-4.457h-2.673h-5.348v3.565v8.913H5.576z M17.161,14.149h6.621l3.183,9.804v5.348h-1.819h-6.313h-1.671v-5.348 + V14.149z M12.274,30.303H7.818v-4.456h4.456V30.303z"/> + </g> +</g> +</svg> diff --git a/quarry/web/static/img/quarry-logo-white.svg b/quarry/web/static/img/quarry-logo-white.svg new file mode 100644 index 0000000..bac5ee4 --- /dev/null +++ b/quarry/web/static/img/quarry-logo-white.svg @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px" + width="250px" height="80px" viewBox="0 0 250 80" enable-background="new 0 0 250 80" xml:space="preserve"> +<g> + <g> + <path fill="#FFFFFF" d="M41.076,51.828c0,1.136,0.926,2.061,2.062,2.061c1.137,0,2.062-0.925,2.062-2.061 + c0-1.137-0.925-2.062-2.062-2.062C42.001,49.767,41.076,50.691,41.076,51.828z"/> + <path fill="#FFFFFF" d="M33.947,51.828c0,1.136,0.925,2.061,2.061,2.061c1.137,0,2.061-0.925,2.061-2.061 + c0-1.137-0.924-2.062-2.061-2.062C34.871,49.767,33.947,50.691,33.947,51.828z"/> + <path fill="#FFFFFF" d="M26.817,51.828c0,1.136,0.925,2.061,2.06,2.061c1.137,0,2.061-0.925,2.061-2.061 + c0-1.137-0.924-2.062-2.061-2.062C27.742,49.767,26.817,50.691,26.817,51.828z"/> + <polygon fill="#FFFFFF" points="49.284,30.582 50.696,28.285 48.48,26.923 46.685,29.844 46.684,29.844 46.684,35.322 + 49.284,35.322 "/> + <path fill="#FFFFFF" d="M23.251,51.718c0,3.1,2.524,5.624,5.626,5.624h14.26c3.102,0,5.626-2.524,5.626-5.624 + c0-3.104-2.525-5.626-5.626-5.626h-14.26C25.775,46.091,23.251,48.614,23.251,51.718z M25.034,51.718 + c0-2.122,1.726-3.845,3.843-3.845h14.26c2.121,0,3.844,1.724,3.844,3.845c0,2.118-1.723,3.842-3.844,3.842h-14.26 + C26.759,55.56,25.034,53.836,25.034,51.718z"/> + <path fill="#FFFFFF" d="M19.576,35.953v16.041h2.798c-0.003-0.093-0.014-0.186-0.014-0.276c0-3.595,2.924-6.519,6.518-6.519h14.26 + c3.594,0,6.517,2.924,6.517,6.519c0,0.091-0.009,0.184-0.013,0.276h4.469v-6.812h1.814c0.592,3.854,3.899,6.822,7.916,6.822 + v-2.547c-3.027,0-5.492-2.463-5.492-5.491c0-3.027,2.465-5.49,5.492-5.49v-2.547c-4.017,0-7.324,2.968-7.916,6.822h-1.814v-6.797 + h-9.584l-4.453-12.478h-4.457h-2.673h-5.348v3.565v8.913H19.576z M31.161,26.149h6.621l3.183,9.804V41.3h-1.819h-6.313h-1.671 + v-5.347V26.149z M26.274,42.303h-4.456v-4.456h4.456V42.303z"/> + </g> +</g> +<g> + <path fill="#FFFFFF" d="M111.019,36.8c0,4.056-0.774,7.47-2.321,10.244c-1.547,2.776-3.8,4.727-6.757,5.855l8.003,8.621h-7.363 + l-6.312-7.501h-0.892c-5.046,0-8.922-1.497-11.628-4.493c-2.707-2.997-4.059-7.253-4.059-12.772s1.36-9.757,4.082-12.714 + s6.605-4.437,11.651-4.437c4.97,0,8.812,1.502,11.525,4.505C109.662,27.112,111.019,31.343,111.019,36.8z M85.499,36.8 + c0,4.116,0.831,7.237,2.493,9.364c1.662,2.127,4.124,3.19,7.386,3.19c3.247,0,5.698-1.052,7.352-3.156 + c1.654-2.104,2.481-5.236,2.481-9.398c0-4.101-0.82-7.211-2.458-9.33c-1.639-2.119-4.082-3.179-7.329-3.179 + c-3.278,0-5.751,1.06-7.421,3.179C86.333,29.589,85.499,32.699,85.499,36.8z"/> + <path fill="#FFFFFF" d="M135.464,53.562l-0.754-3.315h-0.274c-0.747,1.174-1.811,2.096-3.19,2.767 + c-1.38,0.671-2.954,1.006-4.722,1.006c-3.064,0-5.351-0.762-6.86-2.286s-2.264-3.834-2.264-6.929V28.271h5.419v15.595 + c0,1.937,0.396,3.389,1.189,4.357c0.792,0.969,2.035,1.452,3.728,1.452c2.256,0,3.914-0.675,4.974-2.024 + c1.06-1.35,1.589-3.609,1.589-6.78v-12.6h5.396v25.292H135.464z"/> + <path fill="#FFFFFF" d="M163.18,53.562l-1.075-3.521h-0.183c-1.22,1.54-2.447,2.588-3.682,3.145 + c-1.235,0.556-2.82,0.834-4.756,0.834c-2.485,0-4.425-0.67-5.82-2.012s-2.092-3.239-2.092-5.695c0-2.606,0.968-4.573,2.904-5.899 + c1.936-1.327,4.886-2.051,8.85-2.173l4.368-0.137v-1.35c0-1.616-0.377-2.824-1.132-3.625c-0.755-0.8-1.925-1.201-3.51-1.201 + c-1.296,0-2.538,0.191-3.728,0.572c-1.189,0.381-2.333,0.831-3.43,1.349l-1.738-3.842c1.372-0.716,2.874-1.261,4.505-1.635 + s3.171-0.561,4.619-0.561c3.217,0,5.645,0.702,7.284,2.104c1.638,1.403,2.458,3.605,2.458,6.609v17.037H163.18z M155.176,49.903 + c1.951,0,3.518-0.545,4.699-1.635c1.181-1.09,1.772-2.619,1.772-4.585v-2.195l-3.247,0.138c-2.531,0.091-4.372,0.515-5.522,1.269 + c-1.151,0.755-1.727,1.91-1.727,3.465c0,1.128,0.335,2.001,1.006,2.619C152.828,49.595,153.834,49.903,155.176,49.903z"/> + <path fill="#FFFFFF" d="M187.351,27.813c1.083,0,1.974,0.077,2.675,0.229L189.5,33.05c-0.762-0.183-1.555-0.274-2.378-0.274 + c-2.15,0-3.892,0.701-5.226,2.104s-2,3.225-2,5.465v13.218h-5.374V28.271h4.208l0.709,4.459h0.274 + c0.838-1.509,1.932-2.706,3.281-3.59C184.344,28.255,185.795,27.813,187.351,27.813z"/> + <path fill="#FFFFFF" d="M207.542,27.813c1.083,0,1.974,0.077,2.675,0.229l-0.525,5.008c-0.762-0.183-1.555-0.274-2.378-0.274 + c-2.15,0-3.892,0.701-5.226,2.104s-2,3.225-2,5.465v13.218h-5.374V28.271h4.208l0.709,4.459h0.274 + c0.838-1.509,1.932-2.706,3.281-3.59C204.536,28.255,205.987,27.813,207.542,27.813z"/> + <path fill="#FFFFFF" d="M211.065,28.271h5.854l5.145,14.338c0.777,2.043,1.295,3.964,1.555,5.762h0.184 + c0.137-0.838,0.389-1.856,0.754-3.053c0.365-1.196,2.303-6.879,5.809-17.047h5.809l-10.816,28.653 + c-1.967,5.26-5.244,7.89-9.834,7.89c-1.188,0-2.347-0.13-3.476-0.389v-4.254c0.809,0.184,1.73,0.274,2.768,0.274 + c2.591,0,4.413-1.501,5.466-4.505l0.938-2.378L211.065,28.271z"/> +</g> +</svg> diff --git a/quarry/web/static/img/quarry-logo.svg b/quarry/web/static/img/quarry-logo.svg new file mode 100644 index 0000000..b069f74 --- /dev/null +++ b/quarry/web/static/img/quarry-logo.svg @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Icon by Hay Kranen < http://www.haykranen.nl > + Uses elements designed by Michael Rowe < http://www.thenounproject.com/Mikhail1986 > + from the Noun Project < http://www.thenounproject.com >, licensed under CC-BY 3.0 +--> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px" + width="250px" height="80px" viewBox="0 0 250 80" enable-background="new 0 0 250 80" xml:space="preserve"> +<g> + <rect x="13.827" y="12" fill="#008CBB" width="55" height="56"/> + <g> + <path fill="#FFFFFF" d="M41.076,51.828c0,1.136,0.926,2.061,2.062,2.061c1.137,0,2.062-0.925,2.062-2.061 + c0-1.137-0.925-2.062-2.062-2.062C42.001,49.767,41.076,50.691,41.076,51.828z"/> + <path fill="#FFFFFF" d="M33.947,51.828c0,1.136,0.925,2.061,2.061,2.061c1.137,0,2.061-0.925,2.061-2.061 + c0-1.137-0.924-2.062-2.061-2.062C34.871,49.767,33.947,50.691,33.947,51.828z"/> + <path fill="#FFFFFF" d="M26.817,51.828c0,1.136,0.925,2.061,2.06,2.061c1.137,0,2.061-0.925,2.061-2.061 + c0-1.137-0.924-2.062-2.061-2.062C27.742,49.767,26.817,50.691,26.817,51.828z"/> + <polygon fill="#FFFFFF" points="49.284,30.582 50.696,28.285 48.48,26.923 46.685,29.844 46.684,29.844 46.684,35.322 + 49.284,35.322 "/> + <path fill="#FFFFFF" d="M23.251,51.718c0,3.1,2.524,5.624,5.626,5.624h14.26c3.102,0,5.626-2.524,5.626-5.624 + c0-3.104-2.525-5.626-5.626-5.626h-14.26C25.775,46.091,23.251,48.614,23.251,51.718z M25.034,51.718 + c0-2.122,1.726-3.845,3.843-3.845h14.26c2.121,0,3.844,1.724,3.844,3.845c0,2.118-1.723,3.842-3.844,3.842h-14.26 + C26.759,55.56,25.034,53.836,25.034,51.718z"/> + <path fill="#FFFFFF" d="M19.576,35.953v16.041h2.798c-0.003-0.093-0.014-0.186-0.014-0.276c0-3.595,2.924-6.519,6.518-6.519h14.26 + c3.594,0,6.517,2.924,6.517,6.519c0,0.091-0.009,0.184-0.013,0.276h4.469v-6.812h1.814c0.592,3.854,3.899,6.822,7.916,6.822 + v-2.547c-3.027,0-5.492-2.463-5.492-5.491c0-3.027,2.465-5.49,5.492-5.49v-2.547c-4.017,0-7.324,2.968-7.916,6.822h-1.814v-6.797 + h-9.584l-4.453-12.478h-4.457h-2.673h-5.348v3.565v8.913H19.576z M31.161,26.149h6.621l3.183,9.804V41.3h-1.819h-6.313h-1.671 + v-5.347V26.149z M26.274,42.303h-4.456v-4.456h4.456V42.303z"/> + </g> +</g> +<g> + <path fill="#008CBB" d="M111.019,36.8c0,4.056-0.774,7.47-2.321,10.244c-1.547,2.776-3.8,4.727-6.757,5.855l8.003,8.621h-7.363 + l-6.312-7.501h-0.892c-5.046,0-8.922-1.497-11.628-4.493c-2.707-2.997-4.059-7.253-4.059-12.772s1.36-9.757,4.082-12.714 + s6.605-4.437,11.651-4.437c4.97,0,8.812,1.502,11.525,4.505C109.662,27.112,111.019,31.343,111.019,36.8z M85.499,36.8 + c0,4.116,0.831,7.237,2.493,9.364c1.662,2.127,4.124,3.19,7.386,3.19c3.247,0,5.698-1.052,7.352-3.156 + c1.654-2.104,2.481-5.236,2.481-9.398c0-4.101-0.82-7.211-2.458-9.33c-1.639-2.119-4.082-3.179-7.329-3.179 + c-3.278,0-5.751,1.06-7.421,3.179C86.333,29.589,85.499,32.699,85.499,36.8z"/> + <path fill="#008CBB" d="M135.464,53.562l-0.754-3.315h-0.274c-0.747,1.174-1.811,2.096-3.19,2.767 + c-1.38,0.671-2.954,1.006-4.722,1.006c-3.064,0-5.351-0.762-6.86-2.286s-2.264-3.834-2.264-6.929V28.271h5.419v15.595 + c0,1.937,0.396,3.389,1.189,4.357c0.792,0.969,2.035,1.452,3.728,1.452c2.256,0,3.914-0.675,4.974-2.024 + c1.06-1.35,1.589-3.609,1.589-6.78v-12.6h5.396v25.292H135.464z"/> + <path fill="#008CBB" d="M163.18,53.562l-1.075-3.521h-0.183c-1.22,1.54-2.447,2.588-3.682,3.145 + c-1.235,0.556-2.82,0.834-4.756,0.834c-2.485,0-4.425-0.67-5.82-2.012s-2.092-3.239-2.092-5.695c0-2.606,0.968-4.573,2.904-5.899 + c1.936-1.327,4.886-2.051,8.85-2.173l4.368-0.137v-1.35c0-1.616-0.377-2.824-1.132-3.625c-0.755-0.8-1.925-1.201-3.51-1.201 + c-1.296,0-2.538,0.191-3.728,0.572c-1.189,0.381-2.333,0.831-3.43,1.349l-1.738-3.842c1.372-0.716,2.874-1.261,4.505-1.635 + s3.171-0.561,4.619-0.561c3.217,0,5.645,0.702,7.284,2.104c1.638,1.403,2.458,3.605,2.458,6.609v17.037H163.18z M155.176,49.903 + c1.951,0,3.518-0.545,4.699-1.635c1.181-1.09,1.772-2.619,1.772-4.585v-2.195l-3.247,0.138c-2.531,0.091-4.372,0.515-5.522,1.269 + c-1.151,0.755-1.727,1.91-1.727,3.465c0,1.128,0.335,2.001,1.006,2.619C152.828,49.595,153.834,49.903,155.176,49.903z"/> + <path fill="#008CBB" d="M187.351,27.813c1.083,0,1.974,0.077,2.675,0.229L189.5,33.05c-0.762-0.183-1.555-0.274-2.378-0.274 + c-2.15,0-3.892,0.701-5.226,2.104s-2,3.225-2,5.465v13.218h-5.374V28.271h4.208l0.709,4.459h0.274 + c0.838-1.509,1.932-2.706,3.281-3.59C184.344,28.255,185.795,27.813,187.351,27.813z"/> + <path fill="#008CBB" d="M207.542,27.813c1.083,0,1.974,0.077,2.675,0.229l-0.525,5.008c-0.762-0.183-1.555-0.274-2.378-0.274 + c-2.15,0-3.892,0.701-5.226,2.104s-2,3.225-2,5.465v13.218h-5.374V28.271h4.208l0.709,4.459h0.274 + c0.838-1.509,1.932-2.706,3.281-3.59C204.536,28.255,205.987,27.813,207.542,27.813z"/> + <path fill="#008CBB" d="M211.065,28.271h5.854l5.145,14.338c0.777,2.043,1.295,3.964,1.555,5.762h0.184 + c0.137-0.838,0.389-1.856,0.754-3.053c0.365-1.196,2.303-6.879,5.809-17.047h5.809l-10.816,28.653 + c-1.967,5.26-5.244,7.89-9.834,7.89c-1.188,0-2.347-0.13-3.476-0.389v-4.254c0.809,0.184,1.73,0.274,2.768,0.274 + c2.591,0,4.413-1.501,5.466-4.505l0.938-2.378L211.065,28.271z"/> +</g> +</svg> diff --git a/quarry/web/templates/base.html b/quarry/web/templates/base.html index 28f6c32..208c669 100644 --- a/quarry/web/templates/base.html +++ b/quarry/web/templates/base.html @@ -28,7 +28,7 @@ <div class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <div class="container"> <div class="navbar-header"> - <a class="navbar-brand" href="/">Quarry <small>βeta</small></a> + <a class="navbar-brand" href="/"><img height="48px" src="/static/img/quarry-logo-white.svg" /><small>βeta</small></a> </div> <div class="collapse navbar-collapse"> <ul class="nav navbar-nav"> -- To view, visit https://gerrit.wikimedia.org/r/153030 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I57f0d9a55c313313785e89be8a1c264cd3ec50f8 Gerrit-PatchSet: 1 Gerrit-Project: analytics/quarry/web Gerrit-Branch: master Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com> Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
