jenkins-bot has submitted this change and it was merged. Change subject: Add local image to demo ......................................................................
Add local image to demo Change-Id: I0206120503d45378ed6b348f540263d6f1854bd8 --- A demos/ve/VisualEditor-logo.svg M demos/ve/pages/image.html 2 files changed, 67 insertions(+), 2 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/demos/ve/VisualEditor-logo.svg b/demos/ve/VisualEditor-logo.svg new file mode 100644 index 0000000..c76de67 --- /dev/null +++ b/demos/ve/VisualEditor-logo.svg @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 15.1.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="641px" height="225px" viewBox="72.5 191.5 641 225" enable-background="new 72.5 191.5 641 225" xml:space="preserve"> +<g> + <path fill="#2BA9E0" d="M144.765,242.56h13.097l-26.967,62.11h-4.085l-27.611-62.11h13.221l16.476,37.556L144.765,242.56z"/> + <path fill="#2BA9E0" d="M173.123,216.878c1.991,0,3.69,0.687,5.106,2.059c1.417,1.37,2.127,3.052,2.127,5.043 + c0,1.948-0.71,3.628-2.127,5.042c-1.416,1.417-3.115,2.122-5.106,2.122c-1.858,0-3.496-0.717-4.913-2.155 + c-1.416-1.438-2.122-3.108-2.122-5.009c0-1.859,0.706-3.507,2.122-4.944C169.627,217.601,171.265,216.878,173.123,216.878z + M167.151,242.56h12.076v61.047h-12.076V242.56z"/> + <path fill="#2BA9E0" d="M193.694,299.228v-13.003c3.407,2.388,6.886,4.322,10.452,5.805c3.559,1.482,6.556,2.224,8.989,2.224 + c2.522,0,4.688-0.619,6.504-1.859c1.812-1.24,2.72-2.721,2.72-4.445c0-1.77-0.588-3.243-1.76-4.415 + c-1.172-1.172-3.703-2.864-7.596-5.076c-7.789-4.336-12.886-8.04-15.295-11.114c-2.415-3.076-3.619-6.426-3.619-10.055 + c0-4.689,1.826-8.513,5.473-11.481c3.653-2.962,8.354-4.442,14.105-4.442c5.972,0,12.1,1.68,18.382,5.04v11.947 + c-7.168-4.334-13.031-6.504-17.587-6.504c-2.344,0-4.236,0.5-5.671,1.497c-1.44,0.996-2.16,2.313-2.16,3.951 + c0,1.418,0.649,2.77,1.953,4.052c1.304,1.285,3.591,2.833,6.866,4.645l4.315,2.456c10.175,5.749,15.268,12.119,15.268,19.105 + c0,4.999-1.958,9.1-5.874,12.305c-3.915,3.207-8.946,4.81-15.098,4.81c-3.628,0-6.856-0.388-9.685-1.16 + C201.545,302.736,197.981,301.308,193.694,299.228z"/> + <path fill="#2BA9E0" d="M287.856,303.607v-7.829c-2.565,2.807-5.497,4.993-8.796,6.553c-3.294,1.558-6.58,2.339-9.851,2.339 + c-3.85,0-7.402-0.962-10.655-2.888c-3.251-1.922-5.703-4.531-7.364-7.831c-1.657-3.294-2.485-8.768-2.485-16.423V242.56h12.076 + v34.793c0,6.407,0.918,10.881,2.753,13.419c1.836,2.542,5.055,3.81,9.657,3.81c5.747,0,10.637-2.807,14.665-8.426V242.56h12.076 + v61.047H287.856z"/> + <path fill="#2BA9E0" d="M355.272,266.913v25.947c0,2.078,0.711,3.118,2.123,3.118c1.464,0,3.741-1.085,6.838-3.252v7.366 + c-2.743,1.769-4.946,2.977-6.604,3.617c-1.661,0.64-3.397,0.962-5.209,0.962c-5.177,0-8.231-2.035-9.158-6.104 + c-5.13,3.981-10.594,5.97-16.393,5.97c-4.244,0-7.783-1.403-10.612-4.212c-2.832-2.808-4.249-6.337-4.249-10.584 + c0-3.847,1.384-7.29,4.146-10.318c2.763-3.028,6.692-5.431,11.78-7.2l15.46-5.309v-3.252c0-7.341-3.671-11.012-11.018-11.012 + c-6.589,0-13.004,3.405-19.239,10.217V249.66c4.688-5.527,11.438-8.292,20.237-8.292c6.594,0,11.878,1.723,15.859,5.172 + c1.327,1.106,2.522,2.579,3.586,4.415c1.059,1.835,1.732,3.67,2.019,5.509C355.132,258.297,355.272,261.78,355.272,266.913z + M343.395,291.531v-18.115l-8.095,3.118c-4.113,1.638-7.022,3.285-8.726,4.944c-1.704,1.659-2.556,3.728-2.556,6.205 + c0,2.521,0.81,4.577,2.424,6.17c1.614,1.593,3.703,2.391,6.269,2.391C336.561,296.244,340.118,294.674,343.395,291.531z"/> + <path fill="#9ACC59" d="M468.843,276.64h12.144v92.701h-25.811c-9.025,0-16.227-2.853-21.602-8.561 + c-5.374-5.704-8.062-13.356-8.062-22.957c0-8.979,2.819-16.368,8.462-22.167c5.639-5.793,12.839-8.691,21.598-8.691 + c4.07,0,8.495,0.863,13.271,2.588L468.843,276.64L468.843,276.64z M468.843,358.992v-38.689c-3.76-1.896-7.566-2.854-11.412-2.854 + c-6.02,0-10.806,1.973-14.368,5.906c-3.559,3.936-5.342,9.243-5.342,15.927c0,6.282,1.549,11.126,4.646,14.532 + c1.857,2.032,3.826,3.407,5.904,4.112c2.081,0.706,5.817,1.064,11.217,1.064L468.843,358.992L468.843,358.992z"/> + <path fill="#9ACC59" d="M503.617,282.613c1.99,0,3.693,0.684,5.105,2.057c1.416,1.371,2.122,3.054,2.122,5.042 + c0,1.948-0.706,3.628-2.122,5.042c-1.412,1.417-3.115,2.123-5.105,2.123c-1.859,0-3.497-0.718-4.913-2.153 + c-1.417-1.441-2.123-3.109-2.123-5.012c0-1.859,0.706-3.504,2.123-4.944C500.12,283.33,501.758,282.613,503.617,282.613z + M497.641,308.292h12.08v61.049h-12.08V308.292z"/> + <path fill="#9ACC59" d="M518.611,317.982l22.692-22.298v12.608h19.311v10.886h-19.311v29.874c0,6.979,2.899,10.468,8.692,10.468 + c4.339,0,8.918-1.436,13.737-4.312v11.28c-4.646,2.611-9.709,3.911-15.196,3.911c-5.53,0-10.128-1.608-13.804-4.839 + c-1.147-0.974-2.1-2.07-2.853-3.284c-0.753-1.22-1.379-2.811-1.893-4.782c-0.508-1.967-0.763-5.713-0.763-11.247v-27.069h-10.616 + v-1.195H518.611z"/> + <path fill="#9ACC59" d="M601.624,308.158c9.29,0,17.013,3,23.159,8.996c6.146,5.995,9.225,13.524,9.225,22.589 + c0,8.81-3.121,16.114-9.355,21.931c-6.236,5.822-14.092,8.727-23.561,8.727c-9.152,0-16.811-2.946-22.956-8.856 + c-6.15-5.902-9.225-13.281-9.225-22.129c0-8.933,3.105-16.378,9.322-22.326C584.446,311.135,592.245,308.158,601.624,308.158z + M600.96,319.046c-5.793,0-10.551,1.901-14.264,5.704c-3.72,3.803-5.578,8.649-5.578,14.532c0,5.836,1.901,10.606,5.71,14.298 + c3.802,3.693,8.692,5.543,14.664,5.543c5.925,0,10.781-1.867,14.564-5.609c3.784-3.735,5.677-8.526,5.677-14.362 + c0-5.799-1.973-10.599-5.905-14.4C611.889,320.947,606.932,319.046,600.96,319.046z"/> + <path fill="#9ACC59" d="M660.354,308.292v14.001l0.663-1.064c5.841-9.419,11.677-14.133,17.518-14.133 + c4.555,0,9.312,2.304,14.269,6.904l-6.372,10.617c-4.202-3.98-8.095-5.973-11.681-5.973c-3.892,0-7.262,1.858-10.119,5.572 + c-2.852,3.718-4.277,8.118-4.277,13.206v31.917h-12.146v-61.049L660.354,308.292L660.354,308.292z"/> + <g> + <path fill="#9ACC59" d="M387.256,358.539v11.635c0.918,0.058,1.854,0.094,2.819,0.094c4.913,0,9.189-0.525,12.843-1.591 + c3.647-1.062,7.333-2.833,11.046-5.308v-11.812c-6.721,4.955-14.066,7.437-22.029,7.437 + C390.282,358.992,388.733,358.827,387.256,358.539z"/> + <path fill="#9ACC59" d="M407.794,315.591c-4.824-5.661-11.281-8.495-19.376-8.495c-0.396,0-0.771,0.041-1.162,0.056v10.475 + c0.386-0.02,0.767-0.043,1.162-0.043c4.335,0,7.785,1.304,10.35,3.915c2.564,2.612,4.006,6.325,4.315,11.149h-15.827v7.229h27.771 + v-1.524C415.027,328.844,412.618,321.258,407.794,315.591z"/> + </g> + <path fill="#2BA9E0" d="M375.18,210.906h12.076v190.188H375.18V210.906z"/> +</g> +</svg> diff --git a/demos/ve/pages/image.html b/demos/ve/pages/image.html index e1f61d9..90cd2bb 100644 --- a/demos/ve/pages/image.html +++ b/demos/ve/pages/image.html @@ -1,2 +1,3 @@ -<p>This is an image: <img alt="Wiki.png" src="//upload.wikimedia.org/wikipedia/commons/b/b3/Wikipedia-logo-v2-en.svg" width="135" height="155">!!!</p> -<img src="http://upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg"; width="180" height="20" resource="./Image:Foobar.jpg" /> \ No newline at end of file +<p>This is a local image: <img alt="VisualEditor logo" src="VisualEditor-logo.svg" width="320" height="112">foo</p> +<p>Remote image outside of paragraph:</p> +<img alt="Wikipedia Logo" src="//upload.wikimedia.org/wikipedia/commons/b/b3/Wikipedia-logo-v2-en.svg" width="135" height="155"> \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/152949 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0206120503d45378ed6b348f540263d6f1854bd8 Gerrit-PatchSet: 3 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders <esand...@wikimedia.org> Gerrit-Reviewer: Catrope <roan.katt...@gmail.com> Gerrit-Reviewer: Esanders <esand...@wikimedia.org> Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: Trevor Parscal <tpars...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
![http://upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg"](http://upload.wikimedia.org/wikipedia/commons/3/3a/Foobar.jpg"){kind=link}